wxHtmlWidgetCells now destroys window correctly

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

diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h
index 3638cee90e4b9d99145f3e6207a0673f91354ea6..038d2e9bfffe5dd6bd9d2a00fc551616dd063c2e 100644 (file)
--- a/include/wx/gtk/menu.h
+++ b/include/wx/gtk/menu.h
@@ -92,7 +92,7 @@ public:
 
     // implementation only
     wxList& GetMenus() { return m_menus; }
 
     // implementation only
     wxList& GetMenus() { return m_menus; }

-    
+

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


@@ -112,10 +112,19 @@ class wxMenu : public wxEvtHandler
     DECLARE_DYNAMIC_CLASS(wxMenu)
 
 public:
     DECLARE_DYNAMIC_CLASS(wxMenu)
 
 public:

-    wxMenu( const wxString& title = wxEmptyString,
-            const wxFunction func = (wxFunction) NULL,
-            long style = 0);
-    wxMenu( long style );
+    wxMenu( const wxString& title, const wxFunction func)
+    {
+        Init(title, 0, func);
+    }
+    wxMenu( long style )
+    {
+        Init( wxEmptyString, style );
+    }
+    wxMenu( const wxString& title = wxEmptyString, long style = 0 )
+    {
+        Init(title, style);
+    }
+

     ~wxMenu();
 
     // operations
     ~wxMenu();
 
     // operations


@@ -165,13 +174,16 @@ public:
 
     wxMenuItem *FindItemForId( int id ) const { return FindItem( id ); }
 
 
     wxMenuItem *FindItemForId( int id ) const { return FindItem( id ); }
 

-#ifdef WXWIN_COMPATIBILITY

     wxFunction GetCallback() const { return m_callback; }
     void Callback(const wxFunction func) { m_callback = func; }
     wxFunction GetCallback() const { return m_callback; }
     void Callback(const wxFunction func) { m_callback = func; }

+    wxFunction m_callback;
+
+#ifdef WXWIN_COMPATIBILITY

 
     // compatibility: these functions are deprecated
     bool Enabled(int id) const { return IsEnabled(id); }
     bool Checked(int id) const { return IsChecked(id); }
 
     // compatibility: these functions are deprecated
     bool Enabled(int id) const { return IsEnabled(id); }
     bool Checked(int id) const { return IsChecked(id); }

+

 #endif // WXWIN_COMPATIBILITY
 
     // implementation
 #endif // WXWIN_COMPATIBILITY
 
     // implementation


@@ -186,17 +198,17 @@ public:
     GtkItemFactory  *m_factory;
 
     // used by wxMenuBar
     GtkItemFactory  *m_factory;
 
     // used by wxMenuBar

-    inline long GetStyle(void) const { return m_style; }
- private:
+    long GetStyle(void) const { return m_style; }
+
+private:

     // common code for both constructors:
     void Init( const wxString& title,
     // common code for both constructors:
     void Init( const wxString& title,

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

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

-    wxFunction     m_callback;

     wxEvtHandler  *m_eventHandler;
     void          *m_clientData;
     long           m_style;
     wxEvtHandler  *m_eventHandler;
     void          *m_clientData;
     long           m_style;