X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e6e839336c9f9a869d40b3c7ed212e6f6641d04f..7e38638c3499c679f25ec0029931aad8e62e70d3:/src/msw/checklst.cpp

diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp
index 0a9a715488..fd480f4f70 100644
--- a/src/msw/checklst.cpp
+++ b/src/msw/checklst.cpp
@@ -29,6 +29,7 @@
 #include "wx/checklst.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapcctl.h"
     #include "wx/object.h"
     #include "wx/colour.h"
     #include "wx/font.h"
@@ -36,18 +37,17 @@
     #include "wx/window.h"
     #include "wx/listbox.h"
     #include "wx/dcmemory.h"
-
     #include "wx/settings.h"
-
     #include "wx/log.h"
 #endif
 
 #include "wx/ownerdrw.h"
 
-#include "wx/msw/wrapwin.h"
 #include <windowsx.h>
 
+#include "wx/renderer.h"
 #include "wx/msw/private.h"
+#include "wx/msw/dc.h"
 
 // ----------------------------------------------------------------------------
 // private functions
@@ -125,7 +125,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
 
 class wxCheckListBoxItem : public wxOwnerDrawn
 {
-friend class WXDLLEXPORT wxCheckListBox;
+friend class WXDLLIMPEXP_FWD_CORE wxCheckListBox;
 public:
     // ctor
     wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex);
@@ -144,7 +144,7 @@ public:
 private:
     bool            m_bChecked;
     wxCheckListBox *m_pParent;
-    size_t    m_nIndex;
+    size_t          m_nIndex;
 
     DECLARE_NO_COPY_CLASS(wxCheckListBoxItem)
 };
@@ -160,10 +160,8 @@ wxCheckListBoxItem::wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex)
     // done in OnMeasure while they are used only in OnDraw and we
     // know that there will always be OnMeasure before OnDraw
 
-    // fix appearance for check list boxes: they don't look quite the same as
-    // menu icons
-    SetMarginWidth(::GetSystemMetrics(SM_CXMENUCHECK) -
-                      2*wxSystemSettings::GetMetric(wxSYS_EDGE_X) + 1);
+    SetMarginWidth(::GetSystemMetrics(SM_CXMENUCHECK) - 2);
+
     SetBackgroundColour(pParent->GetBackgroundColour());
 }
 
@@ -177,62 +175,45 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
     if ( !wxOwnerDrawn::OnDrawItem(dc, rc, act, stat) )
         return false;
 
-
+    wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl();
     // now draw the check mark part
-    size_t nCheckWidth  = GetDefaultMarginWidth(),
-           nCheckHeight = m_pParent->GetItemHeight();
-
-    int x = rc.GetX(),
-        y = rc.GetY();
+    HDC hdc = GetHdcOf(*impl);
 
-    HDC hdc = (HDC)dc.GetHDC();
+    int nBmpWidth  = ::GetSystemMetrics(SM_CXMENUCHECK),
+        nBmpHeight = ::GetSystemMetrics(SM_CYMENUCHECK);
 
-    // create pens, brushes &c
-    COLORREF colBg = ::GetSysColor(COLOR_WINDOW);
-    AutoHPEN hpenBack(colBg),
-             hpenGray(RGB(0xc0, 0xc0, 0xc0));
 
-    SelectInHDC selPen(hdc, (HGDIOBJ)hpenBack);
-    AutoHBRUSH hbrBack(colBg);
-    SelectInHDC selBrush(hdc, hbrBack);
+    // first create bitmap in a memory DC
+    MemoryHDC hdcMem(hdc);
+    CompatibleBitmap hBmpCheck(hdc, nBmpWidth, nBmpHeight);
 
