no message

[wxWidgets.git] / src / msw / ownerdrw.cpp

diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp
index 117b784af36f0edf71809ba4b72a69df4b2adde1..3f1358dcb6d9740cb23ce35259c512a4d6808bf7 100644 (file)
--- a/src/msw/ownerdrw.cpp
+++ b/src/msw/ownerdrw.cpp
@@ -9,15 +9,15 @@
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 

-// ============================================================================
-// headers & declarations
-// ============================================================================
+#ifdef __GNUG__
+#pragma implementation
+#endif

 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-  #pragma hdrstop
+#pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP


@@ -46,18 +46,18 @@ wxOwnerDrawn::wxOwnerDrawn(const wxString& str,
 }
 
 #if defined(__WXMSW__) && defined(__WIN32__)
 }
 
 #if defined(__WXMSW__) && defined(__WIN32__)

-  uint wxOwnerDrawn::ms_nDefaultMarginWidth = GetSystemMetrics(SM_CXMENUCHECK);
+  size_t wxOwnerDrawn::ms_nDefaultMarginWidth = GetSystemMetrics(SM_CXMENUCHECK);

 #else   // # what is the reasonable default?
 #else   // # what is the reasonable default?

-  uint wxOwnerDrawn::ms_nDefaultMarginWidth = 15;
+  size_t wxOwnerDrawn::ms_nDefaultMarginWidth = 15;

 #endif
 
 #endif
 

-uint wxOwnerDrawn::ms_nLastMarginWidth = ms_nDefaultMarginWidth;
+size_t wxOwnerDrawn::ms_nLastMarginWidth = ms_nDefaultMarginWidth;

 
 // drawing
 // -------
 
 // get size of the item
 
 // drawing
 // -------
 
 // get size of the item

-bool wxOwnerDrawn::OnMeasureItem(uint *pwidth, uint *pheight)
+bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight)

 {
   wxMemoryDC dc;
   dc.SetFont(GetFont());
 {
   wxMemoryDC dc;
   dc.SetFont(GetFont());