--- a/road_gui.c	Mon Oct 02 22:10:04 2006 +0000
+++ b/road_gui.c	Tue Oct 03 02:08:15 2006 +0000
@@ -155,7 +155,7 @@
 
 static void BuildRoadClick_Remove(Window *w)
 {
-	if (HASBIT(w->disabled_state, 11)) return;
+	if (IsWindowWidgetDisabled(w, 11)) return;
 	SetWindowDirty(w);
 	SndPlayFx(SND_15_BEEP);
 	TOGGLEBIT(w->click_state, 11);
@@ -184,10 +184,11 @@
 {
 	switch (e->event) {
 	case WE_PAINT:
-		w->disabled_state &= ~(1 << 11);
 		if (!(w->click_state & ((1<<3)|(1<<4)))) {
-			w->disabled_state |= (1 << 11);
+			DisableWindowWidget(w, 11);
 			w->click_state &= ~(1<<11);
+		} else {
+			EnableWindowWidget(w, 11);
 		}
 		DrawWindowWidgets(w);
 		break;