-    // erase the background: it could have been filled with the selected colour
-    Rectangle(hdc, x, y, x + nCheckWidth + 1, rc.GetBottom() + 1);
+    // then draw a check mark into it
+    {
+        SelectInHDC selBmp(hdcMem, hBmpCheck);
 
-    // shift check mark 1 pixel to the right, looks better like this
-    x++;
+        int flags = wxCONTROL_FLAT;
+        if ( IsChecked() )
+            flags |= wxCONTROL_CHECKED;
 
-    if ( IsChecked() )
-    {
-        // first create a monochrome bitmap in a memory DC
-        MemoryHDC hdcMem(hdc);
-        MonoBitmap hbmpCheck(nCheckWidth, nCheckHeight);
-        SelectInHDC selBmp(hdcMem, hbmpCheck);
-
-        // then draw a check mark into it
-        RECT rect = { 0, 0, nCheckWidth, nCheckHeight };
-        ::DrawFrameControl(hdcMem, &rect,
-#ifdef __WXWINCE__
-                           DFC_BUTTON, DFCS_BUTTONCHECK
-#else
-                           DFC_MENU, DFCS_MENUCHECK
-#endif
-                           );
+        wxDCTemp dcMem(hdcMem);
+        wxRendererNative::Get().DrawCheckBox(
+                m_pParent, dcMem, wxRect(0, 0, nBmpWidth, nBmpHeight), flags);
+    } // select hBmpCheck out of hdcMem
 
-        // finally copy it to screen DC
-        ::BitBlt(hdc, x, y, nCheckWidth, nCheckHeight, hdcMem, 0, 0, SRCCOPY);
-    }
+    // shift check mark 2 pixel to the right and bottom, looks better like this
+    int x = rc.GetX() + 2,
+        y = rc.GetY() + 2;
 
-    // now we draw the smaller rectangle
-    y++;
-    nCheckWidth  -= 2;
-    nCheckHeight -= 2;
+    // finally draw bitmap to screen: uses image list functions to blend
+    // the bitmap with the background colour (better for the selected items)
+    HIMAGELIST himl = ImageList_Create(nBmpWidth, nBmpHeight,
+                                       ILC_COLOR32 | ILC_MASK, 1, 1);
+    ImageList_Add(himl, hBmpCheck, NULL);
 
-    // draw hollow gray rectangle
-    (void)::SelectObject(hdc, (HGDIOBJ)hpenGray);
+    UINT fStyle = stat & wxOwnerDrawn::wxODSelected ? ILD_SELECTED : ILD_NORMAL;
+    ImageList_Draw(himl, 0, hdc, x, y, fStyle);
 
-    SelectInHDC selBrush2(hdc, ::GetStockObject(NULL_BRUSH));
-    Rectangle(hdc, x, y, x + nCheckWidth, y + nCheckHeight);
+    ImageList_Destroy(himl);
 
     return true;
 }
@@ -272,6 +253,7 @@ void wxCheckListBoxItem::SendEvent()
     wxCommandEvent event(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, m_pParent->GetId());
     event.SetInt(m_nIndex);
     event.SetEventObject(m_pParent);
+    event.SetString(m_pParent->GetString(m_nIndex));
     m_pParent->ProcessCommand(event);
 }
 
@@ -377,12 +359,13 @@ bool wxCheckListBox::MSWOnMeasure(WXMEASUREITEMSTRUCT *item)
   if ( wxListBox::MSWOnMeasure(item) ) {
     MEASUREITEMSTRUCT *pStruct = (MEASUREITEMSTRUCT *)item;
 
+    // add place for the check mark
+    pStruct->itemWidth  += wxOwnerDrawn::GetDefaultMarginWidth();
+    pStruct->itemHeight += 1;
+
     // save item height
     m_nItemHeight = pStruct->itemHeight;
 
-    // add place for the check mark
-    pStruct->itemWidth += wxOwnerDrawn::GetDefaultMarginWidth();
-
     return true;
   }
 
@@ -502,9 +485,19 @@ void wxCheckListBox::OnLeftClick(wxMouseEvent& event)
 
         if ( nItem != wxNOT_FOUND )
         {
-            wxCheckListBoxItem *item = GetItem(nItem);
-            item->Toggle();
-            item->SendEvent();
+            // people expect to get "kill focus" event for the currently
+            // focused control before getting events from the other controls
+            // and, equally importantly, they may prevent the focus change from
+            // taking place at all (e.g. because the old control contents is
+            // invalid and needs to be corrected) in which case we shouldn't
+            // generate this event at all
+            SetFocus();
+            if ( FindFocus() == this )
+            {
+                wxCheckListBoxItem *item = GetItem(nItem);
+                item->Toggle();
+                item->SendEvent();
+            }
         }
         //else: it's not an error, just click outside of client zone
     }