Unicode changes.

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

diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h
index e68ca2236091917c8d791a79e2f693d97c9f20fb..f09ee3bc04adf91d2334e6c799669dce5e43eeb2 100644 (file)
--- a/include/wx/gtk/menu.h
+++ b/include/wx/gtk/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,16 @@ 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;

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


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

-    // construction

     wxMenu( const wxString& title = wxEmptyString,
             const wxFunction func = (wxFunction) NULL );
     wxMenu( const wxString& title = wxEmptyString,
             const wxFunction func = (wxFunction) NULL );

+    ~wxMenu();

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


@@ -170,11 +176,14 @@ 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;

 
 private:
 
 private:

+

     wxString       m_title;
     wxList         m_items;
     wxWindow      *m_invokingWindow;
     wxString       m_title;
     wxList         m_items;
     wxWindow      *m_invokingWindow;