X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..a6fd73d33ac80632981dee1c0be669f20ba765b5:/include/wx/ownerdrw.h?ds=sidebyside

diff --git a/include/wx/ownerdrw.h b/include/wx/ownerdrw.h
index 0e5a8f312f..50e85b4a64 100644
--- a/include/wx/ownerdrw.h
+++ b/include/wx/ownerdrw.h
@@ -29,7 +29,7 @@
 // element or one unchangeable bitmap otherwise.
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxOwnerDrawn
+class WXDLLIMPEXP_CORE wxOwnerDrawn
 {
 public:
   // ctor & dtor
@@ -61,9 +61,14 @@ public:
         m_bmpUnchecked = bmpUnchecked;
         m_bOwnerDrawn = true; }
 
-  void SetBitmap(const wxBitmap& bmpChecked)
-      { m_bmpChecked = bmpChecked;
-        m_bOwnerDrawn = true; }
+  void SetBitmap(const wxBitmap& bmp, bool bChecked = true)
+  {
+      if ( bChecked )
+          m_bmpChecked = bmp;
+      else
+          m_bmpUnchecked = bmp;
+      m_bOwnerDrawn = true;
+  }
 
   void SetDisabledBitmap( const wxBitmap& bmpDisabled )
       { m_bmpDisabled = bmpDisabled;
@@ -153,7 +158,8 @@ private:
   static size_t ms_nLastMarginWidth;    // handy for aligning all items
 
   bool      m_bCheckable,   // used only for menu or check listbox items
-            m_bOwnerDrawn;  // true if something is non standard
+            m_bOwnerDrawn,  // true if something is non standard
+            m_isMenuItem;   // true if this is a menu item
 
   wxFont    m_font;         // font to use for drawing
   wxColour  m_colText,      // color ----"---"---"----
@@ -163,7 +169,6 @@ private:
             m_bmpDisabled;
 
   size_t    m_nHeight,      // font height
-            m_nMinHeight,   // minimum height, as determined by user's system settings
             m_nMarginWidth; // space occupied by bitmap to the left of the item
 };