More OS/2 stubs and caret fix

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

diff --git a/include/wx/gtk1/menu.h b/include/wx/gtk1/menu.h
index c4398fa1687ca4ed32e399d79c0cb89368eee7f4..8d6f68db7ec288ce0113cc4b6718766c65cc0e24 100644 (file)
--- a/include/wx/gtk1/menu.h
+++ b/include/wx/gtk1/menu.h
@@ -101,6 +101,7 @@ public:
     wxList           m_menus;
     GtkWidget       *m_menubar;
     long             m_style;
     wxList           m_menus;
     GtkWidget       *m_menubar;
     long             m_style;

+    wxWindow        *m_invokingWindow;

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


@@ -112,12 +113,14 @@ class wxMenu : public wxEvtHandler
     DECLARE_DYNAMIC_CLASS(wxMenu)
 
 public:
     DECLARE_DYNAMIC_CLASS(wxMenu)
 
 public:

-#ifdef WXWIN_COMPATIBILITY

     wxMenu( const wxString& title, const wxFunction func)
     {
         Init(title, 0, func);
     }
     wxMenu( const wxString& title, const wxFunction func)
     {
         Init(title, 0, func);
     }

-#endif
+    wxMenu( long style )
+    {
+        Init( wxEmptyString, style );
+    }

     wxMenu( const wxString& title = wxEmptyString, long style = 0 )
     {
         Init(title, style);
     wxMenu( const wxString& title = wxEmptyString, long style = 0 )
     {
         Init(title, style);


@@ -172,15 +175,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); }
 

-    wxFunction m_callback;

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


@@ -200,11 +204,8 @@ public:
 private:
     // common code for both constructors:
     void Init( const wxString& title,
 private:
     // common code for both constructors:
     void Init( const wxString& title,

-               long style
-#ifdef WXWIN_COMPATIBILITY
-               , const wxFunction func = (wxFunction) NULL
-#endif
-               );
+               long style, 
+               const wxFunction func = (wxFunction) NULL );

 
     wxString       m_title;
     wxList         m_items;
 
     wxString       m_title;
     wxList         m_items;