X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/17131ffd751235d115e1ee3f1b38a88b5858d13e..c06bbbff2211c447a8a300eeece87d67fcd95095:/include/wx/palmos/menu.h diff --git a/include/wx/palmos/menu.h b/include/wx/palmos/menu.h index 77ab82badc..9f8ea2e4c4 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" @@ -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 // ------------------------------- @@ -146,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 @@ -174,7 +159,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