No real changes, just make wxWindow::CanScroll() virtual.

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

diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h
index 7732a9ab842443e984a3dde3fe54a80d7357ad65..629024591af380c10e14f2b5a363819d8b090e84 100644 (file)
--- a/include/wx/gtk/menu.h
+++ b/include/wx/gtk/menu.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/menu.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        wx/gtk/menu.h
 // Purpose:
 // Author:      Robert Roebling

-// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling, Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -41,10 +40,6 @@ public:
     void SetLayoutDirection(wxLayoutDirection dir);
     wxLayoutDirection GetLayoutDirection() const;
 
     void SetLayoutDirection(wxLayoutDirection dir);
     wxLayoutDirection GetLayoutDirection() const;
 

-    // wxMenuBar is not a top level window but it still doesn't need a parent
-    // window
-    virtual bool GTKNeedsParent() const { return false; }
-

     virtual void Attach(wxFrame *frame);
     virtual void Detach();
 
     virtual void Attach(wxFrame *frame);
     virtual void Detach();
 


@@ -54,6 +49,10 @@ private:
 
     void Init(size_t n, wxMenu *menus[], const wxString titles[], long style);
 
 
     void Init(size_t n, wxMenu *menus[], const wxString titles[], long style);
 

+    // wxMenuBar is not a top level window but it still doesn't need a parent
+    // window
+    virtual bool GTKNeedsParent() const { return false; }
+

     GtkWidget* m_menubar;
 
     DECLARE_DYNAMIC_CLASS(wxMenuBar)
     GtkWidget* m_menubar;
 
     DECLARE_DYNAMIC_CLASS(wxMenuBar)