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 506d1986c0e9c2f52607a0e25ab0c15ab34c36c1..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
 /////////////////////////////////////////////////////////////////////////////


@@ -21,6 +20,7 @@ public:
     wxMenuBar();
     wxMenuBar(long style);
     wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0);
     wxMenuBar();
     wxMenuBar(long style);
     wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0);

+    ~wxMenuBar();

 
     // implement base class (pure) virtuals
     virtual bool Append( wxMenu *menu, const wxString &title );
 
     // implement base class (pure) virtuals
     virtual bool Append( wxMenu *menu, const wxString &title );


@@ -33,28 +33,28 @@ public:
     virtual wxMenuItem* FindItem( int id, wxMenu **menu = NULL ) const;
 
     virtual void EnableTop( size_t pos, bool flag );
     virtual wxMenuItem* FindItem( int id, wxMenu **menu = NULL ) const;
 
     virtual void EnableTop( size_t pos, bool flag );

+    virtual bool IsEnabledTop(size_t pos) const;

     virtual void SetMenuLabel( size_t pos, const wxString& label );
     virtual wxString GetMenuLabel( size_t pos ) const;
 
     void SetLayoutDirection(wxLayoutDirection dir);
     wxLayoutDirection GetLayoutDirection() const;
 
     virtual void SetMenuLabel( size_t pos, const wxString& label );
     virtual wxString GetMenuLabel( size_t pos ) 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();
 

-    // implementation only from now on
-    GtkWidget       *m_menubar; // Public for hildon support
-

 private:
     // common part of Append and Insert
 private:
     // common part of Append and Insert

-    bool GtkAppend(wxMenu *menu, const wxString& title, int pos=-1);
+    void GtkAppend(wxMenu* menu, const wxString& title, int pos = -1);

 
     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)
 };
 
     DECLARE_DYNAMIC_CLASS(wxMenuBar)
 };
 


@@ -99,9 +99,8 @@ private:
     void Init();
 
     // common part of Append (if pos == -1)  and Insert
     void Init();
 
     // common part of Append (if pos == -1)  and Insert

-    bool GtkAppend(wxMenuItem *item, int pos=-1);
+    void GtkAppend(wxMenuItem* item, int pos = -1);

 
 

-    GtkWidget *m_prevRadio;

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