// menu construction
// -----------------
- // append a normal item to the menu
+ // append any kind of item (normal/check/radio/separator)
void Append(int id,
const wxString& text,
const wxString& help = wxEmptyString,
- bool isCheckable = FALSE)
+ wxItemKind kind = wxITEM_NORMAL)
{
- DoAppend(wxMenuItem::New((wxMenu *)this, id, text, help, isCheckable));
+ DoAppend(wxMenuItem::New((wxMenu *)this, id, text, help, kind));
}
// append a separator to the menu
void AppendSeparator() { Append(wxID_SEPARATOR, wxEmptyString); }
+ // append a check item
+ void AppendCheckItem(int id,
+ const wxString& text,
+ const wxString& help = wxEmptyString)
+ {
+ Append(id, text, help, wxITEM_CHECK);
+ }
+
+ // append a radio item
+ void AppendRadioItem(int id,
+ const wxString& text,
+ const wxString& help = wxEmptyString)
+ {
+ Append(id, text, help, wxITEM_RADIO);
+ }
+
// append a submenu
void Append(int id,
const wxString& text,
wxMenu *submenu,
const wxString& help = wxEmptyString)
{
- DoAppend(wxMenuItem::New((wxMenu *)this, id, text, help, FALSE, submenu));
+ DoAppend(wxMenuItem::New((wxMenu *)this, id, text, help,
+ wxITEM_NORMAL, submenu));
}
// the most generic form of Append() - append anything
// insert an item before given position
bool Insert(size_t pos, wxMenuItem *item);
+
+ // insert an item before given position
void Insert(size_t pos,
int id,
const wxString& text,
const wxString& help = wxEmptyString,
- bool isCheckable = FALSE)
+ wxItemKind kind = wxITEM_NORMAL)
{
- Insert(pos, wxMenuItem::New((wxMenu *)this, id, text, help, isCheckable));
+ Insert(pos, wxMenuItem::New((wxMenu *)this, id, text, help, kind));
}
// insert a separator
Insert(pos, wxMenuItem::New((wxMenu *)this));
}
+ // insert a check item
+ void InsertCheckItem(size_t pos,
+ int id,
+ const wxString& text,
+ const wxString& help = wxEmptyString)
+ {
+ Insert(pos, id, text, help, wxITEM_CHECK);
+ }
+
+ // insert a radio item
+ void InsertRadioItem(size_t pos,
+ int id,
+ const wxString& text,
+ const wxString& help = wxEmptyString)
+ {
+ Insert(pos, id, text, help, wxITEM_RADIO);
+ }
+
// insert a submenu
void Insert(size_t pos,
int id,
wxMenu *submenu,
const wxString& help = wxEmptyString)
{
- Insert(pos, wxMenuItem::New((wxMenu *)this, id, text, help, FALSE, submenu));
+ Insert(pos, wxMenuItem::New((wxMenu *)this, id, text, help,
+ wxITEM_NORMAL, submenu));
}
// prepend an item to the menu
Insert(0u, item);
}
+ // prepend any item to the menu
void Prepend(int id,
const wxString& text,
const wxString& help = wxEmptyString,
- bool isCheckable = FALSE)
+ wxItemKind kind = wxITEM_NORMAL)
{
- Insert(0u, id, text, help, isCheckable);
+ Insert(0u, id, text, help, kind);
}
- // insert a separator
+ // prepend a separator
void PrependSeparator()
{
InsertSeparator(0u);
}
- // insert a submenu
+ // prepend a check item
+ void PrependCheckItem(int id,
+ const wxString& text,
+ const wxString& help = wxEmptyString)
+ {
+ InsertCheckItem(0u, id, text, help);
+ }
+
+ // prepend a radio item
+ void PrependRadioItem(int id,
+ const wxString& text,
+ const wxString& help = wxEmptyString)
+ {
+ InsertRadioItem(0u, id, text, help);
+ }
+
+ // prepend a submenu
void Prepend(int id,
const wxString& text,
wxMenu *submenu,
virtual void SetTitle(const wxString& title) { m_title = title; }
const wxString GetTitle() const { return m_title; }
- // client data
- void SetClientData(void* clientData) { m_clientData = clientData; }
- void* GetClientData() const { return m_clientData; }
-
// event handler
void SetEventHandler(wxEvtHandler *handler) { m_eventHandler = handler; }
wxEvtHandler *GetEventHandler() const { return m_eventHandler; }
void SetParent(wxMenu *parent) { m_menuParent = parent; }
wxMenu *GetParent() const { return m_menuParent; }
-#if WXWIN_COMPATIBILITY
+ // implementation only from now on
+ // -------------------------------
+
+ // unlike FindItem(), this function doesn't recurse but only looks through
+ // our direct children and also may return the index of the found child if
+ // pos != NULL
+ wxMenuItem *FindChildItem(int id, size_t *pos = NULL) const;
+
+ // called to generate a wxCommandEvent, return TRUE if it was processed,
+ // FALSE otherwise
+ //
+ // the checked parameter may have boolean value or -1 for uncheckable items
+ bool SendEvent(int id, int checked = -1);
+
// compatibility: these functions are deprecated, use the new ones instead
+ // -----------------------------------------------------------------------
+
+ // use the versions taking wxItem_XXX now instead, they're more readable
+ // and allow adding the radio items as well
+ void Append(int id,
+ const wxString& text,
+ const wxString& help,
+ bool isCheckable)
+ {
+ Append(id, text, help, isCheckable ? wxITEM_CHECK : wxITEM_NORMAL);
+ }
+
+ void Insert(size_t pos,
+ int id,
+ const wxString& text,
+ const wxString& help,
+ bool isCheckable)
+ {
+ Insert(pos, id, text, help, isCheckable ? wxITEM_CHECK : wxITEM_NORMAL);
+ }
+
+ void Prepend(int id,
+ const wxString& text,
+ const wxString& help,
+ bool isCheckable)
+ {
+ Insert(0u, id, text, help, isCheckable);
+ }
+
+#if WXWIN_COMPATIBILITY
bool Enabled(int id) const { return IsEnabled(id); }
bool Checked(int id) const { return IsChecked(id); }
wxList& GetItems() const { return (wxList &)m_items; }
#endif // WXWIN_COMPATIBILITY
-#if wxUSE_MENU_CALLBACK
+#if wxUSE_MENU_CALLBACK || defined(__WXMOTIF__)
// wxWin 1.6x compatible menu event handling
wxFunction GetCallback() const { return m_callback; }
void Callback(const wxFunction func) { m_callback = func; }
wxFunction m_callback;
#endif // wxUSE_MENU_CALLBACK
- // unlike FindItem(), this function doesn't recurse but only looks through
- // our direct children and also may return the index of the found child if
- // pos != NULL
- wxMenuItem *FindChildItem(int id, size_t *pos = NULL) const;
-
- // called to generate a wxCommandEvent, return TRUE if it was processed,
- // FALSE otherwise
- //
- // the checked parameter may have boolean value or -1 for uncheckable items
- bool SendEvent(int id, int checked = -1);
-
protected:
// virtuals to override in derived classes
// ---------------------------------------
wxMenuItemList m_items; // the list of menu items
wxWindow *m_invokingWindow; // for popup menus
- void *m_clientData; // associated with the menu
long m_style; // combination of wxMENU_XXX flags
virtual void EnableTop(size_t pos, bool enable) = 0;
// is the menu enabled?
- virtual bool IsEnabledTop(size_t pos) const { return TRUE; }
+ virtual bool IsEnabledTop(size_t WXUNUSED(pos)) const { return TRUE; }
// get or change the label of the menu at given position
virtual void SetLabelTop(size_t pos, const wxString& label) = 0;
#include "wx/motif/menu.h"
#elif defined(__WXGTK__)
#include "wx/gtk/menu.h"
-#elif defined(__WXQT__)
- #include "wx/qt/menu.h"
#elif defined(__WXMAC__)
#include "wx/mac/menu.h"
#elif defined(__WXPM__)
projects / wxWidgets.git / blobdiff