cleaning up problems after string changes

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

diff --git a/include/wx/msw/menu.h b/include/wx/msw/menu.h
index c724fc16390189da52d11bcaf63e64601cccfbbb..89bc911dabf0520ad97000eae47edee0eed52ac2 100644 (file)
--- a/include/wx/msw/menu.h
+++ b/include/wx/msw/menu.h
@@ -6,16 +6,12 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MENU_H_
 #define _WX_MENU_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MENU_H_
 #define _WX_MENU_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "menu.h"
-#endif
-

 #if wxUSE_ACCEL
     #include "wx/accel.h"
     #include "wx/dynarray.h"
 #if wxUSE_ACCEL
     #include "wx/accel.h"
     #include "wx/dynarray.h"


@@ -29,6 +25,20 @@ class WXDLLEXPORT wxFrame;
 class WXDLLEXPORT wxToolBar;
 #endif
 
 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"
 
 // ----------------------------------------------------------------------------
 #include "wx/arrstr.h"
 
 // ----------------------------------------------------------------------------


@@ -46,26 +56,10 @@ public:
 
     virtual ~wxMenu();
 
 
     virtual ~wxMenu();
 

-    // implement base class virtuals
-    virtual wxMenuItem* DoAppend(wxMenuItem *item);
-    virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
-    virtual wxMenuItem* DoRemove(wxMenuItem *item);
-

     virtual void Break();
 
     virtual void SetTitle(const wxString& title);
 
     virtual void Break();
 
     virtual void SetTitle(const wxString& title);
 

-    // deprecated functions
-#if wxUSE_MENU_CALLBACK
-    wxMenu(const wxString& title, const wxFunction func)
-        : wxMenuBase(title)
-    {
-        Init();
-
-        Callback(func);
-    }
-#endif // wxUSE_MENU_CALLBACK
-

     // implementation only from now on
     // -------------------------------
 
     // implementation only from now on
     // -------------------------------
 


@@ -92,6 +86,11 @@ public:
     int FindAccel(int id) const;
 #endif // wxUSE_ACCEL
 
     int FindAccel(int id) const;
 #endif // wxUSE_ACCEL
 

+protected:
+    virtual wxMenuItem* DoAppend(wxMenuItem *item);
+    virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
+    virtual wxMenuItem* DoRemove(wxMenuItem *item);
+

 private:
     // common part of all ctors
     void Init();
 private:
     // common part of all ctors
     void Init();


@@ -102,7 +101,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


@@ -126,37 +125,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);


@@ -172,17 +171,22 @@ public:
     virtual void Detach();
     virtual void Attach(wxFrame *frame);
 
     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
 
     // 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; }
 
 #if wxUSE_ACCEL
     // get the accel table for all the menus
     const wxAcceleratorTable& GetAccelTable() const { return m_accelTable; }
 

-    // update the accel table (must be called after adding/deletign a menu)
+    // update the accel table (must be called after adding/deleting a menu)

     void RebuildAccelTable();
 #endif // wxUSE_ACCEL
 
     void RebuildAccelTable();
 #endif // wxUSE_ACCEL
 


@@ -201,7 +205,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;


@@ -217,11 +221,10 @@ protected:
 #if defined(__WXWINCE__) && wxUSE_TOOLBAR
     wxToolBar*  m_toolBar;
 #endif
 #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;
     WXHWND      m_commandBar;

+    bool        m_adornmentsAdded;

 #endif
 
 private:
 #endif
 
 private: