PCH-less build fix

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

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 0690e2602bb49b2149cb186a687d1689d5ad7f2f..48b111dc80732e6a1384238459cf86f242be9dd8 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -310,6 +310,9 @@ void wxFrame::GtkOnSize()
 
     ConstrainSize();
 
 
     ConstrainSize();
 

+    int width, height;
+    GTKDoGetSize(&width, &height);
+

     if (m_mainWidget)
     {
         // TODO
     if (m_mainWidget)
     {
         // TODO


@@ -318,13 +321,16 @@ void wxFrame::GtkOnSize()
         // m_mainWidget holds the menubar, the toolbar and the client
         // area, which is represented by m_wxwindow.
 
         // m_mainWidget holds the menubar, the toolbar and the client
         // area, which is represented by m_wxwindow.
 

+#if wxUSE_MENUS_NATIVE

         int menubarHeight = 0;
         int menubarHeight = 0;

+#endif
+

 #if wxUSE_MENUS_NATIVE
         if (HasVisibleMenubar())
         {
             int xx = m_miniEdge;
             int yy = m_miniEdge + m_miniTitle;
 #if wxUSE_MENUS_NATIVE
         if (HasVisibleMenubar())
         {
             int xx = m_miniEdge;
             int yy = m_miniEdge + m_miniTitle;

-            int ww = m_width  - 2*m_miniEdge;
+            int ww = width - 2*m_miniEdge;

             if (ww < 0)
                 ww = 0;
             menubarHeight = m_menuBarHeight;
             if (ww < 0)
                 ww = 0;
             menubarHeight = m_menuBarHeight;


@@ -345,7 +351,11 @@ void wxFrame::GtkOnSize()
             (m_frameToolBar->m_widget->parent == m_mainWidget))
         {
             int xx = m_miniEdge;
             (m_frameToolBar->m_widget->parent == m_mainWidget))
         {
             int xx = m_miniEdge;

-            int yy = m_miniEdge + m_miniTitle + menubarHeight;
+            int yy = m_miniEdge + m_miniTitle
+#if wxUSE_MENUS_NATIVE
+                        + menubarHeight
+#endif
+                        ;

 
             m_frameToolBar->m_x = xx;
             m_frameToolBar->m_y = yy;
 
             m_frameToolBar->m_x = xx;
             m_frameToolBar->m_y = yy;


@@ -356,7 +366,7 @@ void wxFrame::GtkOnSize()
             {
                 ww = m_toolBarDetached ? wxPLACE_HOLDER
                                        : m_frameToolBar->m_width;
             {
                 ww = m_toolBarDetached ? wxPLACE_HOLDER
                                        : m_frameToolBar->m_width;

-                hh = m_height - 2*m_miniEdge;
+                hh = height - 2*m_miniEdge;

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


@@ -366,7 +376,7 @@ void wxFrame::GtkOnSize()
                ww = m_toolBarDetached ? wxPLACE_HOLDER
                                       : m_frameToolBar->m_width;
                xx = GetClientSize().x - 1;
                ww = m_toolBarDetached ? wxPLACE_HOLDER
                                       : m_frameToolBar->m_width;
                xx = GetClientSize().x - 1;

-               hh = m_height - 2*m_miniEdge;
+               hh = height - 2*m_miniEdge;

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


@@ -377,16 +387,16 @@ void wxFrame::GtkOnSize()
                 yy = GetClientSize().y;
 #if wxUSE_MENUS_NATIVE
                 yy += m_menuBarHeight;
                 yy = GetClientSize().y;
 #if wxUSE_MENUS_NATIVE
                 yy += m_menuBarHeight;

-#endif // wxUSE_MENU_NATIVE
+#endif // wxUSE_MENUS_NATIVE

                 m_frameToolBar->m_x = xx;
                 m_frameToolBar->m_y = yy;
                 m_frameToolBar->m_x = xx;
                 m_frameToolBar->m_y = yy;

-                ww = m_width - 2*m_miniEdge;
+                ww = width - 2*m_miniEdge;

                 hh = m_toolBarDetached ? wxPLACE_HOLDER
                                        : m_frameToolBar->m_height;
             }
             else
             {
                 hh = m_toolBarDetached ? wxPLACE_HOLDER
                                        : m_frameToolBar->m_height;
             }
             else
             {

-                ww = m_width - 2*m_miniEdge;
+                ww = width - 2*m_miniEdge;

                 hh = m_toolBarDetached ? wxPLACE_HOLDER
                                        : m_frameToolBar->m_height;
 
                 hh = m_toolBarDetached ? wxPLACE_HOLDER
                                        : m_frameToolBar->m_height;
 


@@ -405,8 +415,8 @@ void wxFrame::GtkOnSize()
 
         int client_x = client_area_x_offset + m_miniEdge;
         int client_y = client_area_y_offset + m_miniEdge + m_miniTitle;
 
         int client_x = client_area_x_offset + m_miniEdge;
         int client_y = client_area_y_offset + m_miniEdge + m_miniTitle;

-        int client_w = m_width - client_area_x_offset - 2*m_miniEdge;
-        int client_h = m_height - client_area_y_offset- 2*m_miniEdge - m_miniTitle;
+        int client_w = width - client_area_x_offset - 2*m_miniEdge;
+        int client_h = height - client_area_y_offset- 2*m_miniEdge - m_miniTitle;

         if (client_w < 0)
             client_w = 0;
         if (client_h < 0)
         if (client_w < 0)
             client_w = 0;
         if (client_h < 0)


@@ -425,8 +435,8 @@ void wxFrame::GtkOnSize()
     if (m_frameStatusBar && m_frameStatusBar->IsShown())
     {
         int xx = 0 + m_miniEdge;
     if (m_frameStatusBar && m_frameStatusBar->IsShown())
     {
         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 yy = height - wxSTATUS_HEIGHT - m_miniEdge - client_area_y_offset;
+        int ww = width - 2*m_miniEdge;

         if (ww < 0)
             ww = 0;
         int hh = wxSTATUS_HEIGHT;
         if (ww < 0)
             ww = 0;
         int hh = wxSTATUS_HEIGHT;