Sorry, should be a __UNIX__ test

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

diff --git a/include/wx/os2/menu.h b/include/wx/os2/menu.h
index af32bd3d305d3b6fe2a7b61aa31f16a418487c7f..0505afc347b39601298c639c28b2e2deb22a811f 100644 (file)
--- a/include/wx/os2/menu.h
+++ b/include/wx/os2/menu.h
@@ -55,8 +55,8 @@ public:
     //
     // Implement base class virtuals
     //
     //
     // Implement base class virtuals
     //

-    virtual bool        DoAppend(wxMenuItem* pItem);
-    virtual bool        DoInsert( size_t      nPos
+    virtual wxMenuItem* DoAppend(wxMenuItem* pItem);
+    virtual wxMenuItem* DoInsert( size_t      nPos

                                  ,wxMenuItem* pItem
                                 );
     virtual wxMenuItem* DoRemove(wxMenuItem* pItem);
                                  ,wxMenuItem* pItem
                                 );
     virtual wxMenuItem* DoRemove(wxMenuItem* pItem);


@@ -194,6 +194,7 @@ public:
     wxMenuBar( int            n
               ,wxMenu*        vMenus[]
               ,const wxString sTitles[]
     wxMenuBar( int            n
               ,wxMenu*        vMenus[]
               ,const wxString sTitles[]

+              ,long           lStyle = 0

              );
     virtual ~wxMenuBar();
 
              );
     virtual ~wxMenuBar();
 


@@ -230,16 +231,6 @@ public:
                                    );
     virtual wxString    GetLabelTop(size_t nPos) const;
 
                                    );
     virtual wxString    GetLabelTop(size_t nPos) const;
 

-    //
-    // Compatibility: these functions are deprecated
-    //
-#if WXWIN_COMPATIBILITY
-    void          SetEventHandler(wxEvtHandler* pHandler) { m_pEventHandler = pHandler; }
-    wxEvtHandler* GetEventHandler(void) { return m_pEventHandler; }
-    bool          Enabled(int nId) const { return IsEnabled(nId); }
-    bool          Checked(int nId) const { return IsChecked(nId); }
-#endif // WXWIN_COMPATIBILITY
-

     //
     // Implementation from now on
     //
     //
     // Implementation from now on
     //


@@ -275,10 +266,6 @@ protected:
     //
     void                      Init(void);
 
     //
     void                      Init(void);
 

-#if WXWIN_COMPATIBILITY
-    wxEvtHandler*                   m_pEventHandler;
-#endif // WXWIN_COMPATIBILITY
-

     wxArrayString m_titles;
 
     WXHMENU                         m_hMenu;
     wxArrayString m_titles;
 
     WXHMENU                         m_hMenu;