Corrected memory.cpp compilation error; Cygwin makefile uses generic wxDirDlg

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

diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp
index f0c2c0ee23dae6a96b757d5f844121276b959ccf..05b5b86c06f8b4a7c5f253eebe4de1fe4330f622 100644 (file)
--- a/src/msw/checklst.cpp
+++ b/src/msw/checklst.cpp
@@ -2,17 +2,13 @@
 // Name:        msw/checklst.cpp
 // Purpose:     implementation of wxCheckListBox class
 // Author:      Vadim Zeitlin
-// Modified by: 
+// Modified by:
 // Created:     16.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
-// ============================================================================
-// headers & declarations
-// ============================================================================
-
 #ifdef __GNUG__
 #pragma implementation "checklst.h"
 #endif
@@ -24,7 +20,7 @@
 #pragma hdrstop
 #endif
 
-#if USE_OWNER_DRAWN
+#if wxUSE_OWNER_DRAWN
 
 #include <windows.h>
 
@@ -87,7 +83,7 @@ wxCheckListBoxItem::wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex)
  * check until you click to the right of it, which is OK for WIN32.
  */
 
-bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc, 
+bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
                                     wxODAction act, wxODStatus stat)
 {
   if ( IsChecked() )
@@ -97,8 +93,8 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
     // ## using native API for performance and precision
     size_t nCheckWidth  = GetDefaultMarginWidth(),
          nCheckHeight = m_pParent->GetItemHeight();
-          
-    int x = rc.GetX(), 
+
+    int x = rc.GetX(),
         y = rc.GetY();
 
     HDC hdc = (HDC)dc.GetHDC();
@@ -106,7 +102,7 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
     // create pens
     HPEN hpenBack = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_WINDOW)),
          hpenGray = CreatePen(PS_SOLID, 0, RGB(128, 128, 128)),
-         hpenPrev = SelectObject(hdc, hpenBack);
+         hpenPrev = (HPEN)SelectObject(hdc, hpenBack);
 
     // we erase the 1-pixel border
     Rectangle(hdc, x, y, x + nCheckWidth, y + nCheckHeight);
@@ -118,7 +114,7 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
       // first create a monochrome bitmap in a memory DC
       HDC hdcMem = CreateCompatibleDC(hdc);
       HBITMAP hbmpCheck = CreateBitmap(nCheckWidth, nCheckHeight, 1, 1, 0);
-      HBITMAP hbmpOld = SelectObject(hdcMem, hbmpCheck);
+      HBITMAP hbmpOld = (HBITMAP)SelectObject(hdcMem, hbmpCheck);
 
       // then draw a check mark into it
       RECT rect = { 0, 0, nCheckWidth, nCheckHeight };
@@ -143,7 +139,7 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
 #endif
 
       // finally copy it to screen DC and clean up
-      BitBlt(hdc, x, y, nCheckWidth - 1, nCheckHeight, 
+      BitBlt(hdc, x, y, nCheckWidth - 1, nCheckHeight,
              hdcMem, 0, 0, SRCCOPY);
 
       SelectObject(hdcMem, hbmpOld);
@@ -158,7 +154,7 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
 
     // draw hollow gray rectangle
     (void)SelectObject(hdc, hpenGray);
-    HBRUSH hbrPrev  = SelectObject(hdc, GetStockObject(NULL_BRUSH));
+    HBRUSH hbrPrev  = (HBRUSH)SelectObject(hdc, GetStockObject(NULL_BRUSH));
     Rectangle(hdc, x, y, x + nCheckWidth, y + nCheckHeight);
 
     // clean up
@@ -185,7 +181,7 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
 
 // change the state of the item and redraw it
 void wxCheckListBoxItem::Toggle()
-{ 
+{
   m_bChecked = !m_bChecked;
 
   size_t nHeight = m_pParent->GetItemHeight();