Fix XTI compilation in STL build.

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

diff --git a/include/wx/msw/menuitem.h b/include/wx/msw/menuitem.h
index 0671283cf064486331d58279c4d81b09f67d1128..21be80c38f3e81fbcfc3395b3f48ae3f5a7690c6 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:
@@ -19,6 +19,8 @@
 #if wxUSE_OWNER_DRAWN
     #include "wx/ownerdrw.h"
     #include "wx/bitmap.h"
+
+    struct tagRECT;
 #endif
 
 // ----------------------------------------------------------------------------
@@ -107,6 +109,7 @@ public:
     const wxBitmap& GetDisabledBitmap() const
         { return m_bmpDisabled; }
 
+    int MeasureAccelWidth() const;
 
     // override wxOwnerDrawn base class virtuals
     virtual wxString GetName() const;
@@ -115,6 +118,11 @@ public:
 
 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
 
@@ -140,11 +148,6 @@ private:
     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)