check that the version of __sync_sub_and_fetch that returns a value is supported...

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

diff --git a/include/wx/msw/menu.h b/include/wx/msw/menu.h
index ec5d4aba07668595df8faa80a7dd0149e6a5f02c..18ab994c8f325c691d6c9eb67244001d8a9c5631 100644 (file)
--- a/include/wx/msw/menu.h
+++ b/include/wx/msw/menu.h
@@ -12,10 +12,6 @@
 #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"
@@ -23,10 +19,10 @@
     WX_DEFINE_EXPORTED_ARRAY_PTR(wxAcceleratorEntry *, wxAcceleratorArray);
 #endif // wxUSE_ACCEL
 
-class WXDLLEXPORT wxFrame;
+class WXDLLIMPEXP_FWD_CORE wxFrame;
 
 #if defined(__WXWINCE__) && wxUSE_TOOLBAR
-class WXDLLEXPORT wxToolBar;
+class WXDLLIMPEXP_FWD_CORE wxToolBar;
 #endif
 
 
@@ -60,26 +56,10 @@ public:
 
     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);
 
-    // 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
     // -------------------------------
 
@@ -106,6 +86,11 @@ public:
     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();
@@ -116,7 +101,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
@@ -140,37 +125,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);
@@ -178,8 +163,8 @@ public:
     virtual wxMenu *Remove(size_t pos);
 
     virtual void EnableTop( size_t pos, bool flag );
-    virtual void SetLabelTop( size_t pos, const wxString& label );
-    virtual wxString GetLabelTop( size_t pos ) const;
+    virtual void SetMenuLabel( size_t pos, const wxString& label );
+    virtual wxString GetMenuLabel( size_t pos ) const;
 
     // implementation from now on
     WXHMENU Create();
@@ -201,7 +186,7 @@ public:
     // 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
 
@@ -220,7 +205,7 @@ protected:
     // common part of all ctors
     void Init();
 
-    wxArrayString m_titles ;
+    wxArrayString m_titles;
     wxMenuInfoList m_menuInfos;
 
     WXHMENU       m_hMenu;