diff --git a/Source/Core/DebuggerWX/Src/BreakpointDlg.cpp b/Source/Core/DebuggerWX/Src/BreakpointDlg.cpp index a3a924a554..7d54e1bd06 100644 --- a/Source/Core/DebuggerWX/Src/BreakpointDlg.cpp +++ b/Source/Core/DebuggerWX/Src/BreakpointDlg.cpp @@ -50,15 +50,12 @@ void BreakPointDlg::CreateGUIControls() SetSize(8,8,279,121); Center(); - wxStaticText* WxStaticText1 = new wxStaticText(this, ID_WXSTATICTEXT1, wxT("Address"), wxPoint(8,24), wxDefaultSize, 0, wxT("WxStaticText1")); m_pButtonOK = new wxButton(this, ID_OK, wxT("OK"), wxPoint(192,64), wxSize(73,25), 0, wxDefaultValidator, wxT("OK")); m_pButtonCancel = new wxButton(this, ID_CANCEL, wxT("Cancel"), wxPoint(112,64), wxSize(73,25), 0, wxDefaultValidator, wxT("Cancel")); m_pEditAddress = new wxTextCtrl(this, ID_ADDRESS, wxT("80000000"), wxPoint(56,24), wxSize(197,20), 0, wxDefaultValidator, wxT("WxEdit1")); - - wxStaticBox* WxStaticBox1 = new wxStaticBox(this, ID_WXSTATICBOX1, wxT("Address"), wxPoint(0,0), wxSize(265,57)); } diff --git a/Source/Core/DebuggerWX/Src/BreakpointWindow.cpp b/Source/Core/DebuggerWX/Src/BreakpointWindow.cpp index 02db5cdb1a..ab4d5defbf 100644 --- a/Source/Core/DebuggerWX/Src/BreakpointWindow.cpp +++ b/Source/Core/DebuggerWX/Src/BreakpointWindow.cpp @@ -33,7 +33,7 @@ extern "C" { #include "../resources/toolbar_delete.c" } -BEGIN_EVENT_TABLE(CBreakPointWindow, wxFrame) +BEGIN_EVENT_TABLE(CBreakPointWindow, wxPanel) EVT_CLOSE(CBreakPointWindow::OnClose) EVT_MENU(IDM_DELETE, CBreakPointWindow::OnDelete) EVT_MENU(IDM_CLEAR, CBreakPointWindow::OnClear) @@ -45,7 +45,7 @@ BEGIN_EVENT_TABLE(CBreakPointWindow, wxFrame) END_EVENT_TABLE() CBreakPointWindow::CBreakPointWindow(CCodeWindow* _pCodeWindow, wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& position, const wxSize& size, long style) - : wxFrame(parent, id, title, position, size, style) +: wxPanel(parent, id, position, size, style, title) , m_BreakPointListView(NULL) , m_pCodeWindow(_pCodeWindow) { @@ -78,8 +78,8 @@ void CBreakPointWindow::Load(IniFile& _IniFile) void CBreakPointWindow::CreateGUIControls() { - SetTitle(wxT("Breakpoints")); - SetIcon(wxNullIcon); + // SetTitle(wxT("Breakpoints")); + // SetIcon(wxNullIcon); SetSize(8, 8, 400, 370); Center(); @@ -117,18 +117,19 @@ void CBreakPointWindow::PopulateToolbar(wxToolBar* toolBar) void CBreakPointWindow::RecreateToolbar() { + // FIXME: what do we do with this? // delete and recreate the toolbar - wxToolBarBase* toolBar = GetToolBar(); - long style = toolBar ? toolBar->GetWindowStyle() : wxTB_FLAT | wxTB_DOCKABLE | wxTB_TEXT; + // wxToolBarBase* toolBar = GetToolBar(); + // long style = toolBar ? toolBar->GetWindowStyle() : wxTB_FLAT | wxTB_DOCKABLE | wxTB_TEXT; - delete toolBar; - SetToolBar(NULL); + // delete toolBar; + // SetToolBar(NULL); - style &= ~(wxTB_HORIZONTAL | wxTB_VERTICAL | wxTB_BOTTOM | wxTB_RIGHT | wxTB_HORZ_LAYOUT | wxTB_TOP); - wxToolBar* theToolBar = CreateToolBar(style, ID_TOOLBAR); + // style &= ~(wxTB_HORIZONTAL | wxTB_VERTICAL | wxTB_BOTTOM | wxTB_RIGHT | wxTB_HORZ_LAYOUT | wxTB_TOP); + // wxToolBar* theToolBar = CreateToolBar(style, ID_TOOLBAR); - PopulateToolbar(theToolBar); - SetToolBar(theToolBar); + // PopulateToolbar(theToolBar); + // SetToolBar(theToolBar); } void CBreakPointWindow::InitBitmaps() diff --git a/Source/Core/DebuggerWX/Src/BreakpointWindow.h b/Source/Core/DebuggerWX/Src/BreakpointWindow.h index e9fb6001f0..bb2909aa1c 100644 --- a/Source/Core/DebuggerWX/Src/BreakpointWindow.h +++ b/Source/Core/DebuggerWX/Src/BreakpointWindow.h @@ -24,7 +24,7 @@ class wxListEvent; class IniFile; class CBreakPointWindow - : public wxFrame + : public wxPanel { private: @@ -33,12 +33,8 @@ class CBreakPointWindow public: CBreakPointWindow(CCodeWindow* _pCodeWindow, wxWindow* parent, wxWindowID id = 1, const wxString& title = wxT("Breakpoints"), - const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(400, 250), - #ifdef _WIN32 - long style = wxNO_BORDER); - #else - long style = wxDEFAULT_FRAME_STYLE | wxCLIP_CHILDREN | wxNO_FULL_REPAINT_ON_RESIZE); - #endif + const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(400, 250), + long style = wxNO_BORDER); virtual ~CBreakPointWindow(); diff --git a/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp b/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp index 19b4923789..e630d6c975 100644 --- a/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp +++ b/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp @@ -412,7 +412,7 @@ void CCodeWindow::OnSymbolListChange(wxCommandEvent& event) { if(pSymbol->type == Symbol::SYMBOL_DATA) { - if(m_MemoryWindow && m_MemoryWindow->IsVisible()) + if(m_MemoryWindow)// && m_MemoryWindow->IsVisible()) m_MemoryWindow->JumpToAddress(pSymbol->address); } else @@ -485,18 +485,10 @@ void CCodeWindow::OnToggleBreakPointWindow(bool _Show, int i) if (_Show) { if (!m_BreakpointWindow) m_BreakpointWindow = new CBreakPointWindow(this, Parent, IDM_BREAKPOINTWINDOW); - #ifdef _WIN32 Parent->DoAddPage(m_BreakpointWindow, i, wxT("Breakpoints"), bFloatBreakpointWindow); - #else - m_BreakpointWindow->Show(); - #endif } else // hide - #ifdef _WIN32 Parent->DoRemovePage(m_BreakpointWindow); - #else - if (m_BreakpointWindow) m_BreakpointWindow->Hide(); - #endif } @@ -505,18 +497,10 @@ void CCodeWindow::OnToggleMemoryWindow(bool _Show, int i) if (_Show) { if (!m_MemoryWindow) m_MemoryWindow = new CMemoryWindow(Parent, IDM_MEMORYWINDOW); - #ifdef _WIN32 Parent->DoAddPage(m_MemoryWindow, i, wxT("Memory"), bFloatMemoryWindow); - #else - m_MemoryWindow->Show(); - #endif } else // hide - #ifdef _WIN32 Parent->DoRemovePage(m_MemoryWindow); - #else - if (m_MemoryWindow) m_MemoryWindow->Hide(); - #endif } @@ -525,18 +509,10 @@ void CCodeWindow::OnToggleJitWindow(bool _Show, int i) if (_Show) { if (!m_JitWindow) m_JitWindow = new CJitWindow(Parent, IDM_JITWINDOW); - #ifdef _WIN32 Parent->DoAddPage(m_JitWindow, i, wxT("JIT"), bFloatJitWindow); - #else - m_JitWindow->Show(); - #endif } else // hide - #ifdef _WIN32 Parent->DoRemovePage(m_JitWindow); - #else - if (m_JitWindow) m_JitWindow->Hide(); - #endif } @@ -555,9 +531,6 @@ Notice: This windows docking for plugin windows will produce several wx debuggin // Toggle Sound Debugging Window void CCodeWindow::OnToggleDLLWindow(int Id, bool _Show, int i) { -#ifdef _WIN32 - // ConsoleListener* Console = LogManager::GetInstance()->getConsoleListener(); - std::string DLLName; wxString Title; int PLUGINTYPE; @@ -616,7 +589,4 @@ void CCodeWindow::OnToggleDLLWindow(int Id, bool _Show, int i) } } -#else - CPluginManager::GetInstance().OpenDebug(Parent->GetHandle(), DLLName.c_str(), (PLUGIN_TYPE)PLUGINTYPE, _Show); -#endif -} \ No newline at end of file +} diff --git a/Source/Core/DebuggerWX/Src/JitWindow.cpp b/Source/Core/DebuggerWX/Src/JitWindow.cpp index 425da679b0..a0b489b7fd 100644 --- a/Source/Core/DebuggerWX/Src/JitWindow.cpp +++ b/Source/Core/DebuggerWX/Src/JitWindow.cpp @@ -63,7 +63,7 @@ enum IDM_BLOCKLIST, }; -BEGIN_EVENT_TABLE(CJitWindow, wxFrame) +BEGIN_EVENT_TABLE(CJitWindow, wxPanel) // EVT_TEXT(IDM_ADDRBOX, CJitWindow::OnAddrBoxChange) // EVT_LISTBOX(IDM_SYMBOLLIST, CJitWindow::OnSymbolListChange) //EVT_HOST_COMMAND(wxID_ANY, CJitWindow::OnHostMessage) @@ -73,7 +73,7 @@ END_EVENT_TABLE() CJitWindow::CJitWindow(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style) - : wxFrame(parent, id, title, pos, size, style) +: wxPanel(parent, id, pos, size, style) { the_jit_window = this; wxBoxSizer* sizerBig = new wxBoxSizer(wxVERTICAL); diff --git a/Source/Core/DebuggerWX/Src/JitWindow.h b/Source/Core/DebuggerWX/Src/JitWindow.h index b052617a28..6f898ae480 100644 --- a/Source/Core/DebuggerWX/Src/JitWindow.h +++ b/Source/Core/DebuggerWX/Src/JitWindow.h @@ -41,7 +41,7 @@ public: }; -class CJitWindow : public wxFrame +class CJitWindow : public wxPanel { public: CJitWindow(wxWindow* parent, @@ -49,12 +49,7 @@ public: const wxString& title = _T("JIT block viewer"), const wxPoint& pos = wxPoint(950, 100), const wxSize& size = wxSize(400, 500), - #ifdef _WIN32 long style = wxNO_BORDER); - #else - long style = wxDEFAULT_FRAME_STYLE | wxCLIP_CHILDREN | wxNO_FULL_REPAINT_ON_RESIZE); - #endif - ~CJitWindow(); void Save(IniFile& _IniFile) const; diff --git a/Source/Core/DebuggerWX/Src/MemoryWindow.cpp b/Source/Core/DebuggerWX/Src/MemoryWindow.cpp index 21bb4746c8..7065bca1a6 100644 --- a/Source/Core/DebuggerWX/Src/MemoryWindow.cpp +++ b/Source/Core/DebuggerWX/Src/MemoryWindow.cpp @@ -50,7 +50,7 @@ enum IDM_VALBOX, }; -BEGIN_EVENT_TABLE(CMemoryWindow, wxFrame) +BEGIN_EVENT_TABLE(CMemoryWindow, wxPanel) EVT_TEXT(IDM_MEM_ADDRBOX, CMemoryWindow::OnAddrBoxChange) EVT_LISTBOX(IDM_SYMBOLLIST, CMemoryWindow::OnSymbolListChange) EVT_HOST_COMMAND(wxID_ANY, CMemoryWindow::OnHostMessage) @@ -60,7 +60,7 @@ END_EVENT_TABLE() CMemoryWindow::CMemoryWindow(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style) - : wxFrame(parent, id, title, pos, size, style) +: wxPanel(parent, id, pos, size, style) { wxBoxSizer* sizerBig = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* sizerRight = new wxBoxSizer(wxVERTICAL); diff --git a/Source/Core/DebuggerWX/Src/MemoryWindow.h b/Source/Core/DebuggerWX/Src/MemoryWindow.h index b12d59937b..746c81618b 100644 --- a/Source/Core/DebuggerWX/Src/MemoryWindow.h +++ b/Source/Core/DebuggerWX/Src/MemoryWindow.h @@ -32,20 +32,16 @@ class CRegisterWindow; class CBreakPointWindow; class CMemoryWindow - : public wxFrame + : public wxPanel { public: CMemoryWindow(wxWindow* parent, - wxWindowID id = wxID_ANY, - const wxString& title = _T("Dolphin-Memory"), - const wxPoint& pos = wxPoint(950, 100), - const wxSize& size = wxSize(400, 500), - #ifdef _WIN32 - long style = wxNO_BORDER); - #else - long style = wxDEFAULT_FRAME_STYLE | wxCLIP_CHILDREN | wxNO_FULL_REPAINT_ON_RESIZE); - #endif + wxWindowID id = wxID_ANY, + const wxString& title = _T("Dolphin-Memory"), + const wxPoint& pos = wxPoint(950, 100), + const wxSize& size = wxSize(400, 500), + long style = wxNO_BORDER); ~CMemoryWindow();