Blind bug fix to bug reported by Angel Kry.

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

diff --git a/include/wx/palmos/menu.h b/include/wx/palmos/menu.h
index 99c09ff58433bf2f93a5f468872247b53ca08224..bca5475b47dd528cb09f32add1b5b2fee543a81a 100644 (file)
--- a/include/wx/palmos/menu.h
+++ b/include/wx/palmos/menu.h
@@ -76,8 +76,6 @@ public:
     // semi-private accessors
         // get the window which contains this menu
     wxWindow *GetWindow() const;
     // semi-private accessors
         // get the window which contains this menu
     wxWindow *GetWindow() const;

-        // get the menu handle
-    WXHMENU GetHMenu() const { return m_hMenu; }

 
 #if wxUSE_ACCEL
     // called by wxMenuBar to build its accel table from the accels of all menus
 
 #if wxUSE_ACCEL
     // called by wxMenuBar to build its accel table from the accels of all menus


@@ -108,9 +106,6 @@ private:
     // the position of the first item in the current radio group or -1
     int m_startRadioGroup;
 
     // the position of the first item in the current radio group or -1
     int m_startRadioGroup;
 

-    // the menu handle of this menu
-    WXHMENU m_hMenu;
-

 #if wxUSE_ACCEL
     // the accelerators for our menu items
     wxAcceleratorArray m_accels;
 #if wxUSE_ACCEL
     // the accelerators for our menu items
     wxAcceleratorArray m_accels;


@@ -151,7 +146,7 @@ public:
 
     wxMenuBar(long style);
         // menubar takes ownership of the menus arrays but copies the titles
 
     wxMenuBar(long style);
         // menubar takes ownership of the menus arrays but copies the titles

-    wxMenuBar(int n, wxMenu *menus[], const wxString titles[]);
+    wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0);

     virtual ~wxMenuBar();
 
     // menubar construction
     virtual ~wxMenuBar();
 
     // menubar construction


@@ -183,9 +178,6 @@ public:
     void RebuildAccelTable();
 #endif // wxUSE_ACCEL
 
     void RebuildAccelTable();
 #endif // wxUSE_ACCEL
 

-        // get the menu handle
-    WXHMENU GetHMenu() const { return m_hMenu; }
-

     // if the menubar is modified, the display is not updated automatically,
     // call this function to update it (m_menuBarFrame should be !NULL)
     void Refresh();
     // if the menubar is modified, the display is not updated automatically,
     // call this function to update it (m_menuBarFrame should be !NULL)
     void Refresh();


@@ -201,8 +193,6 @@ protected:
     wxArrayString m_titles ;
     wxMenuInfoList m_menuInfos;
 
     wxArrayString m_titles ;
     wxMenuInfoList m_menuInfos;
 

-    WXHMENU       m_hMenu;
-

     // Return the Palm position for a wxMenu which is sometimes different from
     // the wxWidgets position.
     int PalmPositionForWxMenu(wxMenu *menu, int wxpos);
     // Return the Palm position for a wxMenu which is sometimes different from
     // the wxWidgets position.
     int PalmPositionForWxMenu(wxMenu *menu, int wxpos);