From 24512d3da5ffef6e741c4ebf4e381a2ecab56dc1 Mon Sep 17 00:00:00 2001 From: darkvater Date: Sun, 12 Sep 2004 14:12:33 +0000 Subject: (svn r212) -Fix: Network-gui fixes (sign_de) -Fix: any disabled button in a window doesn't receive WE_CLICK events -Added network.h --- window.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'window.c') diff --git a/window.c b/window.c index 92dd93b57..2f70df88c 100644 --- a/window.c +++ b/window.c @@ -25,19 +25,19 @@ void DispatchLeftClickEvent(Window *w, int x, int y) { if (e.click.widget < 0) return; /* exit if clicked outside of widgets */ wi = &w->widget[e.click.widget]; + + /* don't allow any interaction if the button has been disabled */ + if (HASBIT(w->disabled_state, e.click.widget)) + return; if (wi->type & 0xE0) { - /* special widget handling */ + /* special widget handling for buttons*/ switch(wi->type) { - case WWT_IMGBTN | WWB_PUSHBUTTON: - case WWT_TEXTBTN | WWB_PUSHBUTTON: - if (HASBIT(w->disabled_state, e.click.widget)) - return; /* don't allow click if disabled */ + case WWT_IMGBTN | WWB_PUSHBUTTON: /* WWT_PUSHIMGBTN */ + case WWT_TEXTBTN | WWB_PUSHBUTTON: /* WWT_PUSHTXTBTN */ HandleButtonClick(w, e.click.widget); break; case WWT_NODISTXTBTN: - if (HASBIT(w->disabled_state, e.click.widget)) - return; /* don't allow click if disabled */ break; } } else if (wi->type == WWT_SCROLLBAR || wi->type == WWT_HSCROLLBAR) { -- cgit v1.2.3-54-g00ecf