implemented IPC using Unix domain sockets

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

diff --git a/include/wx/os2/menu.h b/include/wx/os2/menu.h
index 4a0baba04b8e709104f3fcee5271114a9fd1013c..944f3617ebdc0df98a86ec84afb8a0e248aa0d9a 100644 (file)
--- a/include/wx/os2/menu.h
+++ b/include/wx/os2/menu.h
@@ -13,10 +13,11 @@
 #define _WX_MENU_H_
 
 #if wxUSE_ACCEL
-    #include "wx/accel.h"
-    #include "wx/dynarray.h"
+//    #include "wx/accel.h"
+//    #include "wx/list.h"        // for "template" list classes
+//    #include "wx/dynarray.h"
 
-    WX_DEFINE_EXPORTED_ARRAY(wxAcceleratorEntry *, wxAcceleratorArray);
+//    WX_DECLARE_EXPORTED_LIST(wxAcceleratorEntry, wxAcceleratorList);
 #endif // wxUSE_ACCEL
 
 class WXDLLEXPORT wxFrame;
@@ -99,8 +100,8 @@ public:
     //
     // Called by wxMenuBar to build its accel table from the accels of all menus
     //
-    bool   HasAccels(void) const { return !m_vAccels.IsEmpty(); }
-    size_t GetAccelCount(void) const { return m_vAccels.GetCount(); }
+    bool   HasAccels(void) const { return m_vAccels[0] != NULL; }
+    size_t GetAccelCount(void) const { return (size_t)m_nNextAccel; }
     size_t CopyAccels(wxAcceleratorEntry* pAccels) const;
 
     //
@@ -141,6 +142,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
     //
@@ -156,11 +162,17 @@ private:
     //
     static USHORT                          m_nextMenuId;
 
+    //
+    // The position of the first item in the current radio group or -1
+    //
+    int                             m_nStartRadioGroup;
+
 #if wxUSE_ACCEL
     //
     // The accelerators for our menu items
     //
-    wxAcceleratorArray              m_vAccels;
+    wxAcceleratorEntry*             m_vAccels[128];
+    int                             m_nNextAccel;
 #endif // wxUSE_ACCEL
 
     DECLARE_DYNAMIC_CLASS(wxMenu)