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 -#if defined(HAVE_WX) && HAVE_WX #include #include #include @@ -16,7 +15,6 @@ #include #include #include -#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 #include -#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