adde wxSTC bakefile

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

diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp
index f74f6dd59c1bbc83f7cf2637049a6170fbaa1c96..c6b37213541e4a5f9f9b1788347ace58ec30983b 100644 (file)
--- a/src/msw/checklst.cpp
+++ b/src/msw/checklst.cpp
@@ -6,7 +6,7 @@
 // Created:     16.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     16.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -154,7 +154,7 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
       HBITMAP hbmpOld = (HBITMAP)SelectObject(hdcMem, hbmpCheck);
 
       // then draw a check mark into it
       HBITMAP hbmpOld = (HBITMAP)SelectObject(hdcMem, hbmpCheck);
 
       // then draw a check mark into it

-#if defined(__WIN32__) && !defined(__SC__)
+

       RECT rect;
       rect.left   = 0;
       rect.top    = 0;
       RECT rect;
       rect.left   = 0;
       rect.top    = 0;


@@ -162,22 +162,6 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
       rect.bottom = nCheckHeight;
 
       DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK);
       rect.bottom = nCheckHeight;
 
       DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK);

-#else
-      // In WIN16, draw a cross
-      HPEN blackPen = CreatePen(PS_SOLID, 1, RGB(0, 0, 0));
-      HPEN whiteBrush = (HPEN)GetStockObject(WHITE_BRUSH);
-      HPEN hPenOld = (HPEN)::SelectObject(hdcMem, blackPen);
-      HPEN hBrushOld = (HPEN)::SelectObject(hdcMem, whiteBrush);
-      ::SetROP2(hdcMem, R2_COPYPEN);
-      Rectangle(hdcMem, 0, 0, nCheckWidth, nCheckHeight);
-      MoveTo(hdcMem, 0, 0);
-      LineTo(hdcMem, nCheckWidth, nCheckHeight);
-      MoveTo(hdcMem, nCheckWidth, 0);
-      LineTo(hdcMem, 0, nCheckHeight);
-      ::SelectObject(hdcMem, hPenOld);
-      ::SelectObject(hdcMem, hBrushOld);
-      ::DeleteObject(blackPen);
-#endif

 
       // finally copy it to screen DC and clean up
       BitBlt(hdc, x, y, nCheckWidth - 1, nCheckHeight,
 
       // finally copy it to screen DC and clean up
       BitBlt(hdc, x, y, nCheckWidth - 1, nCheckHeight,


@@ -395,7 +379,7 @@ void wxCheckListBox::OnKeyDown(wxKeyEvent& event)
         Clear
     } oper;
 
         Clear
     } oper;
 

-    switch ( event.KeyCode() )
+    switch ( event.GetKeyCode() )

     {
         case WXK_SPACE:
             oper = Toggle;
     {
         case WXK_SPACE:
             oper = Toggle;


@@ -418,15 +402,19 @@ void wxCheckListBox::OnKeyDown(wxKeyEvent& event)
     if ( oper != None )
     {
         wxArrayInt selections;
     if ( oper != None )
     {
         wxArrayInt selections;

-        int count;
+        int count = 0;

         if ( HasMultipleSelection() )
         {
             count = GetSelections(selections);
         }
         else
         {
         if ( HasMultipleSelection() )
         {
             count = GetSelections(selections);
         }
         else
         {

-            count = 1;
-            selections.Add(GetSelection());
+            int sel = GetSelection();
+            if (sel != -1)
+            {
+                count = 1;
+                selections.Add(sel);
+            }

         }
 
         for ( int i = 0; i < count; i++ )
         }
 
         for ( int i = 0; i < count; i++ )