X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aa4919edd16047bb9590658f7a9fbe50fc659bc1..616c0d1f3ac084bb92f0a75dc48812e8647f1b22:/include/wx/msw/menuitem.h?ds=sidebyside diff --git a/include/wx/msw/menuitem.h b/include/wx/msw/menuitem.h index e885b98019..fb6ef62e5e 100644 --- a/include/wx/msw/menuitem.h +++ b/include/wx/msw/menuitem.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: menuitem.h +// Name: wx/msw/menuitem.h // Purpose: wxMenuItem class // Author: Vadim Zeitlin // Modified by: @@ -19,6 +19,8 @@ #if wxUSE_OWNER_DRAWN #include "wx/ownerdrw.h" #include "wx/bitmap.h" + + struct tagRECT; #endif // ---------------------------------------------------------------------------- @@ -59,11 +61,6 @@ public: // Win32 API WXWPARAM GetMSWId() const; - // mark item as belonging to the given radio group - void SetAsRadioGroupStart(); - void SetRadioGroupStart(int start); - void SetRadioGroupEnd(int end); - #if WXWIN_COMPATIBILITY_2_8 // compatibility only, don't use in new code wxDEPRECATED( @@ -107,6 +104,7 @@ public: const wxBitmap& GetDisabledBitmap() const { return m_bmpDisabled; } + int MeasureAccelWidth() const; // override wxOwnerDrawn base class virtuals virtual wxString GetName() const; @@ -117,24 +115,25 @@ protected: virtual void GetFontToUse(wxFont& font) const; virtual void GetColourToUse(wxODStatus stat, wxColour& colText, wxColour& colBack) const; -#endif // wxUSE_OWNER_DRAWN +private: + // helper function for draw std menu check mark + void DrawStdCheckMark(WXHDC hdc, const tagRECT* rc, wxODStatus stat); + +#else // !wxUSE_OWNER_DRAWN + // Provide stubs for the public functions above to ensure that the code + // still compiles without wxUSE_OWNER_DRAWN -- it makes sense to just drop + // the bitmaps then instead of failing compilation. + void SetBitmaps(const wxBitmap& WXUNUSED(bmpChecked), + const wxBitmap& WXUNUSED(bmpUnchecked) = wxNullBitmap) { } + void SetBitmap(const wxBitmap& WXUNUSED(bmp), + bool WXUNUSED(bChecked) = true) { } + const wxBitmap& GetBitmap() const { return wxNullBitmap; } +#endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN private: // common part of all ctors void Init(); - // the positions of the first and last items of the radio group this item - // belongs to or -1: start is the radio group start and is valid for all - // but first radio group items (m_isRadioGroupStart == false), end is valid - // only for the first one - union - { - int start; - int end; - } m_radioGroup; - - // does this item start a radio group? - bool m_isRadioGroupStart; #if wxUSE_OWNER_DRAWN // item bitmaps