X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e1d63b79352db5290a9f86428d193bd6a08ef32f..472eec8a0391538e4dcf7f7c6c4f4d44c8383616:/include/wx/palmos/menu.h diff --git a/include/wx/palmos/menu.h b/include/wx/palmos/menu.h index 99c09ff584..6859d70bbb 100644 --- a/include/wx/palmos/menu.h +++ b/include/wx/palmos/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 #include "wx/arrstr.h" @@ -55,17 +51,6 @@ public: 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 // ------------------------------- @@ -76,8 +61,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 @@ -108,9 +91,6 @@ private: // 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; @@ -151,7 +131,7 @@ public: 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 @@ -164,8 +144,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(); @@ -179,13 +159,10 @@ 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 - // 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(); @@ -201,8 +178,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);