X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9874b4ee8308b8989c5df7db4f3559625299d0a4..a4f6fe43c33bd7933645d110ad2719871dab043d:/include/wx/motif/menu.h?ds=sidebyside diff --git a/include/wx/motif/menu.h b/include/wx/motif/menu.h index 97c694329e..a48c219af0 100644 --- a/include/wx/motif/menu.h +++ b/include/wx/motif/menu.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: menu.h +// Name: wx/motif/menu.h // Purpose: wxMenu, wxMenuBar classes // Author: Julian Smart // Modified by: @@ -12,187 +12,109 @@ #ifndef _WX_MOTIF_MENU_H_ #define _WX_MOTIF_MENU_H_ -#ifdef __GNUG__ - #pragma interface "menu.h" -#endif - #include "wx/colour.h" #include "wx/font.h" +#include "wx/arrstr.h" -class wxFrame; +class WXDLLIMPEXP_FWD_CORE wxFrame; // ---------------------------------------------------------------------------- // Menu // ---------------------------------------------------------------------------- -class wxMenu : public wxEvtHandler +class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase { - DECLARE_DYNAMIC_CLASS(wxMenu) - public: - // ctor & dtor -#ifdef WXWIN_COMPATIBILITY - wxMenu( const wxString& title, const wxFunction func) - { - Init(title, 0, func); - } -#endif // WXWIN_COMPATIBILITY - wxMenu( const wxString& title = wxEmptyString, long style = 0 ) - { - Init(title, style); - } - virtual ~wxMenu(); - - // construct menu - // append items to the menu - // separator line - void AppendSeparator(); - // normal item - void Append(int id, const wxString& Label, const wxString& helpString = wxEmptyString, - bool checkable = FALSE); - // a submenu - void Append(int id, const wxString& Label, wxMenu *SubMenu, - const wxString& helpString = wxEmptyString); - // the most generic form (create wxMenuItem first and use it's functions) - void Append(wxMenuItem *pItem); - // insert a break in the menu - void Break(); - // delete an item - void Delete(int id); - - // menu item control - void Enable(int id, bool Flag); - bool Enabled(int id) const; - bool IsEnabled(int id) const { return Enabled(id); }; - void Check(int id, bool Flag); - bool Checked(int id) const; - bool IsChecked(int id) const { return IsChecked(id); }; - - // Client data - void SetClientData(void* clientData) { m_clientData = clientData; } - void* GetClientData() const { return m_clientData; } - - // item properties - // title - void SetTitle(const wxString& label); - const wxString GetTitle() const; - // label - void SetLabel(int id, const wxString& label); - wxString GetLabel(int id) const; - // help string - virtual void SetHelpString(int id, const wxString& helpString); - virtual wxString GetHelpString(int id) const ; - - // find item - // Finds the item id matching the given string, -1 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(int itemId, wxMenu **itemMenu = NULL) const; - - // Updates the UI for a menu and all submenus recursively. - // source is the object that has the update event handlers - // defined for it. If NULL, the menu or associated window - // will be used. - void UpdateUI(wxEvtHandler* source = (wxEvtHandler*) NULL); - - void ProcessCommand(wxCommandEvent& event); - -#ifdef WXWIN_COMPATIBILITY - void Callback(const wxFunction func) { m_callback = func; } -#endif // WXWIN_COMPATIBILITY - - void SetEventHandler(wxEvtHandler *handler) { m_eventHandler = handler; } - wxEvtHandler *GetEventHandler() { return m_eventHandler; } - - wxList& GetItems() const { return (wxList&) m_menuItems; } - - void SetInvokingWindow(wxWindow *pWin) { m_pInvokingWindow = pWin; } - wxWindow *GetInvokingWindow() const { return m_pInvokingWindow; } - - //// Motif-specific - WXWidget GetButtonWidget() const { return m_buttonWidget; } - void SetButtonWidget(WXWidget buttonWidget) { m_buttonWidget = buttonWidget; } - WXWidget GetMainWidget() const { return m_menuWidget; } - wxMenu* GetParent() const { return m_menuParent; } - int GetId() const { return m_menuId; } - void SetId(int id) { m_menuId = id; } - void SetMenuBar(wxMenuBar* menuBar) { m_menuBar = menuBar; } - wxMenuBar* GetMenuBar() const { return m_menuBar; } - - void CreatePopup (WXWidget logicalParent, int x, int y); - void DestroyPopup (void); - void ShowPopup (int x, int y); - void HidePopup (void); - - WXWidget CreateMenu(wxMenuBar *menuBar, WXWidget parent, wxMenu *topMenu, - const wxString& title = "", bool isPulldown = FALSE); - - // For popups, need to destroy, then recreate menu for a different (or - // possibly same) window, since the parent may change. - void DestroyMenu(bool full); - WXWidget FindMenuItem(int id, wxMenuItem **it = NULL) const; - - const wxColour& GetBackgroundColour() const { return m_backgroundColour; } - const wxColour& GetForegroundColour() const { return m_foregroundColour; } - const wxFont& GetFont() const { return m_font; } - - void SetBackgroundColour(const wxColour& colour); - void SetForegroundColour(const wxColour& colour); - void SetFont(const wxFont& colour); - void ChangeFont(bool keepOriginalSize = FALSE); - - // implementation from now on - WXWidget GetHandle() const { return m_menuWidget; } - bool IsTearOff() const { return (m_style & wxMENU_TEAROFF) != 0; } + // ctors & dtor + wxMenu(const wxString& title, long style = 0) + : wxMenuBase(title, style) { Init(); } + + wxMenu(long style = 0) : wxMenuBase(style) { Init(); } + + virtual ~wxMenu(); + + // implement base class virtuals + virtual wxMenuItem* DoAppend(wxMenuItem *item); + virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item); + virtual wxMenuItem* DoRemove(wxMenuItem *item); + + virtual void Break(); + + virtual void SetTitle(const wxString& title); + + bool ProcessCommand(wxCommandEvent& event); + + //// Motif-specific + WXWidget GetButtonWidget() const { return m_buttonWidget; } + void SetButtonWidget(WXWidget buttonWidget) { m_buttonWidget = buttonWidget; } + + WXWidget GetMainWidget() const { return m_menuWidget; } + + int GetId() const { return m_menuId; } + void SetId(int id) { m_menuId = id; } + + void SetMenuBar(wxMenuBar* menuBar) { m_menuBar = menuBar; } + wxMenuBar* GetMenuBar() const { return m_menuBar; } + void CreatePopup(WXWidget logicalParent, int x, int y); + void DestroyPopup(); + void ShowPopup(int x, int y); + void HidePopup(); + + WXWidget CreateMenu(wxMenuBar *menuBar, WXWidget parent, wxMenu *topMenu, + size_t index, const wxString& title = wxEmptyString, + bool isPulldown = false); + + // For popups, need to destroy, then recreate menu for a different (or + // possibly same) window, since the parent may change. + void DestroyMenu(bool full); + WXWidget FindMenuItem(int id, wxMenuItem **it = NULL) const; + + const wxColour& GetBackgroundColour() const { return m_backgroundColour; } + const wxColour& GetForegroundColour() const { return m_foregroundColour; } + const wxFont& GetFont() const { return m_font; } + + void SetBackgroundColour(const wxColour& colour); + void SetForegroundColour(const wxColour& colour); + void SetFont(const wxFont& colour); + void ChangeFont(bool keepOriginalSize = false); + + WXWidget GetHandle() const { return m_menuWidget; } + + bool IsTearOff() const { return (m_style & wxMENU_TEAROFF) != 0; } + + void DestroyWidgetAndDetach(); public: -#ifdef WXWIN_COMPATIBILITY - wxFunction m_callback; -#endif // WXWIN_COMPATIBILITY - - int m_noItems; - wxString m_title; - wxMenuBar * m_menuBar; - wxList m_menuItems; - wxEvtHandler * m_eventHandler; - void* m_clientData; - wxWindow* m_pInvokingWindow; - - long m_style; - - //// Motif-specific - int m_numColumns; - WXWidget m_menuWidget; - WXWidget m_popupShell; // For holding the popup shell widget - WXWidget m_buttonWidget; // The actual string, so we can grey it etc. - int m_menuId; - wxMenu* m_topLevelMenu ; - wxMenu* m_menuParent; - bool m_ownedByMenuBar; - wxColour m_foregroundColour; - wxColour m_backgroundColour; - wxFont m_font; + // Motif-specific data + int m_numColumns; + WXWidget m_menuWidget; + WXWidget m_popupShell; // For holding the popup shell widget + WXWidget m_buttonWidget; // The actual string, so we can grey it etc. + int m_menuId; + wxMenu* m_topLevelMenu ; + bool m_ownedByMenuBar; + wxColour m_foregroundColour; + wxColour m_backgroundColour; + wxFont m_font; private: // common code for both constructors: - void Init( const wxString& title, - long style -#ifdef WXWIN_COMPATIBILITY - , const wxFunction func = (wxFunction) NULL -#endif - ); + void Init(); + + DECLARE_DYNAMIC_CLASS(wxMenu) }; // ---------------------------------------------------------------------------- // Menu Bar // ---------------------------------------------------------------------------- -class wxMenuBar : public wxMenuBarBase +class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase { public: wxMenuBar() { Init(); } wxMenuBar(long WXUNUSED(style)) { Init(); } - wxMenuBar(int n, wxMenu *menus[], const wxString titles[]); + wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0); + wxMenuBar(size_t n, wxMenu *menus[], const wxArrayString& titles, long style = 0); virtual ~wxMenuBar(); // implement base class (pure) virtuals @@ -204,12 +126,12 @@ public: virtual wxMenu *Remove(size_t pos); virtual int FindMenuItem(const wxString& menuString, - const wxString& itemString) const; + const wxString& itemString) const; virtual wxMenuItem* FindItem( int id, wxMenu **menu = NULL ) const; virtual void EnableTop( size_t pos, bool flag ); - virtual void SetLabelTop( size_t pos, const wxString& label ); - virtual wxString GetLabelTop( size_t pos ) const; + virtual void SetMenuLabel( size_t pos, const wxString& label ); + virtual wxString GetMenuLabel( size_t pos ) const; // implementation only from now on // ------------------------------- @@ -232,7 +154,7 @@ public: virtual bool SetBackgroundColour(const wxColour& colour); virtual bool SetForegroundColour(const wxColour& colour); virtual bool SetFont(const wxFont& colour); - void ChangeFont(bool keepOriginalSize = FALSE); + void ChangeFont(bool keepOriginalSize = false); public: // common part of all ctors