diff options
| author | nakeee <nakeee@gmail.com> | 2009-05-13 22:23:54 +0000 |
|---|---|---|
| committer | nakeee <nakeee@gmail.com> | 2009-05-13 22:23:54 +0000 |
| commit | b9cdcb18198caabf1a1640e48c0f2cea954edeba (patch) | |
| tree | a753dd7206836a0e1645e90f15477bdcf9c8d0e5 /Source/Core/DolphinWX/Src/FrameTools.cpp | |
| parent | 176d52871968f763ae827b1f5a45526ae0b33833 (diff) | |
added HAVE_SFML so the code compiles without it
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3221 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DolphinWX/Src/FrameTools.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Src/FrameTools.cpp | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 8fea012f08..77c8941fdc 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -17,24 +17,21 @@ -////////////////////////////////////////////////////////////////////////////////////////// // Windows -/* ¯¯¯¯¯¯¯¯¯¯¯¯¯¯ -CFrame is the main parent window. Inside CFrame there is m_Panel which is the parent for -the rendering window (when we render to the main window). In Windows the rendering window is -created by giving CreateWindow() m_Panel->GetHandle() as parent window and creating a new -child window to m_Panel. The new child window handle that is returned by CreateWindow() can -be accessed from Core::GetWindowHandle(). +/* +CFrame is the main parent window. Inside CFrame there is m_Panel which is the +parent for the rendering window (when we render to the main window). In Windows +the rendering window is created by giving CreateWindow() m_Panel->GetHandle() +as parent window and creating a new child window to m_Panel. The new child +window handle that is returned by CreateWindow() can be accessed from +Core::GetWindowHandle(). +*/ -///////////////////////////////////////////////*/ - - -// ---------------------------------------------------------------------------- -// Includes -// ---------------------------------------------------------------------------- +#if defined(HAVE_SFML) && HAVE_SFML #include "NetWindow.h" +#endif #include "Globals.h" // Local #include "Frame.h" @@ -654,9 +651,13 @@ void CFrame::OnHelp(wxCommandEvent& event) // NetPlay stuff void CFrame::OnNetPlay(wxCommandEvent& WXUNUSED (event)) { +#if defined(HAVE_SFML) && HAVE_SFML + new NetPlay(this, m_GameListCtrl->GetGamePaths(), m_GameListCtrl->GetGameNames()); +#endif } + // Miscellaneous menu void CFrame::OnMemcard(wxCommandEvent& WXUNUSED (event)) { |