From 2fe151bd923ffb980645b1317b352fbc6351e7bc Mon Sep 17 00:00:00 2001 From: alberth Date: Sun, 22 Mar 2009 18:46:56 +0000 Subject: (svn r15817) -Codechange: Make room for additional widget types (Rubidium) --- src/widget_type.h | 5 ++--- src/window.cpp | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/widget_type.h b/src/widget_type.h index e3d2fec94..787195250 100644 --- a/src/widget_type.h +++ b/src/widget_type.h @@ -95,10 +95,9 @@ enum WidgetType { WWT_EDITBOX, ///< a textbox for typing WWT_LAST, ///< Last Item. use WIDGETS_END to fill up padding!! - WWT_MASK = 0x1F, + WWT_MASK = 0x7F, - WWB_PUSHBUTTON = 1 << 5, - WWB_MASK = 0xE0, + WWB_PUSHBUTTON = 1 << 7, WWT_PUSHBTN = WWT_PANEL | WWB_PUSHBUTTON, WWT_PUSHTXTBTN = WWT_TEXTBTN | WWB_PUSHBUTTON, diff --git a/src/window.cpp b/src/window.cpp index ad8bbc889..5046f5364 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -284,7 +284,7 @@ static void DispatchLeftClickEvent(Window *w, int x, int y, bool double_click) } } - if (wi->type & WWB_MASK) { + if (wi->type & WWB_PUSHBUTTON) { /* special widget handling for buttons*/ switch (wi->type) { default: NOT_REACHED(); -- cgit v1.2.3-70-g09d2