made some wxHtmlEntitiesParser's methods public -- turned out they are useful

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

diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h
index 13d2f6b343f4ecefb3e4be441700a088d58783ca..f36c816d2a5e724cfc0ff82fb0761dd6142c67c3 100644 (file)
--- a/include/wx/gtk/menu.h
+++ b/include/wx/gtk/menu.h
@@ -45,6 +45,9 @@ public:
     void SetInvokingWindow( wxWindow *win );
     void UnsetInvokingWindow( wxWindow *win );
 
     void SetInvokingWindow( wxWindow *win );
     void UnsetInvokingWindow( wxWindow *win );
 

+    // common part of Append and Insert
+    bool GtkAppend(wxMenu *menu, const wxString& title);
+

     GtkAccelGroup   *m_accel;
     GtkItemFactory  *m_factory;
     GtkWidget       *m_menubar;
     GtkAccelGroup   *m_accel;
     GtkItemFactory  *m_factory;
     GtkWidget       *m_menubar;


@@ -77,13 +80,16 @@ public:
 
     // TODO: virtual void SetTitle(const wxString& title);
 
 
     // TODO: virtual void SetTitle(const wxString& title);
 

-#if WXWIN_COMPATIBILITY
+    // compatibility only
+#if wxUSE_MENU_CALLBACK

     wxMenu(const wxString& title, const wxFunction func)
         : wxMenuBase(title)
     {
     wxMenu(const wxString& title, const wxFunction func)
         : wxMenuBase(title)
     {

+        Init();
+

         Callback(func);
     }
         Callback(func);
     }

-#endif // WXWIN_COMPATIBILITY
+#endif // WXWIN_COMPATIBILITY_2

 
     // implementation
     int FindMenuIdByMenuItem( GtkWidget *menuItem ) const;
 
     // implementation
     int FindMenuIdByMenuItem( GtkWidget *menuItem ) const;


@@ -98,6 +104,9 @@ private:
     // common code for all constructors:
     void Init();
 
     // common code for all constructors:
     void Init();
 

+    // common part of Append and Insert
+    bool GtkAppend(wxMenuItem *item);
+

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