summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2008-05-15 18:26:45 +0000
committerrubidium <rubidium@openttd.org>2008-05-15 18:26:45 +0000
commit8ba6f08ca66468c7157c5eb721e4a8582532a48a (patch)
treee7426f98b261cf6df7a7f32c56bcdc4a47477db2
parent5ae795953afac677134e54f91a11436acb3c969d (diff)
downloadopenttd-8ba6f08ca66468c7157c5eb721e4a8582532a48a.tar.xz
(svn r13105) -Fix [FS#2015]: the title of a query window would (sometimes) change when the on screen keyboard was opened.
-rw-r--r--src/osk_gui.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/osk_gui.cpp b/src/osk_gui.cpp
index 32d7ff41c..c24c5c42e 100644
--- a/src/osk_gui.cpp
+++ b/src/osk_gui.cpp
@@ -42,6 +42,7 @@ enum {
static byte _keystate = KEYS_NONE;
struct OskWindow : public Window {
+ StringID caption; ///< the caption for this window.
QueryString *qs; ///< text-input
int text_btn; ///< widget number of parent's text field
int ok_btn; ///< widget number of parent's ok button (=0 when ok shouldn't be passed on)
@@ -54,7 +55,7 @@ struct OskWindow : public Window {
this->parent = parent;
assert(parent != NULL);
- if (parent->widget[button].data != 0) parent->caption = parent->widget[button].data;
+ this->caption = (parent->widget[button].data != STR_NULL) ? parent->widget[button].data : parent->caption;
this->qs = parent;
this->text_btn = button;
@@ -96,7 +97,7 @@ struct OskWindow : public Window {
this->ChangeOskDiabledState(shift);
- SetDParam(0, this->qs->caption);
+ SetDParam(0, this->caption);
DrawWindowWidgets(this);
for (uint i = 0; i < OSK_KEYBOARD_ENTRIES; i++) {