more backwards compatibility for printing

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

diff --git a/include/wx/ownerdrw.h b/include/wx/ownerdrw.h
index c319899d2a646c0b065504a395c074c3ee121bbb..5a742f3dda790cece7e2ddd628b67b78a5b3ff51 100644 (file)
--- a/include/wx/ownerdrw.h
+++ b/include/wx/ownerdrw.h
@@ -16,8 +16,9 @@
 #pragma interface "ownerdrw.h"
 #endif
 
 #pragma interface "ownerdrw.h"
 #endif
 

-typedef   wxColour      wxColor;
-typedef   unsigned int  uint;
+// 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
 
 // ----------------------------------------------------------------------------
 // wxOwnerDrawn - a mix-in base class, derive from it to implement owner-drawn


@@ -59,8 +60,8 @@ public:
     m_bmpUnchecked = bmpUnchecked; 
     m_bOwnerDrawn = TRUE;          }
 
     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
 
   // 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


@@ -69,8 +70,8 @@ public:
   //
   // NB: default is too small for bitmaps, but ok for checkmarks.
   inline void SetMarginWidth(int nWidth)
   //
   // NB: default is too small for bitmaps, but ok for checkmarks.
   inline void SetMarginWidth(int nWidth)

-  { ms_nLastMarginWidth = m_nMarginWidth = (uint) nWidth;
-    if ( ((uint) nWidth) != ms_nDefaultMarginWidth ) m_bOwnerDrawn = TRUE; }
+  { ms_nLastMarginWidth = m_nMarginWidth = (size_t) nWidth;
+    if ( ((size_t) nWidth) != ms_nDefaultMarginWidth ) m_bOwnerDrawn = TRUE; }

 
   inline int GetMarginWidth() const { return (int) m_nMarginWidth; }
   inline static int GetDefaultMarginWidth() { return (int) ms_nDefaultMarginWidth; }
 
   inline int GetMarginWidth() const { return (int) m_nMarginWidth; }
   inline static int GetDefaultMarginWidth() { return (int) ms_nDefaultMarginWidth; }


@@ -109,27 +110,28 @@ public:
   };
 
   // virtual functions to implement drawing (return TRUE if processed)
   };
 
   // virtual functions to implement drawing (return TRUE if processed)

-  virtual bool OnMeasureItem(uint *pwidth, uint *pheight);
+  virtual bool OnMeasureItem(size_t *pwidth, size_t *pheight);

   virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat);
 
 protected:
   wxString  m_strName;      // label for a manu item
 
 private:
   virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat);
 
 protected:
   wxString  m_strName;      // label for a manu item
 
 private:

-  static uint ms_nDefaultMarginWidth; // menu check mark width
-  static uint ms_nLastMarginWidth;    // handy for aligning all items
+  static size_t ms_nDefaultMarginWidth; // menu check mark width
+  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
 
   wxFont    m_font;         // font to use for drawing
 
   bool      m_bCheckable,   // used only for menu or check listbox items
             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)
 
             m_colBack;      // background color
   wxBitmap  m_bmpChecked,   // bitmap to put near the item
             m_bmpUnchecked; // (checked is used also for 'uncheckable' items)
 

-  uint      m_nHeight,      // font height
+  size_t      m_nHeight,      // font height

             m_nMarginWidth; // space occupied by bitmap to the left of the item
 };
 
             m_nMarginWidth; // space occupied by bitmap to the left of the item
 };
 

-#endif  //_OWNERDRW_H
\ No newline at end of file
+#endif
+  // _OWNERDRW_H