avoiding nesting dcs on the same window concurrently

[wxWidgets.git] / src / gtk / frame.cpp

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index b6c8bc5e423b05f5a1818e1cfbbab0ecf0646db8..b7b4fec93ab612832719356164a4c8b17714ec1d 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -221,7 +221,7 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const
     {
 #if wxUSE_MENUS_NATIVE
         // menu bar
     {
 #if wxUSE_MENUS_NATIVE
         // menu bar

-        if (m_frameMenuBar)
+        if (m_frameMenuBar && !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOMENUBAR != 0)))

         {
             if (!m_menuBarDetached)
                 (*height) -= m_menuBarHeight;
         {
             if (!m_menuBarDetached)
                 (*height) -= m_menuBarHeight;


@@ -232,7 +232,8 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const
 
 #if wxUSE_STATUSBAR
         // status bar
 
 #if wxUSE_STATUSBAR
         // status bar

-        if (m_frameStatusBar && m_frameStatusBar->IsShown())
+        if (m_frameStatusBar && m_frameStatusBar->IsShown() && 
+            !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOSTATUSBAR != 0)))

             (*height) -= wxSTATUS_HEIGHT;
 #endif // wxUSE_STATUSBAR
     }
             (*height) -= wxSTATUS_HEIGHT;
 #endif // wxUSE_STATUSBAR
     }


@@ -276,7 +277,7 @@ void wxFrame::DoSetClientSize( int width, int height )
 
 #if wxUSE_MENUS_NATIVE
         // menu bar
 
 #if wxUSE_MENUS_NATIVE
         // menu bar

-        if (m_frameMenuBar)
+        if (m_frameMenuBar && !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOMENUBAR != 0)))

         {
             if (!m_menuBarDetached)
                 height += m_menuBarHeight;
         {
             if (!m_menuBarDetached)
                 height += m_menuBarHeight;


@@ -287,7 +288,9 @@ void wxFrame::DoSetClientSize( int width, int height )
 
 #if wxUSE_STATUSBAR
         // status bar
 
 #if wxUSE_STATUSBAR
         // status bar

-        if (m_frameStatusBar && m_frameStatusBar->IsShown()) height += wxSTATUS_HEIGHT;
+        if (m_frameStatusBar && m_frameStatusBar->IsShown() && 
+            !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOSTATUSBAR != 0)))
+            height += wxSTATUS_HEIGHT;

 #endif
 
 #if wxUSE_TOOLBAR
 #endif
 
 #if wxUSE_TOOLBAR


@@ -362,16 +365,17 @@ void wxFrame::GtkOnSize()
                                        (GtkWidget*) NULL,
                                        &geom,
                                        (GdkWindowHints) flag );
                                        (GtkWidget*) NULL,
                                        &geom,
                                        (GdkWindowHints) flag );

+        // TODO
+        // Rewrite this terrible code to using GtkVBox

 
 

-        // I revert back to wxGTK's original behaviour. m_mainWidget holds
-        // the menubar, the toolbar and the client area, which is represented
-        // by m_wxwindow.
-        // This hurts in the eye, but I don't want to call SetSize()
-        // because I don't want to call any non-native functions here.
+        // m_mainWidget holds the menubar, the toolbar and the client
+        // area, which is represented by m_wxwindow.

 
 #if wxUSE_MENUS_NATIVE
 
 #if wxUSE_MENUS_NATIVE

-        if (m_frameMenuBar)
+        if (m_frameMenuBar && !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOMENUBAR != 0)))

         {
         {

+            if (!GTK_WIDGET_VISIBLE(m_frameMenuBar->m_widget))
+                gtk_widget_show( m_frameMenuBar->m_widget );

             int xx = m_miniEdge;
             int yy = m_miniEdge + m_miniTitle;
             int ww = m_width  - 2*m_miniEdge;
             int xx = m_miniEdge;
             int yy = m_miniEdge + m_miniTitle;
             int ww = m_width  - 2*m_miniEdge;


@@ -388,6 +392,14 @@ void wxFrame::GtkOnSize()
                                   xx, yy, ww, hh );
             client_area_y_offset += hh;
         }
                                   xx, yy, ww, hh );
             client_area_y_offset += hh;
         }

+        else
+        {
+            if (m_frameMenuBar)
+            {
+                if (GTK_WIDGET_VISIBLE(m_frameMenuBar->m_widget))
+                    gtk_widget_hide( m_frameMenuBar->m_widget );
+            }
+        }

 #endif // wxUSE_MENUS_NATIVE
 
 #if wxUSE_TOOLBAR
 #endif // wxUSE_MENUS_NATIVE
 
 #if wxUSE_TOOLBAR


@@ -416,8 +428,6 @@ void wxFrame::GtkOnSize()
                 ww = m_toolBarDetached ? wxPLACE_HOLDER
                                        : m_frameToolBar->m_width;
                 hh = m_height - 2*m_miniEdge;
                 ww = m_toolBarDetached ? wxPLACE_HOLDER
                                        : m_frameToolBar->m_width;
                 hh = m_height - 2*m_miniEdge;

-                if (hh < 0)
-                    hh = 0;

 
                 client_area_x_offset += ww;
             }
 
                 client_area_x_offset += ww;
             }


@@ -443,6 +453,10 @@ void wxFrame::GtkOnSize()
                 client_area_y_offset += hh;
             }
 
                 client_area_y_offset += hh;
             }
 

+            if (ww < 0)
+                ww = 0;
+            if (hh < 0)
+                hh = 0;

             gtk_pizza_set_size( GTK_PIZZA(m_mainWidget),
                                   m_frameToolBar->m_widget,
                                   xx, yy, ww, hh );
             gtk_pizza_set_size( GTK_PIZZA(m_mainWidget),
                                   m_frameToolBar->m_widget,
                                   xx, yy, ww, hh );


@@ -468,8 +482,12 @@ void wxFrame::GtkOnSize()
     }
 
 #if wxUSE_STATUSBAR
     }
 
 #if wxUSE_STATUSBAR

-    if (m_frameStatusBar && m_frameStatusBar->IsShown())
+    if (m_frameStatusBar && m_frameStatusBar->IsShown() &&
+        !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOSTATUSBAR != 0)))

     {
     {

+        if (!GTK_WIDGET_VISIBLE(m_frameStatusBar->m_widget))
+            gtk_widget_show( m_frameStatusBar->m_widget );
+            

         int xx = 0 + m_miniEdge;
         int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge - client_area_y_offset;
         int ww = m_width - 2*m_miniEdge;
         int xx = 0 + m_miniEdge;
         int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge - client_area_y_offset;
         int ww = m_width - 2*m_miniEdge;


@@ -484,6 +502,14 @@ void wxFrame::GtkOnSize()
                             m_frameStatusBar->m_widget,
                             xx, yy, ww, hh );
     }
                             m_frameStatusBar->m_widget,
                             xx, yy, ww, hh );
     }

+    else
+    {
+        if (m_frameStatusBar)
+        {
+            if (GTK_WIDGET_VISIBLE(m_frameStatusBar->m_widget))
+                gtk_widget_hide( m_frameStatusBar->m_widget );
+        }
+    }

 #endif // wxUSE_STATUSBAR
 
     m_sizeSet = true;
 #endif // wxUSE_STATUSBAR
 
     m_sizeSet = true;