summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/FrameAui.cpp
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2014-02-23 02:38:46 -0500
committerLioncash <mathew1800@gmail.com>2014-02-23 03:12:24 -0500
commit8d57f38be7af319cfecc450bd183d9c7932664c8 (patch)
tree6e1d54e325bfcc2aeae486dd27fa02947962569b /Source/Core/DolphinWX/FrameAui.cpp
parentd45351a43fcdb132b966999b024878a2e799f659 (diff)
Purge wx elements of the console.
Diffstat (limited to 'Source/Core/DolphinWX/FrameAui.cpp')
-rw-r--r--Source/Core/DolphinWX/FrameAui.cpp107
1 files changed, 4 insertions, 103 deletions
diff --git a/Source/Core/DolphinWX/FrameAui.cpp b/Source/Core/DolphinWX/FrameAui.cpp
index 55190dd51b..72f1135053 100644
--- a/Source/Core/DolphinWX/FrameAui.cpp
+++ b/Source/Core/DolphinWX/FrameAui.cpp
@@ -57,7 +57,6 @@ void CFrame::OnManagerResize(wxAuiManagerEvent& event)
m_LogWindow->winpos = m_Mgr->GetPane(_T("Pane 1")).dock_direction;
}
event.Skip();
- ResizeConsole();
}
void CFrame::OnPaneClose(wxAuiManagerEvent& event)
@@ -70,14 +69,11 @@ void CFrame::OnPaneClose(wxAuiManagerEvent& event)
if (!g_pCodeWindow)
{
if (nb->GetPage(0)->GetId() == IDM_LOGWINDOW ||
- nb->GetPage(0)->GetId() == IDM_LOGCONFIGWINDOW ||
- nb->GetPage(0)->GetId() == IDM_CONSOLEWINDOW)
+ nb->GetPage(0)->GetId() == IDM_LOGCONFIGWINDOW)
{
- // Closing a pane containing the logwindow or a console closes both
- SConfig::GetInstance().m_InterfaceConsole = false;
+
SConfig::GetInstance().m_InterfaceLogWindow = false;
SConfig::GetInstance().m_InterfaceLogConfigWindow = false;
- ToggleConsole(false);
ToggleLogWindow(false);
ToggleLogConfigWindow(false);
}
@@ -163,59 +159,6 @@ void CFrame::ToggleLogConfigWindow(bool bShow)
TogglePane();
}
-void CFrame::ToggleConsole(bool bShow)
-{
-#ifdef _WIN32
- GetMenuBar()->FindItem(IDM_CONSOLEWINDOW)->Check(bShow);
-
- if (bShow)
- {
- // If the console doesn't exist, we create it
- if (!GetConsoleWindow())
- {
- ConsoleListener *Console = LogManager::GetInstance()->GetConsoleListener();
- Console->Open();
- }
- else
- {
- ShowWindow(GetConsoleWindow(), SW_SHOW);
- }
-
- // Create the parent window if it doesn't exist
- wxPanel *ConsoleParent = (wxPanel*)FindWindowById(IDM_CONSOLEWINDOW);
- if (!ConsoleParent) ConsoleParent = new wxPanel(this, IDM_CONSOLEWINDOW,
- wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL, _("Console"));
-
- wxWindow *ConsoleWin = new wxWindow();
- ConsoleWin->SetHWND((WXHWND)GetConsoleWindow());
- ConsoleWin->AdoptAttributesFromHWND();
- ConsoleWin->Reparent(ConsoleParent);
-
- ConsoleParent->Enable();
- const int nbIndex = IDM_CONSOLEWINDOW - IDM_LOGWINDOW;
- DoAddPage(ConsoleParent,
- g_pCodeWindow ? g_pCodeWindow->iNbAffiliation[nbIndex] : 0,
- g_pCodeWindow ? bFloatWindow[nbIndex] : false);
- }
- else // Hide
- {
- if(GetConsoleWindow())
- ShowWindow(GetConsoleWindow(), SW_HIDE); // WIN32
-
- wxPanel *ConsoleParent = (wxPanel*)FindWindowById(IDM_CONSOLEWINDOW);
- if (ConsoleParent)
- ConsoleParent->Disable();
-
- // Then close the page
- DoRemovePage(ConsoleParent, true);
- }
-
- // Hide or Show the pane
- if (!g_pCodeWindow)
- TogglePane();
-#endif
-}
-
void CFrame::OnToggleWindow(wxCommandEvent& event)
{
bool bShow = GetMenuBar()->IsChecked(event.GetId());
@@ -232,11 +175,6 @@ void CFrame::OnToggleWindow(wxCommandEvent& event)
SConfig::GetInstance().m_InterfaceLogConfigWindow = bShow;
ToggleLogConfigWindow(bShow);
break;
- case IDM_CONSOLEWINDOW:
- if (!g_pCodeWindow)
- SConfig::GetInstance().m_InterfaceConsole = bShow;
- ToggleConsole(bShow);
- break;
case IDM_REGISTERWINDOW:
g_pCodeWindow->ToggleRegisterWindow(bShow);
break;
@@ -264,7 +202,7 @@ void CFrame::ClosePages()
{
ToggleLogWindow(false);
ToggleLogConfigWindow(false);
- ToggleConsole(false);
+
if (g_pCodeWindow)
{
g_pCodeWindow->ToggleCodeWindow(false);
@@ -306,8 +244,6 @@ void CFrame::OnNotebookPageClose(wxAuiNotebookEvent& event)
ToggleLogWindow(false);
if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_LOGCONFIGWINDOW)
ToggleLogConfigWindow(false);
- if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_CONSOLEWINDOW)
- ToggleConsole(false);
if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_REGISTERWINDOW)
g_pCodeWindow->ToggleRegisterWindow(false);
if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_BREAKPOINTWINDOW)
@@ -330,7 +266,6 @@ void CFrame::OnFloatingPageClosed(wxCloseEvent& event)
void CFrame::OnFloatingPageSize(wxSizeEvent& event)
{
event.Skip();
- ResizeConsole();
}
void CFrame::OnFloatWindow(wxCommandEvent& event)
@@ -393,8 +328,7 @@ void CFrame::OnTab(wxAuiNotebookEvent& event)
// Create the popup menu
wxMenu* MenuPopup = new wxMenu;
- wxMenuItem* Item = new wxMenuItem(MenuPopup, wxID_ANY,
- _("Select floating windows"));
+ wxMenuItem* Item = new wxMenuItem(MenuPopup, wxID_ANY, _("Select floating windows"));
MenuPopup->Append(Item);
Item->Enable(false);
MenuPopup->Append(new wxMenuItem(MenuPopup));
@@ -423,7 +357,6 @@ void CFrame::OnAllowNotebookDnD(wxAuiNotebookEvent& event)
{
event.Skip();
event.Allow();
- ResizeConsole();
}
void CFrame::ShowResizePane()
@@ -803,33 +736,6 @@ void CFrame::OnSelectPerspective(wxCommandEvent& event)
DoLoadPerspective();
}
-void CFrame::ResizeConsole()
-{
-#ifdef _WIN32
- // Get the console parent window
- wxWindow * Win = FindWindowById(IDM_CONSOLEWINDOW);
- if (!Win) return;
-
- const int wxBorder = 2, Border = 4,
- MenuBar = 30, ScrollBar = 19;
-
- // Get the client size
- int X = Win->GetSize().GetX();
- int Y = Win->GetSize().GetY();
- int InternalWidth = X - wxBorder*2 - ScrollBar;
- int InternalHeight = Y - wxBorder*2;
- int WindowWidth = InternalWidth + Border*2 +
- /*max out the width in the word wrap mode*/ 100;
- int WindowHeight = InternalHeight + MenuBar;
- // Resize buffer
- ConsoleListener* Console = LogManager::GetInstance()->GetConsoleListener();
- Console->PixelSpace(0,0, InternalWidth, InternalHeight, false);
- // Move the window to hide the border
- MoveWindow(GetConsoleWindow(), -Border-wxBorder, -MenuBar-wxBorder,
- WindowWidth + 100, WindowHeight, true);
-#endif
-}
-
static int Limit(int i, int Low, int High)
{
if (i < Low) return Low;
@@ -1094,11 +1000,6 @@ wxFrame * CFrame::CreateParentFrame(wxWindowID Id, const wxString& Title,
Frame->Bind(wxEVT_CLOSE_WINDOW, &CFrame::OnFloatingPageClosed, this);
- if (Id == IDM_CONSOLEWINDOW_PARENT)
- {
- Frame->Bind(wxEVT_SIZE, &CFrame::OnFloatingPageSize, this);
- }
-
// Main sizer
Frame->SetSizer(m_MainSizer);
// Minimum frame size