X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7d9f12f3b9f997b6308faf336d5381be591b71f4..d21d2e5adf7a5acf3b496a9c4e87eab220bd75d8:/src/mgl/toplevel.cpp diff --git a/src/mgl/toplevel.cpp b/src/mgl/toplevel.cpp index 4a098e2a7e..d02dac8c3e 100644 --- a/src/mgl/toplevel.cpp +++ b/src/mgl/toplevel.cpp @@ -28,13 +28,12 @@ #include "wx/defs.h" #include "wx/toplevel.h" +#include "wx/app.h" // ---------------------------------------------------------------------------- // idle system // ---------------------------------------------------------------------------- -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; extern int g_openDialogs; // ---------------------------------------------------------------------------- @@ -45,12 +44,6 @@ extern int g_openDialogs; IMPLEMENT_DYNAMIC_CLASS(wxTopLevelWindow, wxWindow) #endif -// ---------------------------------------------------------------------------- -// data -// ---------------------------------------------------------------------------- - -extern wxList wxPendingDelete; - // ============================================================================ // implementation @@ -58,9 +51,11 @@ extern wxList wxPendingDelete; void wxTopLevelWindowMGL::Init() { + m_isShown = FALSE; m_isIconized = FALSE; m_isMaximized = FALSE; m_fsIsShowing = FALSE; + m_sizeSet = FALSE; } bool wxTopLevelWindowMGL::Create(wxWindow *parent, @@ -82,15 +77,15 @@ bool wxTopLevelWindowMGL::Create(wxWindow *parent, if ( size.y == -1 ) size.y = sizeDpy.y / 5; } + + wxWindow::Create(NULL, id, pos, sizeOrig, style, name); + SetParent(parent); + if ( parent ) + parent->AddChild(this); wxTopLevelWindows.Append(this); - m_title = title; - - if (m_parent) - m_parent->AddChild(this); - return TRUE; } @@ -124,7 +119,7 @@ bool wxTopLevelWindowMGL::ShowFullScreen(bool show, long style) GetSize(&m_fsSaveFrame.width, &m_fsSaveFrame.height); if ( style & wxFULLSCREEN_NOCAPTION ) - m_windowStyle &= !wxCAPTION; + m_windowStyle &= ~wxCAPTION; if ( style & wxFULLSCREEN_NOBORDER ) m_windowStyle = wxSIMPLE_BORDER; @@ -142,24 +137,45 @@ bool wxTopLevelWindowMGL::ShowFullScreen(bool show, long style) return TRUE; } +bool wxTopLevelWindowMGL::Show(bool show) +{ + bool ret = wxTopLevelWindowBase::Show(show); + + // If this is the first time Show was called, send size event, + // so that the frame can adjust itself (think auto layout or single child) + if ( !m_sizeSet ) + { + m_sizeSet = TRUE; + wxSizeEvent event(GetSize(), GetId()); + event.SetEventObject(this); + GetEventHandler()->ProcessEvent(event); + } + + if ( ret && show && AcceptsFocus() ) + SetFocus(); + // FIXME_MGL -- don't do this for popup windows? + return ret; +} + void wxTopLevelWindowMGL::Maximize(bool maximize) { if ( maximize && !m_isMaximized ) { int x, y, w, h; + m_isMaximized = TRUE; + GetPosition(&m_savedFrame.x, &m_savedFrame.y); GetSize(&m_savedFrame.width, &m_savedFrame.height); wxClientDisplayRect(&x, &y, &w, &h); SetSize(x, y, w, h); - m_isMaximized = TRUE; } else if ( !maximize && m_isMaximized ) { + m_isMaximized = FALSE; SetSize(m_savedFrame.x, m_savedFrame.y, m_savedFrame.width, m_savedFrame.height); - m_isMaximized = FALSE; } } @@ -170,19 +186,21 @@ bool wxTopLevelWindowMGL::IsMaximized() const void wxTopLevelWindowMGL::Restore() { - if ( m_isIconized ) + if ( IsIconized() ) { Iconize(FALSE); } - if ( m_isMaximized ) + if ( IsMaximized() ) { Maximize(FALSE); } } -void wxTopLevelWindowMGL::Iconize(bool iconize) +void wxTopLevelWindowMGL::Iconize(bool WXUNUSED(iconize)) { - // FIXME_MGL + wxFAIL_MSG(wxT("Iconize not supported under wxMGL")); + // FIXME_MGL - Iconize is not supported in fullscreen mode. + // It will be supported in windowed mode (if ever implemented in MGL...) } bool wxTopLevelWindowMGL::IsIconized() const