Compile fixes,

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

diff --git a/include/wx/gtk1/menu.h b/include/wx/gtk1/menu.h
index e68ca2236091917c8d791a79e2f693d97c9f20fb..3638cee90e4b9d99145f3e6207a0673f91354ea6 100644 (file)
--- a/include/wx/gtk1/menu.h
+++ b/include/wx/gtk1/menu.h
@@ -48,6 +48,7 @@ public:
     wxMenuBar();
     wxMenuBar(long style);
     wxMenuBar(int n, wxMenu *menus[], const wxString titles[]);
     wxMenuBar();
     wxMenuBar(long style);
     wxMenuBar(int n, wxMenu *menus[], const wxString titles[]);

+    ~wxMenuBar();

 
     // menubar construction
     void Append( wxMenu *menu, const wxString &title );
 
     // menubar construction
     void Append( wxMenu *menu, const wxString &title );


@@ -67,8 +68,9 @@ public:
     void Enable( int id, bool enable );
     bool IsEnabled( int id ) const;
 
     void Enable( int id, bool enable );
     bool IsEnabled( int id ) const;
 

-    wxString GetLabel( int id ) const;

     void SetLabel( int id, const wxString &label );
     void SetLabel( int id, const wxString &label );

+    wxString GetLabel( int id ) const;
+    wxString GetLabel() const                { return wxWindow::GetLabel(); }

 
     void EnableTop( int pos, bool flag );
     void SetLabelTop( int pos, const wxString& label );
 
     void EnableTop( int pos, bool flag );
     void SetLabelTop( int pos, const wxString& label );


@@ -88,12 +90,17 @@ public:
     wxMenuItem* FindMenuItemById( int id ) const { return FindItem(id); }
 #endif // WXWIN_COMPATIBILITY
 
     wxMenuItem* FindMenuItemById( int id ) const { return FindItem(id); }
 #endif // WXWIN_COMPATIBILITY
 

-    // implementation
+    // implementation only

     wxList& GetMenus() { return m_menus; }
     wxList& GetMenus() { return m_menus; }

+    
+    void SetInvokingWindow( wxWindow *win );
+    void UnsetInvokingWindow( wxWindow *win );

 
 

-protected:
-    wxList       m_menus;
-    GtkWidget   *m_menubar;
+    GtkAccelGroup   *m_accel;
+    GtkItemFactory  *m_factory;
+    wxList           m_menus;
+    GtkWidget       *m_menubar;
+    long             m_style;

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------


@@ -105,9 +112,11 @@ class wxMenu : public wxEvtHandler
     DECLARE_DYNAMIC_CLASS(wxMenu)
 
 public:
     DECLARE_DYNAMIC_CLASS(wxMenu)
 
 public:

-    // construction

     wxMenu( const wxString& title = wxEmptyString,
     wxMenu( const wxString& title = wxEmptyString,

-            const wxFunction func = (wxFunction) NULL );
+            const wxFunction func = (wxFunction) NULL,
+            long style = 0);
+    wxMenu( long style );
+    ~wxMenu();

 
     // operations
         // title
 
     // operations
         // title


@@ -170,17 +179,27 @@ public:
     void SetInvokingWindow( wxWindow *win );
     wxWindow *GetInvokingWindow();
 
     void SetInvokingWindow( wxWindow *win );
     wxWindow *GetInvokingWindow();
 

-    // implementation only
-    GtkWidget     *m_menu;  // GtkMenu
-    GtkWidget     *m_owner;
+    // implementation GTK only
+    GtkWidget       *m_menu;  // GtkMenu
+    GtkWidget       *m_owner;
+    GtkAccelGroup   *m_accel;
+    GtkItemFactory  *m_factory;
+
+    // used by wxMenuBar
+    inline long GetStyle(void) const { return m_style; }
+ private:
+    // common code for both constructors:
+    void Init( const wxString& title,
+               const wxFunction func,
+               long style);

 
 

-private:

     wxString       m_title;
     wxList         m_items;
     wxWindow      *m_invokingWindow;
     wxFunction     m_callback;
     wxEvtHandler  *m_eventHandler;
     void          *m_clientData;
     wxString       m_title;
     wxList         m_items;
     wxWindow      *m_invokingWindow;
     wxFunction     m_callback;
     wxEvtHandler  *m_eventHandler;
     void          *m_clientData;

+    long           m_style;

 };
 
 #endif // __GTKMENUH__
 };
 
 #endif // __GTKMENUH__