X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/294ea16de3359844cb884baad219b40ea04fac48..6d8978f030996c834fcd29d85d95ebe261b8defc:/include/wx/univ/menu.h diff --git a/include/wx/univ/menu.h b/include/wx/univ/menu.h index ba7d0418b7..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,12 +138,12 @@ private: // wxMenuBar // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMenuBar : public wxMenuBarBase +class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase { public: // ctors and dtor wxMenuBar(long WXUNUSED(style) = 0) { Init(); } - wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0) + wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0); virtual ~wxMenuBar(); // implement base class virtuals @@ -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;