summaryrefslogtreecommitdiff
path: root/src/network
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2012-11-13 21:46:54 +0000
committerfrosch <frosch@openttd.org>2012-11-13 21:46:54 +0000
commitfd55399167115dbb06e77bb03f85681ba318f5f2 (patch)
tree98b7ed09e96dbb242e05bd7551e750afb4fc1a6f /src/network
parent67f92f16eda1e9d251d665df7ceaa6127af4c593 (diff)
downloadopenttd-fd55399167115dbb06e77bb03f85681ba318f5f2.tar.xz
(svn r24731) -Codechange: Remove OnOpenOSKWindow and instead specify OK and CANCEL buttons via QueryString members.
Diffstat (limited to 'src/network')
-rw-r--r--src/network/network_chat_gui.cpp7
-rw-r--r--src/network/network_gui.cpp7
2 files changed, 4 insertions, 10 deletions
diff --git a/src/network/network_chat_gui.cpp b/src/network/network_chat_gui.cpp
index a6a63703d..4c1551347 100644
--- a/src/network/network_chat_gui.cpp
+++ b/src/network/network_chat_gui.cpp
@@ -299,6 +299,8 @@ struct NetworkChatWindow : public QueryStringBaseWindow {
{
this->dtype = type;
this->dest = dest;
+ this->cancel_button = WID_NC_CLOSE;
+ this->ok_button = WID_NC_SENDBUTTON;
this->afilter = CS_ALPHANUMERAL;
this->text.Initialize(this->edit_str_buf, this->edit_str_size);
@@ -521,11 +523,6 @@ struct NetworkChatWindow : public QueryStringBaseWindow {
return state;
}
- virtual void OnOpenOSKWindow(int wid)
- {
- ShowOnScreenKeyboard(this, wid, WID_NC_CLOSE, WID_NC_SENDBUTTON);
- }
-
/**
* Some data on this window has become invalid.
* @param data Information about the changed data.
diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp
index 0174497bd..94c2e3805 100644
--- a/src/network/network_gui.cpp
+++ b/src/network/network_gui.cpp
@@ -2123,6 +2123,8 @@ struct NetworkCompanyPasswordWindow : public QueryStringBaseWindow {
this->InitNested(desc, 0);
this->parent = parent;
+ this->cancel_button = WID_NCP_CANCEL;
+ this->ok_button = WID_NCP_OK;
this->afilter = CS_ALPHANUMERAL;
this->text.Initialize(this->edit_str_buf, this->edit_str_size);
this->SetFocusedWidget(WID_NCP_PASSWORD);
@@ -2171,11 +2173,6 @@ struct NetworkCompanyPasswordWindow : public QueryStringBaseWindow {
}
return state;
}
-
- virtual void OnOpenOSKWindow(int wid)
- {
- ShowOnScreenKeyboard(this, wid, WID_NCP_CANCEL, WID_NCP_OK);
- }
};
static const NWidgetPart _nested_network_company_password_window_widgets[] = {