X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/87a39e3b554b82450ea87ca971a8111c76cb4ac9..a01ada0599acdc11497850c4c8e846d3f237bf91:/include/wx/univ/menu.h?ds=sidebyside diff --git a/include/wx/univ/menu.h b/include/wx/univ/menu.h index ac9364404b..b964b7e869 100644 --- a/include/wx/univ/menu.h +++ b/include/wx/univ/menu.h @@ -12,10 +12,6 @@ #ifndef _WX_UNIV_MENU_H_ #define _WX_UNIV_MENU_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "univmenu.h" -#endif - #if wxUSE_ACCEL #include "wx/accel.h" #endif // wxUSE_ACCEL @@ -23,18 +19,18 @@ #include "wx/dynarray.h" // fwd declarations -class WXDLLEXPORT wxMenuInfo; +class WXDLLIMPEXP_FWD_CORE wxMenuInfo; WX_DECLARE_EXPORTED_OBJARRAY(wxMenuInfo, wxMenuInfoArray); -class WXDLLEXPORT wxMenuGeometryInfo; -class WXDLLEXPORT wxPopupMenuWindow; -class WXDLLEXPORT wxRenderer; +class WXDLLIMPEXP_FWD_CORE wxMenuGeometryInfo; +class WXDLLIMPEXP_FWD_CORE wxPopupMenuWindow; +class WXDLLIMPEXP_FWD_CORE wxRenderer; // ---------------------------------------------------------------------------- // wxMenu // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMenu : public wxMenuBase +class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase { public: // ctors and dtor @@ -142,7 +138,7 @@ private: // wxMenuBar // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMenuBar : public wxMenuBarBase +class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase { public: // ctors and dtor @@ -159,8 +155,8 @@ public: virtual void EnableTop(size_t pos, bool enable); virtual bool IsEnabledTop(size_t pos) const; - 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; virtual void Attach(wxFrame *frame); virtual void Detach(); @@ -248,6 +244,9 @@ protected: // we don't want to have focus except while selecting from menu void GiveAwayFocus(); + // Release the mouse capture if we have it + bool ReleaseMouseCapture(); + // the array containing extra menu info we need wxMenuInfoArray m_menuInfos;