summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoralberth <alberth@openttd.org>2009-03-22 18:46:56 +0000
committeralberth <alberth@openttd.org>2009-03-22 18:46:56 +0000
commit2fe151bd923ffb980645b1317b352fbc6351e7bc (patch)
tree8a4849916fd40fc8516c425c184efd3a8a9c14d9 /src
parentdcf7d05a66106d709e4faaeaf4411ba0afdf1ba5 (diff)
downloadopenttd-2fe151bd923ffb980645b1317b352fbc6351e7bc.tar.xz
(svn r15817) -Codechange: Make room for additional widget types (Rubidium)
Diffstat (limited to 'src')
-rw-r--r--src/widget_type.h5
-rw-r--r--src/window.cpp2
2 files changed, 3 insertions, 4 deletions
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();