more thread fixes

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

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index ae11c5097ebd23437632b0a8e3596b5f8e621195..707f419dec814f82a2a77b6352f4cb743eb5c5ee 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -19,6 +19,10 @@
 #include "wx/toolbar.h"
 #include "wx/statusbr.h"
 #include "wx/dcclient.h"
 #include "wx/toolbar.h"
 #include "wx/statusbr.h"
 #include "wx/dcclient.h"

+
+#include "glib.h"
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"

 #include "wx/gtk/win_gtk.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/gtk/win_gtk.h"
 
 //-----------------------------------------------------------------------------


@@ -390,9 +394,9 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
     if (m_frameMenuBar)
     {
         int xx = m_miniEdge;
     if (m_frameMenuBar)
     {
         int xx = m_miniEdge;

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

         m_frameMenuBar->m_x = xx;
         m_frameMenuBar->m_y = yy;
         m_frameMenuBar->m_width = ww;
         m_frameMenuBar->m_x = xx;
         m_frameMenuBar->m_y = yy;
         m_frameMenuBar->m_width = ww;


@@ -405,9 +409,9 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
     if (m_frameToolBar)
     {
         int xx = m_miniEdge;
     if (m_frameToolBar)
     {
         int xx = m_miniEdge;

-  int yy = m_miniEdge + m_miniTitle;
+        int yy = m_miniEdge + m_miniTitle;

         if (m_frameMenuBar) yy += wxMENU_HEIGHT;
         if (m_frameMenuBar) yy += wxMENU_HEIGHT;

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

         int hh = m_frameToolBar->m_height;
 
         m_frameToolBar->m_x = xx;
         int hh = m_frameToolBar->m_height;
 
         m_frameToolBar->m_x = xx;


@@ -422,9 +426,9 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
     if (m_frameStatusBar)
     {
         int xx = 0 + m_miniEdge;
     if (m_frameStatusBar)
     {
         int xx = 0 + m_miniEdge;

-  int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge;
-  int ww = m_width - 2*m_miniEdge;
-  int hh = wxSTATUS_HEIGHT;
+        int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge;
+        int ww = m_width - 2*m_miniEdge;
+        int hh = wxSTATUS_HEIGHT;

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