unneeded line removed

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

diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp
index e388e1fb2d51e5c7270b0238caedfd5ee0da8573..9ab8c3ceb7d82be95a53b9162344d49cfdbdfee1 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
 // 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
 ///////////////////////////////////////////////////////////////////////////////
 
 // 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
 #ifdef __GNUG__
 #pragma implementation "checklst.h"
 #endif


@@ -24,13 +20,21 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#if USE_OWNER_DRAWN
-
-#include <windows.h>
+#if wxUSE_OWNER_DRAWN

 
 

+#include "wx/object.h"
+#include "wx/colour.h"
+#include "wx/font.h"
+#include "wx/bitmap.h"
+#include "wx/window.h"
+#include "wx/listbox.h"

 #include "wx/ownerdrw.h"
 #include "wx/ownerdrw.h"

+#include "wx/settings.h"
+#include "wx/dcmemory.h"

 #include "wx/msw/checklst.h"
 
 #include "wx/msw/checklst.h"
 

+#include <windows.h>
+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -47,7 +51,7 @@ class wxCheckListBoxItem : public wxOwnerDrawn
 {
 public:
   // ctor
 {
 public:
   // ctor

-  wxCheckListBoxItem(wxCheckListBox *pParent, uint nIndex);
+  wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex);

 
   // drawing functions
   virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat);
 
   // drawing functions
   virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat);


@@ -60,10 +64,10 @@ public:
 private:
   bool            m_bChecked;
   wxCheckListBox *m_pParent;
 private:
   bool            m_bChecked;
   wxCheckListBox *m_pParent;

-  uint            m_nIndex;
+  size_t            m_nIndex;

 };
 
 };
 

-wxCheckListBoxItem::wxCheckListBoxItem(wxCheckListBox *pParent, uint nIndex)
+wxCheckListBoxItem::wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex)

                   : wxOwnerDrawn("", TRUE)   // checkable
 {
   m_bChecked = FALSE;
                   : wxOwnerDrawn("", TRUE)   // checkable
 {
   m_bChecked = FALSE;


@@ -87,7 +91,7 @@ wxCheckListBoxItem::wxCheckListBoxItem(wxCheckListBox *pParent, uint nIndex)
  * check until you click to the right of it, which is OK for WIN32.
  */
 
  * 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() )
                                     wxODAction act, wxODStatus stat)
 {
   if ( IsChecked() )


@@ -95,10 +99,10 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
 
   if ( wxOwnerDrawn::OnDrawItem(dc, rc, act, stat) ) {
     // ## using native API for performance and precision
 
   if ( wxOwnerDrawn::OnDrawItem(dc, rc, act, stat) ) {
     // ## using native API for performance and precision

-    uint nCheckWidth  = GetDefaultMarginWidth(),
+    size_t nCheckWidth  = GetDefaultMarginWidth(),

          nCheckHeight = m_pParent->GetItemHeight();
          nCheckHeight = m_pParent->GetItemHeight();

-          
-    int x = rc.GetX(), 
+
+    int x = rc.GetX(),

         y = rc.GetY();
 
     HDC hdc = (HDC)dc.GetHDC();
         y = rc.GetY();
 
     HDC hdc = (HDC)dc.GetHDC();


@@ -106,7 +110,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)),
     // 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);
 
     // we erase the 1-pixel border
     Rectangle(hdc, x, y, x + nCheckWidth, y + nCheckHeight);


@@ -118,13 +122,15 @@ 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);
       // 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 };
 
 #ifdef __WIN32__
 
       // then draw a check mark into it
       RECT rect = { 0, 0, nCheckWidth, nCheckHeight };
 
 #ifdef __WIN32__

+#ifndef __SC__

       DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK);
       DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK);

+#endif

 #else
       // In WIN16, draw a cross
       HPEN blackPen = CreatePen(PS_SOLID, 1, RGB(0, 0, 0));
 #else
       // In WIN16, draw a cross
       HPEN blackPen = CreatePen(PS_SOLID, 1, RGB(0, 0, 0));


