no message

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

diff --git a/include/wx/ownerdrw.h b/include/wx/ownerdrw.h
index 293a5145eab47597328821cfae7c06d796e0b2ab..7726a31f1ea0d58a1778badf57a361b282521240 100644 (file)
--- a/include/wx/ownerdrw.h
+++ b/include/wx/ownerdrw.h
@@ -12,8 +12,12 @@
 #ifndef   _OWNERDRW_H
 #define   _OWNERDRW_H
 
+#ifdef    __GNUG__
+#pragma interface "ownerdrw.h"
+#endif
+
 typedef   wxColour      wxColor;
-typedef   unsigned int  uint;
+typedef   unsigned int  size_t;
 
 // ----------------------------------------------------------------------------
 // wxOwnerDrawn - a mix-in base class, derive from it to implement owner-drawn
@@ -27,9 +31,9 @@ class WXDLLEXPORT wxOwnerDrawn
 {
 public:
   // ctor & dtor
-  wxOwnerDrawn(const wxTString& str = "",
-                        bool bCheckable = FALSE,
-                        bool bMenuItem = FALSE); // ## kludge for colors
+  wxOwnerDrawn(const wxString& str = "",
+               bool bCheckable = FALSE,
+               bool bMenuItem = FALSE); // @@ kludge for colors
   virtual ~wxOwnerDrawn() { }
 
   // fix appearance
@@ -55,8 +59,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
@@ -65,8 +69,8 @@ public:
   //
   // 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; }
@@ -105,15 +109,15 @@ public:
   };
 
   // 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:
-  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
@@ -124,8 +128,9 @@ private:
   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
 };
 
-#endif  //_OWNERDRW_H
\ No newline at end of file
+#endif
+  // _OWNERDRW_H