diff options
| author | sl1nk3.s <sl1nk3.s@gmail.com> | 2009-05-13 22:49:53 +0000 |
|---|---|---|
| committer | sl1nk3.s <sl1nk3.s@gmail.com> | 2009-05-13 22:49:53 +0000 |
| commit | 158fcaf889349e758742faaf925a213aa1f536a2 (patch) | |
| tree | 5f76c05c62f2d9b07d920be91dbbf0e5b8a33a40 /Source | |
| parent | 560c4111ae2dc577689bf7f3fc3577713ab6fd16 (diff) | |
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3223 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/DolphinWX/Src/FrameTools.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/NetWindow.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 77c8941fdc..c5be1af05f 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -29,7 +29,7 @@ Core::GetWindowHandle(). */ -#if defined(HAVE_SFML) && HAVE_SFML +#if defined(HAVE_SFML) && HAVE_SFML || defined(_WIN32) #include "NetWindow.h" #endif diff --git a/Source/Core/DolphinWX/Src/NetWindow.cpp b/Source/Core/DolphinWX/Src/NetWindow.cpp index c098ef9fd9..f55098f422 100644 --- a/Source/Core/DolphinWX/Src/NetWindow.cpp +++ b/Source/Core/DolphinWX/Src/NetWindow.cpp @@ -137,7 +137,8 @@ void NetPlay::DrawGUI() }
netmodes_str.Add(wxT("P2P Versus (2 players, faster)"));
- netmodes_str.Add(wxT("Server Mode (4 players, slower)"));
+ // TODO :
+ // netmodes_str.Add(wxT("Server Mode (4 players, slower)"));
// Tabs
m_Notebook = new wxNotebook(this, ID_NOTEBOOK, wxDefaultPosition, wxDefaultSize);
@@ -148,7 +149,7 @@ void NetPlay::DrawGUI() // Nickname setting
m_SetNick_text = new wxStaticText(this, ID_SETNICK_TXT, wxT(" Nickname : "), wxDefaultPosition, wxDefaultSize);
- m_SetNick = new wxTextCtrl(this, ID_SETNICK, wxT("Mingebag(r)"), wxDefaultPosition, wxDefaultSize, 0);
+ m_SetNick = new wxTextCtrl(this, ID_SETNICK, wxT("Mingebag"), wxDefaultPosition, wxDefaultSize, 0);
m_NetMode = new wxChoice(this, ID_NETMODE, wxDefaultPosition, wxDefaultSize, netmodes_str, 0, wxDefaultValidator);
m_NetMode->SetSelection(0);
|