Sorry, I went and removed consts as per the style guide :-)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -70,14 +70,14 @@ public:
|
||||
void SetLabel(int id, const wxString& label);
|
||||
wxString GetLabel(int id) const;
|
||||
// help string
|
||||
virtual void SetHelpString(const int id, const wxString& helpString);
|
||||
virtual wxString GetHelpString(const int id) const ;
|
||||
virtual void SetHelpString(int id, const wxString& helpString);
|
||||
virtual wxString GetHelpString(int id) const ;
|
||||
|
||||
// find item
|
||||
// Finds the item id matching the given string, NOT_FOUND if not found.
|
||||
virtual int FindItem(const wxString& itemString) const ;
|
||||
// Find wxMenuItem by ID, and item's menu too if itemMenu is !NULL.
|
||||
wxMenuItem *FindItemForId(const int itemId, wxMenu **itemMenu = NULL) const;
|
||||
wxMenuItem *FindItemForId(int itemId, wxMenu **itemMenu = NULL) const;
|
||||
|
||||
void ProcessCommand(wxCommandEvent& event);
|
||||
inline void Callback(const wxFunction func) { m_callback = func; }
|
||||
@@ -87,7 +87,7 @@ public:
|
||||
inline wxEvtHandler *GetEventHandler(void) { return m_eventHandler; }
|
||||
|
||||
// IMPLEMENTATION
|
||||
bool MSWCommand(const WXUINT param, const WXWORD id);
|
||||
bool MSWCommand(WXUINT param, WXWORD id);
|
||||
|
||||
void SetInvokingWindow(wxWindow *pWin) { m_pInvokingWindow = pWin; }
|
||||
wxWindow *GetInvokingWindow() const { return m_pInvokingWindow; }
|
||||
@@ -129,35 +129,35 @@ class WXDLLEXPORT wxMenuBar: public wxEvtHandler
|
||||
DECLARE_DYNAMIC_CLASS(wxMenuBar)
|
||||
|
||||
wxMenuBar(void);
|
||||
wxMenuBar(const int n, wxMenu *menus[], const wxString titles[]);
|
||||
wxMenuBar(int n, wxMenu *menus[], const wxString titles[]);
|
||||
~wxMenuBar(void);
|
||||
|
||||
void Append(wxMenu *menu, const wxString& title);
|
||||
// Must only be used AFTER menu has been attached to frame,
|
||||
// otherwise use individual menus to enable/disable items
|
||||
void Enable(const int Id, const bool Flag);
|
||||
bool Enabled(const int Id) const ;
|
||||
inline bool IsEnabled(const int Id) const { return Enabled(Id); };
|
||||
void EnableTop(const int pos, const bool Flag);
|
||||
void Check(const int id, const bool Flag);
|
||||
bool Checked(const int id) const ;
|
||||
inline bool IsChecked(const int Id) const { return Checked(Id); };
|
||||
void SetLabel(const int id, const wxString& label) ;
|
||||
wxString GetLabel(const int id) const ;
|
||||
void SetLabelTop(const int pos, const wxString& label) ;
|
||||
wxString GetLabelTop(const int pos) const ;
|
||||
virtual void Delete(wxMenu *menu, const int index = 0); /* Menu not destroyed */
|
||||
void Enable(int Id, bool Flag);
|
||||
bool Enabled(int Id) const ;
|
||||
inline bool IsEnabled(int Id) const { return Enabled(Id); };
|
||||
void EnableTop(int pos, bool Flag);
|
||||
void Check(int id, bool Flag);
|
||||
bool Checked(int id) const ;
|
||||
inline bool IsChecked(int Id) const { return Checked(Id); };
|
||||
void SetLabel(int id, const wxString& label) ;
|
||||
wxString GetLabel(int id) const ;
|
||||
void SetLabelTop(int pos, const wxString& label) ;
|
||||
wxString GetLabelTop(int pos) const ;
|
||||
virtual void Delete(wxMenu *menu, int index = 0); /* Menu not destroyed */
|
||||
virtual bool OnAppend(wxMenu *menu, const char *title);
|
||||
virtual bool OnDelete(wxMenu *menu, const int index);
|
||||
virtual bool OnDelete(wxMenu *menu, int index);
|
||||
|
||||
virtual void SetHelpString(const int Id, const wxString& helpString);
|
||||
virtual wxString GetHelpString(const int Id) const ;
|
||||
virtual void SetHelpString(int Id, const wxString& helpString);
|
||||
virtual wxString GetHelpString(int Id) const ;
|
||||
|
||||
virtual int FindMenuItem(const wxString& menuString, const wxString& itemString) const ;
|
||||
|
||||
// Find wxMenuItem for item ID, and return item's
|
||||
// menu too if itemMenu is non-NULL.
|
||||
wxMenuItem *FindItemForId(const int itemId, wxMenu **menuForItem = NULL) const ;
|
||||
wxMenuItem *FindItemForId(int itemId, wxMenu **menuForItem = NULL) const ;
|
||||
|
||||
inline void SetEventHandler(wxEvtHandler *handler) { m_eventHandler = handler; }
|
||||
inline wxEvtHandler *GetEventHandler(void) { return m_eventHandler; }
|
||||
|
Reference in New Issue
Block a user