X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ffecfa5aeb540b54914739dbb8603edbbd4c00a0..707c4418929f09dfd8f5fb0f0d5aec3bb0775bd8:/include/wx/palmos/menu.h

diff --git a/include/wx/palmos/menu.h b/include/wx/palmos/menu.h
index 94f424000d..bca5475b47 100644
--- a/include/wx/palmos/menu.h
+++ b/include/wx/palmos/menu.h
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/palmos/menu.h
 // Purpose:     wxMenu, wxMenuBar classes
-// Author:      William Osborne
+// Author:      William Osborne - minimal working wxPalmOS port
 // Modified by:
 // Created:     10/13/04
-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -76,8 +76,6 @@ public:
     // 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
@@ -102,15 +100,12 @@ private:
     // terminate the current radio group, if any
     void EndRadioGroup();
 
-    // if TRUE, insert a break before appending the next item
+    // if true, insert a break before appending the next item
     bool m_doBreak;
 
     // 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;
@@ -129,7 +124,7 @@ public :
     wxMenuInfo() { m_menu = NULL ; }
     virtual ~wxMenuInfo() { }
 
-    void Create( wxMenu *menu , const wxString &title ) 
+    void Create( wxMenu *menu , const wxString &title )
     { m_menu = menu ; m_title = title ; }
     wxMenu* GetMenu() const { return m_menu ; }
     wxString GetTitle() const { return m_title ; }
@@ -145,13 +140,13 @@ WX_DECLARE_EXPORTED_LIST(wxMenuInfo, wxMenuInfoList );
 class WXDLLEXPORT wxMenuBar : public wxMenuBarBase
 {
 public:
-    // ctors & dtor 
+    // ctors & dtor
         // default constructor
     wxMenuBar();
 
     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
@@ -175,17 +170,6 @@ public:
     void LoadMenu();
     int ProcessCommand(int ItemID);
 
-#if wxUSE_TOOLBAR && defined(__WXWINCE__) && (_WIN32_WCE < 400 || defined(__POCKETPC__) || defined(__SMARTPHONE__))
-    // Under WinCE, a menubar is owned by the frame's toolbar
-    void SetToolBar(wxToolBar* toolBar) { m_toolBar = toolBar; }
-    wxToolBar* GetToolBar() const { return m_toolBar; }
-#endif
-
-#if defined(__WXWINCE__) && (_WIN32_WCE >= 400 && !defined(__POCKETPC__) && !defined(__SMARTPHONE__))
-    WXHWND GetCommandBar() const { return m_commandBar; }
-    bool AddAdornments(long style);
-#endif
-
 #if wxUSE_ACCEL
     // get the accel table for all the menus
     const wxAcceleratorTable& GetAccelTable() const { return m_accelTable; }
@@ -194,9 +178,6 @@ public:
     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();
@@ -212,8 +193,6 @@ protected:
     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);
@@ -225,13 +204,6 @@ protected:
 #if defined(__WXWINCE__) && wxUSE_TOOLBAR
     wxToolBar*  m_toolBar;
 #endif
-    // Not using a combined wxToolBar/wxMenuBar? then use
-    // a commandbar in WinCE .NET to implement the
-    // menubar, since there is no ::SetMenu function.
-#if defined(__WXWINCE__) && (_WIN32_WCE >= 400 && !defined(__POCKETPC__) && !defined(__SMARTPHONE__))
-    WXHWND      m_commandBar;
-    bool        m_adornmentsAdded;
-#endif
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxMenuBar)