diff options
| author | rubidium <rubidium@openttd.org> | 2009-01-03 13:59:05 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-01-03 13:59:05 +0000 |
| commit | e5c1a7b5c3afcdfd0671b6476055822eba665205 (patch) | |
| tree | f69467d5bbbf0587e6289219150ab4a8313edf8c /src/network | |
| parent | 0d54db5f9fb3a3987f908645ca9693684f34674b (diff) | |
| download | openttd-e5c1a7b5c3afcdfd0671b6476055822eba665205.tar.xz | |
(svn r14804) -Codechange: unify opening the OSK (Zuu)
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/network_chat_gui.cpp | 9 | ||||
| -rw-r--r-- | src/network/network_gui.cpp | 17 |
2 files changed, 10 insertions, 16 deletions
diff --git a/src/network/network_chat_gui.cpp b/src/network/network_chat_gui.cpp index 56b86687e..4a1e209b3 100644 --- a/src/network/network_chat_gui.cpp +++ b/src/network/network_chat_gui.cpp @@ -448,10 +448,6 @@ struct NetworkChatWindow : public QueryStringBaseWindow { virtual void OnClick(Point pt, int widget) { switch (widget) { - case 2: - ShowOnScreenKeyboard(this, 2, 0, 3); - break; - case 3: /* Send */ SendChat(this->text.buf, this->dtype, this->dest); /* FALLTHROUGH */ @@ -485,6 +481,11 @@ struct NetworkChatWindow : public QueryStringBaseWindow { } return state; } + + virtual void OnOpenOSKWindow(int wid) + { + ShowOnScreenKeyboard(this, wid, 0, 3); + } }; static const Widget _chat_window_widgets[] = { diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp index 2c1ca0537..007901341 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -473,10 +473,6 @@ public: { this->field = widget; switch (widget) { - case NGWW_CLIENT: - ShowOnScreenKeyboard(this, NGWW_CLIENT, 0, 0); - break; - case NGWW_CANCEL: // Cancel button DeleteWindowById(WC_NETWORK_WINDOW, 0); break; @@ -917,10 +913,6 @@ struct NetworkStartServerWindow : public QueryStringBaseWindow { ShowNetworkGameWindow(); break; - case NSSW_GAMENAME: - ShowOnScreenKeyboard(this, NSSW_GAMENAME, 0, 0); - break; - case NSSW_SETPWD: // Set password button this->widget_id = NSSW_SETPWD; SetDParamStr(0, _settings_client.network.server_password); @@ -1907,10 +1899,6 @@ struct NetworkCompanyPasswordWindow : public QueryStringBaseWindow { this->ToggleWidgetLoweredState(NCPWW_SAVE_AS_DEFAULT_PASSWORD); this->SetDirty(); break; - - case NCPWW_PASSWORD: - ShowOnScreenKeyboard(this, NCPWW_PASSWORD, NCPWW_CANCEL, NCPWW_OK); - break; } } @@ -1935,6 +1923,11 @@ struct NetworkCompanyPasswordWindow : public QueryStringBaseWindow { } return state; } + + virtual void OnOpenOSKWindow(int wid) + { + ShowOnScreenKeyboard(this, wid, NCPWW_CANCEL, NCPWW_OK); + } }; static const Widget _ncp_window_widgets[] = { |