Updated version to 2.5.5

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

diff --git a/include/wx/os2/menu.h b/include/wx/os2/menu.h
index 944f3617ebdc0df98a86ec84afb8a0e248aa0d9a..0505afc347b39601298c639c28b2e2deb22a811f 100644 (file)
--- a/include/wx/os2/menu.h
+++ b/include/wx/os2/menu.h
@@ -13,11 +13,11 @@
 #define _WX_MENU_H_
 
 #if wxUSE_ACCEL
 #define _WX_MENU_H_
 
 #if wxUSE_ACCEL

-//    #include "wx/accel.h"
-//    #include "wx/list.h"        // for "template" list classes
-//    #include "wx/dynarray.h"
+    #include "wx/accel.h"
+    #include "wx/list.h"        // for "template" list classes
+    #include "wx/dynarray.h"

 
 

-//    WX_DECLARE_EXPORTED_LIST(wxAcceleratorEntry, wxAcceleratorList);
+    WX_DEFINE_EXPORTED_ARRAY(wxAcceleratorEntry *, wxAcceleratorArray);

 #endif // wxUSE_ACCEL
 
 class WXDLLEXPORT wxFrame;
 #endif // wxUSE_ACCEL
 
 class WXDLLEXPORT wxFrame;


@@ -55,29 +55,20 @@ 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);
     virtual void        Break(void);
     virtual void        SetTitle(const wxString& rTitle);
 
                                  ,wxMenuItem* pItem
                                 );
     virtual wxMenuItem* DoRemove(wxMenuItem* pItem);
     virtual void        Break(void);
     virtual void        SetTitle(const wxString& rTitle);
 

-#if wxUSE_MENU_CALLBACK
-    wxMenu( const wxString&  rTitle
-           ,const wxFunction fnFunc
-          )
-          : wxMenuBase(rTitle)
-    {
-        Init();
-        Callback(fnFunc);
-    }
-#endif // wxUSE_MENU_CALLBACK
-

     //
     // Implementation only from now on
     // -------------------------------
     //
     //
     // Implementation only from now on
     // -------------------------------
     //

+    virtual void Attach(wxMenuBarBase* pMenubar);
+

     bool OS2Command( WXUINT uParam
                     ,WXWORD wId
                    );
     bool OS2Command( WXUINT uParam
                     ,WXWORD wId
                    );


@@ -100,8 +91,8 @@ public:
     //
     // Called by wxMenuBar to build its accel table from the accels of all menus
     //
     //
     // Called by wxMenuBar to build its accel table from the accels of all menus
     //

-    bool   HasAccels(void) const { return m_vAccels[0] != NULL; }
-    size_t GetAccelCount(void) const { return (size_t)m_nNextAccel; }
+    bool   HasAccels(void) const { return m_vAccels.IsEmpty(); }
+    size_t GetAccelCount(void) const { return m_vAccels.GetCount(); }

     size_t CopyAccels(wxAcceleratorEntry* pAccels) const;
 
     //
     size_t CopyAccels(wxAcceleratorEntry* pAccels) const;
 
     //


@@ -160,7 +151,7 @@ private:
     //
     // The helper variable for creating unique IDs.
     //
     //
     // The helper variable for creating unique IDs.
     //

-    static USHORT                          m_nextMenuId;
+    static USHORT                   m_nextMenuId;

 
     //
     // The position of the first item in the current radio group or -1
 
     //
     // The position of the first item in the current radio group or -1


@@ -171,8 +162,7 @@ private:
     //
     // The accelerators for our menu items
     //
     //
     // The accelerators for our menu items
     //

-    wxAcceleratorEntry*             m_vAccels[128];
-    int                             m_nNextAccel;
+    wxAcceleratorArray              m_vAccels;

 #endif // wxUSE_ACCEL
 
     DECLARE_DYNAMIC_CLASS(wxMenu)
 #endif // wxUSE_ACCEL
 
     DECLARE_DYNAMIC_CLASS(wxMenu)


@@ -204,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();
 


@@ -240,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
     //


@@ -285,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;