X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..c0fbf24ba6abc81db66ead334d69af670a8ec5a7:/include/wx/menu.h diff --git a/include/wx/menu.h b/include/wx/menu.h index ee33335e21..932d2ab152 100644 --- a/include/wx/menu.h +++ b/include/wx/menu.h @@ -207,10 +207,6 @@ public: 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; } @@ -256,7 +252,7 @@ public: 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; } @@ -302,7 +298,6 @@ protected: 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 @@ -353,7 +348,7 @@ public: 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; @@ -451,8 +446,6 @@ protected: #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__)