diff --git a/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp b/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp index 8fcb29b0d1..b119c001fd 100644 --- a/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp +++ b/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp @@ -93,6 +93,8 @@ void CCodeWindow::Load() DebuggerFont.SetNativeFontInfoUserDesc(wxString::FromAscii(fontDesc.c_str())); // Decide what windows to use + // This stuff really doesn't belong in CodeWindow anymore, does it? It should be + // in Frame.cpp somewhere, even though it's debugger stuff. ini.Get("ShowOnStart", "Code", &bCodeWindow, true); ini.Get("ShowOnStart", "Registers", &bRegisterWindow, false); ini.Get("ShowOnStart", "Breakpoints", &bBreakpointWindow, false); diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index 5661987dab..3f81754795 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -325,8 +325,11 @@ CFrame::CFrame(wxFrame* parent, bool _UseDebugger, bool ShowLogWindow, long style) - : wxFrame(parent, id, title, pos, size, style), g_pCodeWindow(NULL) - , m_LogWindow(NULL), m_MenuBar(NULL), m_ToolBar(NULL), m_ToolBarDebug(NULL), m_ToolBarAui(NULL) + : wxFrame(parent, id, title, pos, size, style) + , g_pCodeWindow(NULL) + , m_MenuBar(NULL) + , m_LogWindow(NULL) + , m_ToolBar(NULL), m_ToolBarDebug(NULL), m_ToolBarAui(NULL) , m_pStatusBar(NULL), m_GameListCtrl(NULL), m_Panel(NULL) , UseDebugger(_UseDebugger), m_bEdit(false), m_bTabSplit(false), m_bNoDocking(false) , bRenderToMain(true), bFloatLogWindow(false), bFloatConsoleWindow(false) @@ -391,7 +394,12 @@ CFrame::CFrame(wxFrame* parent, // --------------- // Manager +#ifdef _WIN32 m_Mgr = new wxAuiManager(this, wxAUI_MGR_DEFAULT | wxAUI_MGR_LIVE_RESIZE); +#else + // wxAUI_MGR_LIVE_RESIZE does not exist in the wxWidgets 2.8 that comes with the latest ubuntu. + m_Mgr = new wxAuiManager(this, wxAUI_MGR_DEFAULT); +#endif NOTEBOOK_STYLE = wxAUI_NB_TOP | wxAUI_NB_TAB_SPLIT | wxAUI_NB_TAB_EXTERNAL_MOVE | wxAUI_NB_SCROLL_BUTTONS | wxAUI_NB_WINDOWLIST_BUTTON | wxNO_BORDER; TOOLBAR_STYLE = wxAUI_TB_DEFAULT_STYLE | wxAUI_TB_TEXT /*wxAUI_TB_OVERFLOW overflow visible*/; wxBitmap aNormalFile = wxArtProvider::GetBitmap(wxART_NORMAL_FILE, wxART_OTHER, wxSize(16,16)); diff --git a/Source/Core/DolphinWX/Src/Frame.h b/Source/Core/DolphinWX/Src/Frame.h index 20acd03b1b..8c5f702519 100644 --- a/Source/Core/DolphinWX/Src/Frame.h +++ b/Source/Core/DolphinWX/Src/Frame.h @@ -45,7 +45,6 @@ class CLogWindow; class CFrame : public wxFrame { public: - CFrame(wxFrame* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Dolphin"), @@ -156,7 +155,7 @@ class CFrame : public wxFrame void OnFloatingPageSize(wxSizeEvent& event); void DoFloatNotebookPage(wxWindowID Id); wxFrame * CreateParentFrame(wxWindowID Id = wxID_ANY, const wxString& title = wxT(""), wxWindow * = NULL); - // User perspectives + // User perspectives. Should find a way to make these private. struct SPerspectives { std::string Name; @@ -180,7 +179,6 @@ class CFrame : public wxFrame void OnSelectPerspective(wxCommandEvent& event); private: - wxStatusBar* m_pStatusBar; wxBoxSizer* sizerPanel; wxBoxSizer* sizerFrame; diff --git a/Source/Plugins/Plugin_Wiimote/Src/EmuMain.cpp b/Source/Plugins/Plugin_Wiimote/Src/EmuMain.cpp index 4a3c542b8a..6d27e3b63d 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/EmuMain.cpp +++ b/Source/Plugins/Plugin_Wiimote/Src/EmuMain.cpp @@ -33,6 +33,7 @@ #include "EmuMain.h" #include "Encryption.h" // for extension encryption #include "Config.h" // for g_Config + extern SWiimoteInitialize g_WiimoteInitialize; namespace WiiMoteEmu @@ -372,11 +373,6 @@ void ExtensionChecksum(u8 * Calibration) // Set initial valuesm this done both in Init and Shutdown void ResetVariables() { - u8 g_Leds = 0x0; // 4 bits - u8 g_Speaker = 0x0; // 1 = on - u8 g_SpeakerVoice = 0x0; // 1 = on - u8 g_IR = 0x0; // 1 = on - g_ReportingMode = 0; g_ReportingChannel = 0; g_Encryption = false; @@ -744,15 +740,14 @@ void readKeyboard() { key = XLookupKeysym((XKeyEvent*)&E, 0); - if((key >= XK_F1 && key <= XK_F9) || + if ((key >= XK_F1 && key <= XK_F9) || key == XK_Shift_L || key == XK_Shift_R || key == XK_Control_L || key == XK_Control_R) { XPutBackEvent(WMdisplay, &E); break; } - int i; - for (i = g_Wiimote_kbd.A; i < g_Wiimote_kbd.LAST_CONSTANT; i++) + for (int i = g_Wiimote_kbd.A; i < g_Wiimote_kbd.LAST_CONSTANT; i++) { if (key == PadMapping[0].Wm.keyForControls[i - g_Wiimote_kbd.A]) KeyStatus[i] = true; @@ -760,21 +755,21 @@ void readKeyboard() switch (g_Config.iExtensionConnected) { case EXT_NUNCHUCK: - for (i = g_NunchuckExt.Z; i < g_NunchuckExt.LAST_CONSTANT; i++) + for (int i = g_NunchuckExt.Z; i < g_NunchuckExt.LAST_CONSTANT; i++) { if (key == PadMapping[0].Nc.keyForControls[i - g_NunchuckExt.Z]) KeyStatus[i] = true; } break; case EXT_CLASSIC_CONTROLLER: - for (i = g_ClassicContExt.A; i < g_ClassicContExt.LAST_CONSTANT; i++) + for (int i = g_ClassicContExt.A; i < g_ClassicContExt.LAST_CONSTANT; i++) { if (key == PadMapping[0].Cc.keyForControls[i - g_ClassicContExt.A]) KeyStatus[i] = true; } break; case EXT_GUITARHERO3_CONTROLLER: - for (i = g_GH3Ext.Green; i < g_GH3Ext.LAST_CONSTANT; i++) + for (int i = g_GH3Ext.Green; i < g_GH3Ext.LAST_CONSTANT; i++) { if (key == PadMapping[0].GH3c.keyForControls[i - g_GH3Ext.Green]) KeyStatus[i] = true; @@ -789,15 +784,14 @@ void readKeyboard() { key = XLookupKeysym((XKeyEvent*)&E, 0); - if((key >= XK_F1 && key <= XK_F9) || + if ((key >= XK_F1 && key <= XK_F9) || key == XK_Shift_L || key == XK_Shift_R || key == XK_Control_L || key == XK_Control_R) { XPutBackEvent(WMdisplay, &E); break; } - int i; - for (i = g_Wiimote_kbd.A; i < g_Wiimote_kbd.LAST_CONSTANT; i++) + for (int i = g_Wiimote_kbd.A; i < g_Wiimote_kbd.LAST_CONSTANT; i++) { if (key == PadMapping[0].Wm.keyForControls[i - g_Wiimote_kbd.A]) KeyStatus[i] = false; @@ -805,21 +799,21 @@ void readKeyboard() switch (g_Config.iExtensionConnected) { case EXT_NUNCHUCK: - for (i = g_NunchuckExt.Z; i < g_NunchuckExt.LAST_CONSTANT; i++) + for (int i = g_NunchuckExt.Z; i < g_NunchuckExt.LAST_CONSTANT; i++) { if (key == PadMapping[0].Nc.keyForControls[i - g_NunchuckExt.Z]) KeyStatus[i] = false; } break; case EXT_CLASSIC_CONTROLLER: - for (i = g_ClassicContExt.A; i < g_ClassicContExt.LAST_CONSTANT; i++) + for (int i = g_ClassicContExt.A; i < g_ClassicContExt.LAST_CONSTANT; i++) { if (key == PadMapping[0].Cc.keyForControls[i - g_ClassicContExt.A]) KeyStatus[i] = false; } break; case EXT_GUITARHERO3_CONTROLLER: - for (i = g_GH3Ext.Green; i < g_GH3Ext.LAST_CONSTANT; i++) + for (int i = g_GH3Ext.Green; i < g_GH3Ext.LAST_CONSTANT; i++) { if (key == PadMapping[0].GH3c.keyForControls[i - g_GH3Ext.Green]) KeyStatus[i] = false;