Rework the wxCusor ctor taking wx stock number to provide as many cursors as

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

diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp
index 2a63a4b0b5f2f3af1f8b5e54d8f3a7582734bf6e..4d7b3901270681ad410b32a9a686de61579a7988 100644 (file)
--- a/src/msw/renderer.cpp
+++ b/src/msw/renderer.cpp
@@ -207,10 +207,7 @@ wxRendererMSW::DrawComboBoxDropButton(wxWindow * WXUNUSED(win),
                                       int flags)
 {
     RECT r;
                                       int flags)
 {
     RECT r;

-    r.left = rect.GetLeft();
-    r.top = rect.GetTop();
-    r.bottom = rect.y + rect.height;
-    r.right = rect.x + rect.width;
+    wxCopyRectToRECT(rect, r);

 
     int style = DFCS_SCROLLCOMBOBOX;
     if ( flags & wxCONTROL_DISABLED )
 
     int style = DFCS_SCROLLCOMBOBOX;
     if ( flags & wxCONTROL_DISABLED )


@@ -235,6 +232,8 @@ wxRendererMSW::DrawCheckBox(wxWindow * WXUNUSED(win),
         style |= DFCS_CHECKED;
     if ( flags & wxCONTROL_DISABLED )
         style |= DFCS_INACTIVE;
         style |= DFCS_CHECKED;
     if ( flags & wxCONTROL_DISABLED )
         style |= DFCS_INACTIVE;

+    if ( flags & wxCONTROL_FLAT )
+        style |= DFCS_MONO;

     if ( flags & wxCONTROL_PRESSED )
         style |= DFCS_PUSHED;
     if ( flags & wxCONTROL_CURRENT )
     if ( flags & wxCONTROL_PRESSED )
         style |= DFCS_PUSHED;
     if ( flags & wxCONTROL_CURRENT )