fix MDI child sizing, which was working more or less by accident before I broke it...

[wxWidgets.git] / include / wx / gtk1 / menu.h

diff --git a/include/wx/gtk1/menu.h b/include/wx/gtk1/menu.h
index dcdba21d724e88c28e49d5def0188100534c3061..f2aef5abb501149e01f75ae202e8e215d95ec9c1 100644 (file)
--- a/include/wx/gtk1/menu.h
+++ b/include/wx/gtk1/menu.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/gtk/menu.h
+// Name:        wx/gtk1/menu.h

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -10,10 +10,6 @@
 #ifndef __GTKMENUH__
 #define __GTKMENUH__
 
 #ifndef __GTKMENUH__
 #define __GTKMENUH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "menu.h"
-#endif
-

 //-----------------------------------------------------------------------------
 // wxMenuBar
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxMenuBar
 //-----------------------------------------------------------------------------


@@ -48,9 +44,7 @@ public:
     // common part of Append and Insert
     bool GtkAppend(wxMenu *menu, const wxString& title, int pos=-1);
 
     // common part of Append and Insert
     bool GtkAppend(wxMenu *menu, const wxString& title, int pos=-1);
 

-#ifndef __WXGTK20__

     GtkAccelGroup   *m_accel;
     GtkAccelGroup   *m_accel;

-#endif

     GtkWidget       *m_menubar;
     long             m_style;
     wxWindow        *m_invokingWindow;
     GtkWidget       *m_menubar;
     long             m_style;
     wxWindow        *m_invokingWindow;


@@ -98,9 +92,10 @@ private:
     // common part of Append (if pos == -1)  and Insert
     bool GtkAppend(wxMenuItem *item, int pos=-1);
 
     // common part of Append (if pos == -1)  and Insert
     bool GtkAppend(wxMenuItem *item, int pos=-1);
 

-       GtkWidget *m_prevRadio;
+    GtkWidget *m_prevRadio;

 
     DECLARE_DYNAMIC_CLASS(wxMenu)
 };
 
 
     DECLARE_DYNAMIC_CLASS(wxMenu)
 };
 

-#endif // __GTKMENUH__
+#endif
+    // __GTKMENUH__