Don't skip after writing tab or we could get another one in some circumstances

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

diff --git a/src/msw/checkbox.cpp b/src/msw/checkbox.cpp
index 1734a9b214b700100ea147354a0ebd4b0321f64a..07cc434de2ca2eb3eb2652ab7aec25ef4138ca1b 100644 (file)
--- a/src/msw/checkbox.cpp
+++ b/src/msw/checkbox.cpp
@@ -374,6 +374,12 @@ void wxCheckBox::MakeOwnerDrawn(bool ownerDrawn)
     }
 
     ::SetWindowLong(GetHwnd(), GWL_STYLE, style);
+
+    if ( !ownerDrawn )
+    {
+        // ensure that controls state is consistent with internal state
+        DoSet3StateValue(m_state);
+    }
 }
 
 void wxCheckBox::OnMouseEnterOrLeave(wxMouseEvent& event)
@@ -451,7 +457,8 @@ bool wxCheckBox::MSWOnDraw(WXDRAWITEMSTRUCT *item)
     // to it without breaking backwards compatibility
 
     // classic Win32 version -- this can be useful when we move this into
-#if 0
+    // wxRendererNative
+#if defined(__WXWINCE__) || !wxUSE_UXTHEME
     UINT state = DFCS_BUTTONCHECK;
     if ( !IsEnabled() )
         state |= DFCS_INACTIVE;