@@ -143,7 +149,7 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
 #endif
 
       // finally copy it to screen DC and clean up
 #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);
              hdcMem, 0, 0, SRCCOPY);
 
       SelectObject(hdcMem, hbmpOld);


@@ -158,7 +164,7 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
 
     // draw hollow gray rectangle
     (void)SelectObject(hdc, hpenGray);
 
     // 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
     Rectangle(hdc, x, y, x + nCheckWidth, y + nCheckHeight);
 
     // clean up


@@ -185,11 +191,11 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
 
 // change the state of the item and redraw it
 void wxCheckListBoxItem::Toggle()
 
 // change the state of the item and redraw it
 void wxCheckListBoxItem::Toggle()

-{ 
+{

   m_bChecked = !m_bChecked;
 
   m_bChecked = !m_bChecked;
 

-  uint nHeight = m_pParent->GetItemHeight();
-  uint y = m_nIndex * nHeight;
+  size_t nHeight = m_pParent->GetItemHeight();
+  size_t y = m_nIndex * nHeight;

   RECT rcUpdate = { 0, y, GetDefaultMarginWidth(), y + nHeight};
   InvalidateRect((HWND)m_pParent->GetHWND(), &rcUpdate, FALSE);
 
   RECT rcUpdate = { 0, y, GetDefaultMarginWidth(), y + nHeight};
   InvalidateRect((HWND)m_pParent->GetHWND(), &rcUpdate, FALSE);
 


@@ -236,7 +242,7 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
 // --------------------
 
 // create a check list box item
 // --------------------
 
 // create a check list box item

-wxOwnerDrawn *wxCheckListBox::CreateItem(uint nIndex)
+wxOwnerDrawn *wxCheckListBox::CreateItem(size_t nIndex)

 {
   wxCheckListBoxItem *pItem = new wxCheckListBoxItem(this, nIndex);
   if ( m_windowFont.Ok() )
 {
   wxCheckListBoxItem *pItem = new wxCheckListBoxItem(this, nIndex);
   if ( m_windowFont.Ok() )


@@ -270,12 +276,12 @@ bool wxCheckListBox::MSWOnMeasure(WXMEASUREITEMSTRUCT *item)
 // check items
 // -----------
 
 // check items
 // -----------
 

-bool wxCheckListBox::IsChecked(uint uiIndex) const
+bool wxCheckListBox::IsChecked(size_t uiIndex) const

 {
   return GetItem(uiIndex)->IsChecked();
 }
 
 {
   return GetItem(uiIndex)->IsChecked();
 }
 

-void wxCheckListBox::Check(uint uiIndex, bool bCheck)
+void wxCheckListBox::Check(size_t uiIndex, bool bCheck)

 {
   GetItem(uiIndex)->Check(bCheck);
 }
 {
   GetItem(uiIndex)->Check(bCheck);
 }


@@ -296,8 +302,8 @@ void wxCheckListBox::OnLeftClick(wxMouseEvent& event)
   // clicking on the item selects it, clicking on the checkmark toggles
   if ( event.GetX() <= wxOwnerDrawn::GetDefaultMarginWidth() ) {
     // # better use LB_ITEMFROMPOINT perhaps?
   // clicking on the item selects it, clicking on the checkmark toggles
   if ( event.GetX() <= wxOwnerDrawn::GetDefaultMarginWidth() ) {
     // # better use LB_ITEMFROMPOINT perhaps?

-    uint nItem = ((uint)event.GetY()) / m_nItemHeight;
-    if ( nItem < (uint)m_noItems )
+    size_t nItem = ((size_t)event.GetY()) / m_nItemHeight;
+    if ( nItem < (size_t)m_noItems )

       GetItem(nItem)->Toggle();
     //else: it's not an error, just click outside of client zone
   }
       GetItem(nItem)->Toggle();
     //else: it's not an error, just click outside of client zone
   }