X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ffecfa5aeb540b54914739dbb8603edbbd4c00a0..29c8694822a192934278ba0f98eaf437024c0278:/include/wx/palmos/menu.h diff --git a/include/wx/palmos/menu.h b/include/wx/palmos/menu.h index 94f424000d..99c09ff584 100644 --- a/include/wx/palmos/menu.h +++ b/include/wx/palmos/menu.h @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// // Name: wx/palmos/menu.h // Purpose: wxMenu, wxMenuBar classes -// Author: William Osborne +// Author: William Osborne - minimal working wxPalmOS port // Modified by: // Created: 10/13/04 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) William Osborne // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -102,7 +102,7 @@ private: // terminate the current radio group, if any void EndRadioGroup(); - // if TRUE, insert a break before appending the next item + // if true, insert a break before appending the next item bool m_doBreak; // the position of the first item in the current radio group or -1 @@ -129,7 +129,7 @@ public : wxMenuInfo() { m_menu = NULL ; } virtual ~wxMenuInfo() { } - void Create( wxMenu *menu , const wxString &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 ; } @@ -145,7 +145,7 @@ WX_DECLARE_EXPORTED_LIST(wxMenuInfo, wxMenuInfoList ); class WXDLLEXPORT wxMenuBar : public wxMenuBarBase { public: - // ctors & dtor + // ctors & dtor // default constructor wxMenuBar(); @@ -175,17 +175,6 @@ public: void LoadMenu(); int ProcessCommand(int ItemID); -#if wxUSE_TOOLBAR && defined(__WXWINCE__) && (_WIN32_WCE < 400 || defined(__POCKETPC__) || defined(__SMARTPHONE__)) - // 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 - -#if defined(__WXWINCE__) && (_WIN32_WCE >= 400 && !defined(__POCKETPC__) && !defined(__SMARTPHONE__)) - 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; } @@ -225,13 +214,6 @@ protected: #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(__POCKETPC__) && !defined(__SMARTPHONE__)) - WXHWND m_commandBar; - bool m_adornmentsAdded; -#endif private: DECLARE_DYNAMIC_CLASS_NO_COPY(wxMenuBar)