no message

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

diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp
index 22c152f23d69f2a0dd9c2056e6dc388204ff1be9..3f1358dcb6d9740cb23ce35259c512a4d6808bf7 100644 (file)
--- a/src/msw/ownerdrw.cpp
+++ b/src/msw/ownerdrw.cpp
@@ -9,15 +9,15 @@
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
-// ============================================================================
-// headers & declarations
-// ============================================================================
+#ifdef __GNUG__
+#pragma implementation
+#endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-  #pragma hdrstop
+#pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
@@ -35,7 +35,7 @@
 
 // ctor
 // ----
-wxOwnerDrawn::wxOwnerDrawn(const wxTString& str, 
+wxOwnerDrawn::wxOwnerDrawn(const wxString& str, 
                            bool bCheckable, bool bMenuItem)
             : m_strName(str)
 {
@@ -45,19 +45,19 @@ wxOwnerDrawn::wxOwnerDrawn(const wxTString& str,
   m_nMarginWidth = ms_nLastMarginWidth;
 }
 
-#if defined(__WINDOWS__) && defined(__WIN32__)
-  uint wxOwnerDrawn::ms_nDefaultMarginWidth = GetSystemMetrics(SM_CXMENUCHECK);
+#if defined(__WXMSW__) && defined(__WIN32__)
+  size_t wxOwnerDrawn::ms_nDefaultMarginWidth = GetSystemMetrics(SM_CXMENUCHECK);
 #else   // # what is the reasonable default?
-  uint wxOwnerDrawn::ms_nDefaultMarginWidth = 15;
+  size_t wxOwnerDrawn::ms_nDefaultMarginWidth = 15;
 #endif
 
-uint wxOwnerDrawn::ms_nLastMarginWidth = ms_nDefaultMarginWidth;
+size_t wxOwnerDrawn::ms_nLastMarginWidth = ms_nDefaultMarginWidth;
 
 // 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());
@@ -128,7 +128,7 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt
   #ifdef  O_DRAW_NATIVE_API
     int nPrevMode = SetBkMode(hdc, TRANSPARENT);
     HBRUSH  hbr = CreateSolidBrush(colBack),
-            hPrevBrush = SelectObject(hdc, hbr);
+            hPrevBrush = (HBRUSH) SelectObject(hdc, hbr);
 
     RECT rectAll = { rc.GetLeft(), rc.GetTop(), rc.GetRight(), rc.GetBottom() };
     FillRect(hdc, &rectAll, hbr);
@@ -143,7 +143,7 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt
       hfont = (HFONT)::GetStockObject(SYSTEM_FONT);
     }
 
-    HFONT hPrevFont = ::SelectObject(hdc, hfont);
+    HFONT hPrevFont = (HFONT) ::SelectObject(hdc, hfont);
     DrawState(hdc, NULL, NULL, 
               (LPARAM)(const char *)m_strName, m_strName.Length(), 
               x, rc.y, rc.GetWidth(), rc.GetHeight(),
@@ -162,7 +162,7 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt
   if ( IsCheckable() && !m_bmpChecked.Ok() ) {
     if ( st & wxODChecked ) {
       // using native APIs for performance and simplicity
-      #ifdef  O_DRAW_NATIVE_API
+#ifdef  O_DRAW_NATIVE_API
       // what goes on: DrawFrameControl creates a b/w mask, 
       // then we copy it to screen to have right colors
 
@@ -179,10 +179,10 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt
       BitBlt(hdc, rc.x, rc.y, GetMarginWidth(), m_nHeight, 
              hdcMem, 0, 0, SRCCOPY);
       DeleteDC(hdcMem);
-      #else
+#else
         // #### to do: perhaps using Marlett font (create equiv. font under X)
-        wxFAIL("not implemented");
-      #endif  //O_DRAW_NATIVE_API
+//        wxFAIL("not implemented");
+#endif  //O_DRAW_NATIVE_API
     }
   }
   else {