X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dbf858b5d69f53efd3950cae99322f54355aa983..9905086c2d34b14bb46275f5c64e0ad2b283e143:/src/gtk1/frame.cpp

diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp
index 5864db957f..235078cff1 100644
--- a/src/gtk1/frame.cpp
+++ b/src/gtk1/frame.cpp
@@ -2,7 +2,7 @@
 // Name:        frame.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $id$
+// Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -337,7 +337,9 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
 
   if (m_frameToolBar)
   {
-    gtk_myfixed_move( GTK_MYFIXED(m_mainWindow), m_frameToolBar->m_widget, 1, wxMENU_HEIGHT );
+    int y = 0;
+    if (m_frameMenuBar) y = wxMENU_HEIGHT;
+    gtk_myfixed_move( GTK_MYFIXED(m_mainWindow), m_frameToolBar->m_widget, 1, y );
     gtk_widget_set_usize( m_frameToolBar->m_widget, width-2, toolbar_height );
   }
   
@@ -575,4 +577,3 @@ void wxFrame::SetIcon( const wxIcon &icon )
   
   gdk_window_set_icon( m_widget->window, (GdkWindow *) NULL, icon.GetPixmap(), bm );
 }
-