mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-11-15 05:47:56 -07:00
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
This commit is contained in:
parent
bd4d583ea9
commit
f3901b6b43
@ -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
|
||||
}
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user