Various small fixes

[wxWidgets.git] / include / wx / ownerdrw.h

diff --git a/include/wx/ownerdrw.h b/include/wx/ownerdrw.h
index 97b19a0e8f323384ce0b86d33bf5e3a5ebccbc5f..5a742f3dda790cece7e2ddd628b67b78a5b3ff51 100644 (file)
--- a/include/wx/ownerdrw.h
+++ b/include/wx/ownerdrw.h
@@ -16,8 +16,9 @@
 #pragma interface "ownerdrw.h"
 #endif
 
-typedef   wxColour      wxColor;
-typedef   unsigned int  size_t;
+// No, don't do this: BC++ 5 complains that size_t already been defined.
+// typedef   unsigned int  size_t;
+#include <stddef.h>
 
 // ----------------------------------------------------------------------------
 // wxOwnerDrawn - a mix-in base class, derive from it to implement owner-drawn
@@ -59,8 +60,8 @@ public:
     m_bmpUnchecked = bmpUnchecked; 
     m_bOwnerDrawn = TRUE;          }
 
-  inline wxBitmap& GetBitmap(bool bChecked = TRUE) const
-  { return (wxBitmap &)(bChecked ? m_bmpChecked : m_bmpUnchecked); }
+  inline const wxBitmap& GetBitmap(bool bChecked = TRUE) const
+  { return (bChecked ? m_bmpChecked : m_bmpUnchecked); }
 
   // the height of the menu checkmark (or bitmap) is determined by the font
   // for the current item, but the width should be always the same (for the
@@ -123,7 +124,7 @@ private:
             m_bOwnerDrawn;  // true if something is non standard
 
   wxFont    m_font;         // font to use for drawing
-  wxColor   m_colText,      // color ----"---"---"----
+  wxColour   m_colText,      // color ----"---"---"----
             m_colBack;      // background color
   wxBitmap  m_bmpChecked,   // bitmap to put near the item
             m_bmpUnchecked; // (checked is used also for 'uncheckable' items)