Sorry, should be a __UNIX__ test

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

diff --git a/include/wx/msw/menu.h b/include/wx/msw/menu.h
index ec5d4aba07668595df8faa80a7dd0149e6a5f02c..f049ba8f41c28f92455c52d8787bcad57e1924c9 100644 (file)
--- a/include/wx/msw/menu.h
+++ b/include/wx/msw/menu.h
@@ -116,7 +116,7 @@ private:
     // terminate the current radio group, if any
     void EndRadioGroup();
 
     // 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
     bool m_doBreak;
 
     // the position of the first item in the current radio group or -1


@@ -140,37 +140,37 @@ private:
 class WXDLLEXPORT wxMenuInfo : public wxObject
 {
 public :
 class WXDLLEXPORT wxMenuInfo : public wxObject
 {
 public :

-    wxMenuInfo() { m_menu = NULL ; }
+    wxMenuInfo() { m_menu = NULL; }

     virtual ~wxMenuInfo() { }
 
     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 :
 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:
 
 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
         // 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
     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);
 
     virtual bool Append( wxMenu *menu, const wxString &title );
     virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title);


@@ -220,7 +220,7 @@ protected:
     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();
 

-    wxArrayString m_titles ;
+    wxArrayString m_titles;

     wxMenuInfoList m_menuInfos;
 
     WXHMENU       m_hMenu;
     wxMenuInfoList m_menuInfos;
 
     WXHMENU       m_hMenu;