a temporary hack to make testing wxTLW/Univ easier

[wxWidgets.git] / src / mgl / toplevel.cpp

diff --git a/src/mgl/toplevel.cpp b/src/mgl/toplevel.cpp
index 49d9d10403af847b6e20c8d2c74fd46819503843..1cf60d5e6f7469f68c4e6171f459de0b0a280cc1 100644 (file)
--- a/src/mgl/toplevel.cpp
+++ b/src/mgl/toplevel.cpp
@@ -136,24 +136,33 @@ bool wxTopLevelWindowMGL::ShowFullScreen(bool show, long style)
     return TRUE;
 }
 
     return TRUE;
 }
 

+bool wxTopLevelWindowMGL::Show(bool show)
+{
+    bool ret = wxTopLevelWindowBase::Show(show);
+    if ( ret && show )
+        SetFocus();
+    return ret;
+}
+

 void wxTopLevelWindowMGL::Maximize(bool maximize)
 {
     if ( maximize && !m_isMaximized )
     {
         int x, y, w, h;
         
 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);
         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 )
     {
     }
     else if ( !maximize && m_isMaximized )
     {

+        m_isMaximized = FALSE;

         SetSize(m_savedFrame.x, m_savedFrame.y, 
                 m_savedFrame.width, m_savedFrame.height);
         SetSize(m_savedFrame.x, m_savedFrame.y, 
                 m_savedFrame.width, m_savedFrame.height);

-        m_isMaximized = FALSE;

     }
 }
 
     }
 }
 


@@ -164,11 +173,11 @@ bool wxTopLevelWindowMGL::IsMaximized() const
 
 void wxTopLevelWindowMGL::Restore()
 {
 
 void wxTopLevelWindowMGL::Restore()
 {

-    if ( m_isIconized )
+    if ( IsIconized() )

     {
         Iconize(FALSE);
     }
     {
         Iconize(FALSE);
     }

-    if ( m_isMaximized )
+    if ( IsMaximized() )

     {
         Maximize(FALSE);
     }
     {
         Maximize(FALSE);
     }