diff options
| author | dapetcu21 <dapetcu21@gmail.com> | 2010-07-05 18:31:57 +0000 |
|---|---|---|
| committer | dapetcu21 <dapetcu21@gmail.com> | 2010-07-05 18:31:57 +0000 |
| commit | f3901b6b43f31db0675a9bdf9b3f68edea549b40 (patch) | |
| tree | 2033285b6306d89aab3244e392fdb92e900561e5 /Source/Core/InputCommon | |
| parent | bd4d583ea91d9fc3eee6af1d194934061be9ff86 (diff) | |
Fixed linux buid... hopefully. Sorry it took this long.... I had to do a complete rebuild :p
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5838 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/InputCommon')
| -rw-r--r-- | Source/Core/InputCommon/Src/UDPWrapper.cpp | 6 | ||||
| -rw-r--r-- | Source/Core/InputCommon/Src/UDPWrapper.h | 8 |
2 files changed, 2 insertions, 12 deletions
diff --git a/Source/Core/InputCommon/Src/UDPWrapper.cpp b/Source/Core/InputCommon/Src/UDPWrapper.cpp index 76527ee601..bab0869c18 100644 --- a/Source/Core/InputCommon/Src/UDPWrapper.cpp +++ b/Source/Core/InputCommon/Src/UDPWrapper.cpp @@ -5,7 +5,6 @@ #include <string.h> -#if defined(HAVE_WX) && HAVE_WX #include <wx/wx.h> #include <wx/listbox.h> #include <wx/textctrl.h> @@ -16,7 +15,6 @@ #include <wx/notebook.h> #include <wx/panel.h> #include <wx/spinctrl.h> -#endif UDPWrapper::UDPWrapper(int indx, const char* const _name) : updIR(false),updAccel(false), @@ -97,7 +95,6 @@ UDPWrapper::~UDPWrapper() delete inst; } -#if defined(HAVE_WX) && HAVE_WX #define _connect_macro_(b, f, c, s) (b)->Connect(wxID_ANY, (c), wxCommandEventHandler( f ), (wxObject*)0, (wxEvtHandler*)s) @@ -187,5 +184,4 @@ void UDPWrapper::Configure(wxWindow * parent) wxDialog * diag = new UDPConfigDiag(parent,this); diag->ShowModal(); diag->Destroy(); -} -#endif
\ No newline at end of file +}
\ No newline at end of file diff --git a/Source/Core/InputCommon/Src/UDPWrapper.h b/Source/Core/InputCommon/Src/UDPWrapper.h index b637f97edd..7179e08522 100644 --- a/Source/Core/InputCommon/Src/UDPWrapper.h +++ b/Source/Core/InputCommon/Src/UDPWrapper.h @@ -6,10 +6,7 @@ #include <IniFile.h> #include <string> -#if defined(HAVE_WX) && HAVE_WX class wxWindow; -#endif - class UDPWiimote; class Wiimote; @@ -25,10 +22,7 @@ public: virtual void LoadConfig(IniFile::Section *sec, const std::string& defdev = "", const std::string& base = "" ); virtual void SaveConfig(IniFile::Section *sec, const std::string& defdev = "", const std::string& base = "" ); void Refresh(); -#if defined(HAVE_WX) && HAVE_WX - void Configure(wxWindow * parent); -#endif - virtual ~UDPWrapper(); + void Configure(wxWindow * parent); virtual ~UDPWrapper(); }; #endif |