Added C/wxString array constructors to wxArrayString

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

diff --git a/include/wx/msw/menu.h b/include/wx/msw/menu.h
index be8a023694774748c4d5f910b422f53161348d15..f049ba8f41c28f92455c52d8787bcad57e1924c9 100644 (file)
--- a/include/wx/msw/menu.h
+++ b/include/wx/msw/menu.h
@@ -29,6 +29,20 @@ class WXDLLEXPORT wxFrame;
 class WXDLLEXPORT wxToolBar;
 #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__)
+#   if ((_WIN32_WCE >= 400) && !defined(__POCKETPC__) && !defined(__SMARTPHONE__)) || \
+        defined(__HANDHELDPC__)
+#       define WINCE_WITH_COMMANDBAR
+#   else
+#       define WINCE_WITHOUT_COMMANDBAR
+#   endif
+#endif
+
+
 #include "wx/arrstr.h"
 
 // ----------------------------------------------------------------------------
@@ -102,7 +116,7 @@ private:
     // terminate the current radio group, if any
     void EndRadioGroup();
 
-    // if TRUE, insert a breal before appending the next item
+    // if true, insert a breal before appending the next item
     bool m_doBreak;
 
     // the position of the first item in the current radio group or -1
@@ -126,37 +140,37 @@ private:
 class WXDLLEXPORT wxMenuInfo : public wxObject
 {
 public :
-    wxMenuInfo() { m_menu = NULL ; }
+    wxMenuInfo() { m_menu = NULL; }
     virtual ~wxMenuInfo() { }
 
-    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 ; }
+    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; }
 private :
-    wxMenu *m_menu ;
-    wxString m_title ;
+    wxMenu *m_menu;
+    wxString m_title;
 
-    DECLARE_DYNAMIC_CLASS(wxMenuInfo) ;
-} ;
+    DECLARE_DYNAMIC_CLASS(wxMenuInfo)
+};
 
 WX_DECLARE_EXPORTED_LIST(wxMenuInfo, wxMenuInfoList );
 
 class WXDLLEXPORT wxMenuBar : public wxMenuBarBase
 {
 public:
-    // ctors & dtor 
+    // ctors & dtor
         // default constructor
     wxMenuBar();
         // unused under MSW
     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
-    bool Append( wxMenuInfo *info ) { return Append( info->GetMenu() , info->GetTitle() ) ; }
-    const wxMenuInfoList& GetMenuInfos() const ;
+    bool Append( wxMenuInfo *info ) { return Append( info->GetMenu() , info->GetTitle() ); }
+    const wxMenuInfoList& GetMenuInfos() const;
 
     virtual bool Append( wxMenu *menu, const wxString &title );
     virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title);
@@ -172,12 +186,17 @@ public:
     virtual void Detach();
     virtual void Attach(wxFrame *frame);
 
-#if wxUSE_TOOLBAR && defined(__WXWINCE__) && (_WIN32_WCE < 400 || defined(WIN32_PLATFORM_PSPC) || defined(WIN32_PLATFORM_WFSP))
+#if defined(__WXWINCE__) && wxUSE_TOOLBAR
     // 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
 
+#ifdef WINCE_WITH_COMMANDBAR
+    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; }
@@ -201,7 +220,7 @@ protected:
     // common part of all ctors
     void Init();
 
-    wxArrayString m_titles ;
+    wxArrayString m_titles;
     wxMenuInfoList m_menuInfos;
 
     WXHMENU       m_hMenu;
@@ -217,11 +236,10 @@ 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(WIN32_PLATFORM_PSPC) && defined(WIN32_PLATFORM_WFSP))
+
+#ifdef WINCE_WITH_COMMANDBAR
     WXHWND      m_commandBar;
+    bool        m_adornmentsAdded;
 #endif
 
 private: