Mention wxGTK wxAnimation implementation limitations in the docs.

[wxWidgets.git] / include / wx / msw / menuitem.h

diff --git a/include/wx/msw/menuitem.h b/include/wx/msw/menuitem.h
index 0671283cf064486331d58279c4d81b09f67d1128..1fe684971bf3ef757afaa007fa77fb3554003a43 100644 (file)
--- 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:
 // Purpose:     wxMenuItem class
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -19,6 +19,8 @@
 #if wxUSE_OWNER_DRAWN
     #include "wx/ownerdrw.h"
     #include "wx/bitmap.h"
 #if wxUSE_OWNER_DRAWN
     #include "wx/ownerdrw.h"
     #include "wx/bitmap.h"

+
+    struct tagRECT;

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -59,11 +61,6 @@ public:
     // Win32 API
     WXWPARAM GetMSWId() const;
 
     // 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(
 #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; }
 
     const wxBitmap& GetDisabledBitmap() const
         { return m_bmpDisabled; }
 

+    int MeasureAccelWidth() const;

 
     // override wxOwnerDrawn base class virtuals
     virtual wxString GetName() const;
 
     // override wxOwnerDrawn base class virtuals
     virtual wxString GetName() const;


@@ -115,6 +113,11 @@ public:
 
 protected:
     virtual void GetFontToUse(wxFont& font) const;
 
 protected:
     virtual void GetFontToUse(wxFont& font) const;

+    virtual void GetColourToUse(wxODStatus stat, wxColour& colText, wxColour& colBack) const;
+
+private:
+    // helper function for draw std menu check mark
+    void DrawStdCheckMark(WXHDC hdc, const tagRECT* rc, wxODStatus stat);

 
 #endif // wxUSE_OWNER_DRAWN
 
 
 #endif // wxUSE_OWNER_DRAWN
 


@@ -122,29 +125,12 @@ private:
     // common part of all ctors
     void Init();
 
     // 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
     wxBitmap m_bmpChecked,     // bitmap to put near the item
              m_bmpUnchecked,   // (checked is used also for 'uncheckable' items)
              m_bmpDisabled;
 
 #if wxUSE_OWNER_DRAWN
     // item bitmaps
     wxBitmap m_bmpChecked,     // bitmap to put near the item
              m_bmpUnchecked,   // (checked is used also for 'uncheckable' items)
              m_bmpDisabled;

-
-    // static variables for cache some system settings
-    static wxFont ms_systemMenuFont;
-    static size_t ms_systemMenuHeight;
-    static bool ms_alwaysShowCues;

 #endif // wxUSE_OWNER_DRAWN
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxMenuItem)
 #endif // wxUSE_OWNER_DRAWN
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxMenuItem)