X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/45bedfdd737b5d707dce277cc664018e9f566994..b5a98acdf25b3d2eae7858d30ac29f629d589703:/include/wx/os2/menu.h

diff --git a/include/wx/os2/menu.h b/include/wx/os2/menu.h
index fac76609db..af32bd3d30 100644
--- a/include/wx/os2/menu.h
+++ b/include/wx/os2/menu.h
@@ -14,6 +14,7 @@
 
 #if wxUSE_ACCEL
     #include "wx/accel.h"
+    #include "wx/list.h"        // for "template" list classes
     #include "wx/dynarray.h"
 
     WX_DEFINE_EXPORTED_ARRAY(wxAcceleratorEntry *, wxAcceleratorArray);
@@ -62,27 +63,12 @@ public:
     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
-
-    //
-    // OS2-specific
-    //
-    bool ProcessCommand(wxCommandEvent& rEvent);
-
-
     //
     // Implementation only from now on
     // -------------------------------
     //
+    virtual void Attach(wxMenuBarBase* pMenubar);
+
     bool OS2Command( WXUINT uParam
                     ,WXWORD wId
                    );
@@ -101,17 +87,11 @@ public:
     //
     WXHMENU GetHMenu() const { return m_hMenu; }
 
-    //
-    // Attach/detach menu to/from wxMenuBar
-    //
-    void Attach(wxMenuBar* pMenubar);
-    void Detach(void);
-
 #if wxUSE_ACCEL
     //
     // Called by wxMenuBar to build its accel table from the accels of all menus
     //
-    bool   HasAccels(void) const { return !m_vAccels.IsEmpty(); }
+    bool   HasAccels(void) const { return m_vAccels.IsEmpty(); }
     size_t GetAccelCount(void) const { return m_vAccels.GetCount(); }
     size_t CopyAccels(wxAcceleratorEntry* pAccels) const;
 
@@ -153,6 +133,11 @@ private:
                           ,size_t      nPos = (size_t)-1
                          );
 
+    //
+    // Terminate the current radio group, if any
+    //
+    void EndRadioGroup(void);
+
     //
     // If TRUE, insert a breal before appending the next item
     //
@@ -166,7 +151,12 @@ private:
     //
     // 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
+    //
+    int                             m_nStartRadioGroup;
 
 #if wxUSE_ACCEL
     //
@@ -254,22 +244,8 @@ public:
     // Implementation from now on
     //
     WXHMENU                   Create(void);
-    void                      Detach(void);
-
-    //
-    // Returns TRUE if we're attached to a frame
-    //
-    bool                      IsAttached(void) const { return m_pMenuBarFrame != NULL; }
-
-    //
-    // Get the frame we live in
-    //
-    wxFrame *                 GetFrame(void) const { return m_pMenuBarFrame; }
-
-    //
-    // Attach to a frame
-    //
-    void                      Attach(wxFrame* pFrame);
+    virtual void              Detach(void);
+    virtual void              Attach(wxFrame* pFrame);
 
 #if wxUSE_ACCEL
     //
@@ -305,7 +281,6 @@ protected:
 
     wxArrayString m_titles;
 
-    wxFrame*                        m_pMenuBarFrame;
     WXHMENU                         m_hMenu;
 
 #if wxUSE_ACCEL