// Created: 26.10.99
// RCS-ID: $Id$
// Copyright: (c) wxWindows team
-// Licence: wxWindows license
+// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
#ifndef _WX_MENU_H_BASE_
#define _WX_MENU_H_BASE_
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "menubase.h"
#endif
+#include "wx/defs.h"
+
#if wxUSE_MENUS
// ----------------------------------------------------------------------------
WX_DECLARE_EXPORTED_LIST(wxMenu, wxMenuList);
WX_DECLARE_EXPORTED_LIST(wxMenuItem, wxMenuItemList);
-// ----------------------------------------------------------------------------
-// conditional compilation
-// ----------------------------------------------------------------------------
-
-// having callbacks in menus is a wxWin 1.6x feature which should be replaced
-// with event tables in wxWin 2.xx code - however provide it because many
-// people like it a lot by default
-#ifndef wxUSE_MENU_CALLBACK
- #if WXWIN_COMPATIBILITY_2
- #define wxUSE_MENU_CALLBACK 1
- #else
- #define wxUSE_MENU_CALLBACK 0
- #endif // WXWIN_COMPATIBILITY_2
-#endif // !defined(wxUSE_MENU_CALLBACK)
-
// ----------------------------------------------------------------------------
// wxMenu
// ----------------------------------------------------------------------------
// menu construction
// -----------------
- // append a normal item to the menu
- void Append(int id,
- const wxString& text,
- const wxString& help = wxEmptyString,
- bool isCheckable = FALSE)
+ // append any kind of item (normal/check/radio/separator)
+ wxMenuItem* Append(int itemid,
+ const wxString& text,
+ const wxString& help = wxEmptyString,
+ wxItemKind kind = wxITEM_NORMAL)
{
- DoAppend(wxMenuItem::New((wxMenu *)this, id, text, help, isCheckable));
+ return DoAppend(wxMenuItem::New((wxMenu *)this, itemid, text, help, kind));
}
// append a separator to the menu
- void AppendSeparator() { Append(wxID_SEPARATOR, wxEmptyString); }
+ wxMenuItem* AppendSeparator() { return Append(wxID_SEPARATOR, wxEmptyString); }
+
+ // append a check item
+ wxMenuItem* AppendCheckItem(int itemid,
+ const wxString& text,
+ const wxString& help = wxEmptyString)
+ {
+ return Append(itemid, text, help, wxITEM_CHECK);
+ }
+
+ // append a radio item
+ wxMenuItem* AppendRadioItem(int itemid,
+ const wxString& text,
+ const wxString& help = wxEmptyString)
+ {
+ return Append(itemid, text, help, wxITEM_RADIO);
+ }
// append a submenu
- void Append(int id,
- const wxString& text,
- wxMenu *submenu,
- const wxString& help = wxEmptyString)
+ wxMenuItem* Append(int itemid,
+ const wxString& text,
+ wxMenu *submenu,
+ const wxString& help = wxEmptyString)
{
- DoAppend(wxMenuItem::New((wxMenu *)this, id, text, help, FALSE, submenu));
+ return DoAppend(wxMenuItem::New((wxMenu *)this, itemid, text, help,
+ wxITEM_NORMAL, submenu));
}
// the most generic form of Append() - append anything
- void Append(wxMenuItem *item) { DoAppend(item); }
+ wxMenuItem* Append(wxMenuItem *item) { return DoAppend(item); }
// insert a break in the menu (only works when appending the items, not
// inserting them)
virtual void Break() { }
// insert an item before given position
- bool Insert(size_t pos, wxMenuItem *item);
- void Insert(size_t pos,
- int id,
- const wxString& text,
- const wxString& help = wxEmptyString,
- bool isCheckable = FALSE)
+ wxMenuItem* Insert(size_t pos, wxMenuItem *item);
+
+ // insert an item before given position
+ wxMenuItem* Insert(size_t pos,
+ int itemid,
+ const wxString& text,
+ const wxString& help = wxEmptyString,
+ wxItemKind kind = wxITEM_NORMAL)
{
- Insert(pos, wxMenuItem::New((wxMenu *)this, id, text, help, isCheckable));
+ return Insert(pos, wxMenuItem::New((wxMenu *)this, itemid, text, help, kind));
}
// insert a separator
- void InsertSeparator(size_t pos)
+ wxMenuItem* InsertSeparator(size_t pos)
+ {
+ return Insert(pos, wxMenuItem::New((wxMenu *)this, wxID_SEPARATOR));
+ }
+
+ // insert a check item
+ wxMenuItem* InsertCheckItem(size_t pos,
+ int itemid,
+ const wxString& text,
+ const wxString& help = wxEmptyString)
+ {
+ return Insert(pos, itemid, text, help, wxITEM_CHECK);
+ }
+
+ // insert a radio item
+ wxMenuItem* InsertRadioItem(size_t pos,
+ int itemid,
+ const wxString& text,
+ const wxString& help = wxEmptyString)
{
- Insert(pos, wxMenuItem::New((wxMenu *)this));
+ return Insert(pos, itemid, text, help, wxITEM_RADIO);
}
// insert a submenu
- void Insert(size_t pos,
- int id,
- const wxString& text,
- wxMenu *submenu,
- const wxString& help = wxEmptyString)
+ wxMenuItem* Insert(size_t pos,
+ int itemid,
+ const wxString& text,
+ wxMenu *submenu,
+ const wxString& help = wxEmptyString)
{
- Insert(pos, wxMenuItem::New((wxMenu *)this, id, text, help, FALSE, submenu));
+ return Insert(pos, wxMenuItem::New((wxMenu *)this, itemid, text, help,
+ wxITEM_NORMAL, submenu));
}
// prepend an item to the menu
- void Prepend(wxMenuItem *item)
+ wxMenuItem* Prepend(wxMenuItem *item)
{
- Insert(0u, item);
+ return Insert(0u, item);
}
- void Prepend(int id,
- const wxString& text,
- const wxString& help = wxEmptyString,
- bool isCheckable = FALSE)
+ // prepend any item to the menu
+ wxMenuItem* Prepend(int itemid,
+ const wxString& text,
+ const wxString& help = wxEmptyString,
+ wxItemKind kind = wxITEM_NORMAL)
{
- Insert(0u, id, text, help, isCheckable);
+ return Insert(0u, itemid, text, help, kind);
}
- // insert a separator
- void PrependSeparator()
+ // prepend a separator
+ wxMenuItem* PrependSeparator()
{
- InsertSeparator(0u);
+ return InsertSeparator(0u);
}
- // insert a submenu
- void Prepend(int id,
- const wxString& text,
- wxMenu *submenu,
- const wxString& help = wxEmptyString)
+ // prepend a check item
+ wxMenuItem* PrependCheckItem(int itemid,
+ const wxString& text,
+ const wxString& help = wxEmptyString)
+ {
+ return InsertCheckItem(0u, itemid, text, help);
+ }
+
+ // prepend a radio item
+ wxMenuItem* PrependRadioItem(int itemid,
+ const wxString& text,
+ const wxString& help = wxEmptyString)
+ {
+ return InsertRadioItem(0u, itemid, text, help);
+ }
+
+ // prepend a submenu
+ wxMenuItem* Prepend(int itemid,
+ const wxString& text,
+ wxMenu *submenu,
+ const wxString& help = wxEmptyString)
{
- Insert(0u, id, text, submenu, help);
+ return Insert(0u, itemid, text, submenu, help);
}
// detach an item from the menu, but don't delete it so that it can be
// added back later (but if it's not, the caller is responsible for
// deleting it!)
- wxMenuItem *Remove(int id) { return Remove(FindChildItem(id)); }
+ wxMenuItem *Remove(int itemid) { return Remove(FindChildItem(itemid)); }
wxMenuItem *Remove(wxMenuItem *item);
// delete an item from the menu (submenus are not destroyed by this
// function, see Destroy)
- bool Delete(int id) { return Delete(FindChildItem(id)); }
+ bool Delete(int itemid) { return Delete(FindChildItem(itemid)); }
bool Delete(wxMenuItem *item);
// delete the item from menu and destroy it (if it's a submenu)
- bool Destroy(int id) { return Destroy(FindChildItem(id)); }
+ bool Destroy(int itemid) { return Destroy(FindChildItem(itemid)); }
bool Destroy(wxMenuItem *item);
// menu items access
// search
virtual int FindItem(const wxString& item) const;
- wxMenuItem* FindItem(int id, wxMenu **menu = NULL) const;
+ wxMenuItem* FindItem(int itemid, wxMenu **menu = NULL) const;
+
+ // find by position
+ wxMenuItem* FindItemByPosition(size_t position) const;
// get/set items attributes
- void Enable(int id, bool enable);
- bool IsEnabled(int id) const;
+ void Enable(int itemid, bool enable);
+ bool IsEnabled(int itemid) const;
- void Check(int id, bool check);
- bool IsChecked(int id) const;
+ void Check(int itemid, bool check);
+ bool IsChecked(int itemid) const;
- void SetLabel(int id, const wxString& label);
- wxString GetLabel(int id) const;
+ void SetLabel(int itemid, const wxString& label);
+ wxString GetLabel(int itemid) const;
- virtual void SetHelpString(int id, const wxString& helpString);
- virtual wxString GetHelpString(int id) const;
+ virtual void SetHelpString(int itemid, const wxString& helpString);
+ virtual wxString GetHelpString(int itemid) const;
// misc accessors
// --------------
void SetParent(wxMenu *parent) { m_menuParent = parent; }
wxMenu *GetParent() const { return m_menuParent; }
-#if WXWIN_COMPATIBILITY
- // compatibility: these functions are deprecated, use the new ones instead
- bool Enabled(int id) const { return IsEnabled(id); }
- bool Checked(int id) const { return IsChecked(id); }
-
- wxMenuItem* FindItemForId(int itemId, wxMenu **itemMenu) const
- { return FindItem(itemId, itemMenu); }
-
- wxList& GetItems() const { return (wxList &)m_items; }
-#endif // WXWIN_COMPATIBILITY
-
-#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
+ // 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;
+ wxMenuItem *FindChildItem(int itemid, 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);
+ bool SendEvent(int itemid, 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 itemid,
+ const wxString& text,
+ const wxString& help,
+ bool isCheckable)
+ {
+ Append(itemid, text, help, isCheckable ? wxITEM_CHECK : wxITEM_NORMAL);
+ }
+
+ void Insert(size_t pos,
+ int itemid,
+ const wxString& text,
+ const wxString& help,
+ bool isCheckable)
+ {
+ Insert(pos, itemid, text, help, isCheckable ? wxITEM_CHECK : wxITEM_NORMAL);
+ }
+
+ void Prepend(int itemid,
+ const wxString& text,
+ const wxString& help,
+ bool isCheckable)
+ {
+ Insert(0u, itemid, text, help, isCheckable);
+ }
protected:
// virtuals to override in derived classes
// ---------------------------------------
- virtual bool DoAppend(wxMenuItem *item);
- virtual bool DoInsert(size_t pos, wxMenuItem *item);
+ virtual wxMenuItem* DoAppend(wxMenuItem *item);
+ virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
virtual wxMenuItem *DoRemove(wxMenuItem *item);
virtual bool DoDelete(wxMenuItem *item);
long m_style; // combination of wxMENU_XXX flags
wxEvtHandler *m_eventHandler; // a pluggable in event handler
+
+ DECLARE_NO_COPY_CLASS(wxMenuBase)
};
// ----------------------------------------------------------------------------
// find item by id (in any menu), returns NULL if not found
//
// if menu is !NULL, it will be filled with wxMenu this item belongs to
- virtual wxMenuItem* FindItem(int id, wxMenu **menu = NULL) const;
+ virtual wxMenuItem* FindItem(int itemid, wxMenu **menu = NULL) const;
// find menu by its caption, return wxNOT_FOUND on failure
int FindMenu(const wxString& title) const;
// NB: under MSW, these methods can only be used after the menubar had
// been attached to the frame
- void Enable(int id, bool enable);
- void Check(int id, bool check);
- bool IsChecked(int id) const;
- bool IsEnabled(int id) const;
+ void Enable(int itemid, bool enable);
+ void Check(int itemid, bool check);
+ bool IsChecked(int itemid) const;
+ bool IsEnabled(int itemid) const;
- void SetLabel(int id, const wxString &label);
- wxString GetLabel(int id) const;
+ void SetLabel(int itemid, const wxString &label);
+ wxString GetLabel(int itemid) const;
- void SetHelpString(int id, const wxString& helpString);
- wxString GetHelpString(int id) const;
+ void SetHelpString(int itemid, const wxString& helpString);
+ wxString GetHelpString(int itemid) const;
// implementation helpers
// don't want menu bars to accept the focus by tabbing to them
virtual bool AcceptsFocusFromKeyboard() const { return FALSE; }
- // compatibility only: these functions are deprecated, use the new ones
- // instead
-#if WXWIN_COMPATIBILITY
- bool Enabled(int id) const { return IsEnabled(id); }
- bool Checked(int id) const { return IsChecked(id); }
-
- wxMenuItem* FindMenuItemById(int id) const
- { return FindItem(id); }
- wxMenuItem* FindItemForId(int id, wxMenu **menu = NULL) const
- { return FindItem(id, menu); }
-#endif // WXWIN_COMPATIBILITY
-
protected:
// the list of all our menus
wxMenuList m_menus;
// the frame we are attached to (may be NULL)
wxFrame *m_menuBarFrame;
+
+ DECLARE_NO_COPY_CLASS(wxMenuBarBase)
};
// ----------------------------------------------------------------------------
#include "wx/gtk/menu.h"
#elif defined(__WXMAC__)
#include "wx/mac/menu.h"
+#elif defined(__WXCOCOA__)
+ #include "wx/cocoa/menu.h"
#elif defined(__WXPM__)
#include "wx/os2/menu.h"
-#elif defined(__WXSTUBS__)
- #include "wx/stubs/menu.h"
#endif
#endif // wxUSE_BASE_CLASSES_ONLY/!wxUSE_BASE_CLASSES_ONLY
projects / wxWidgets.git / blobdiff