Don't overwrite status message when restoring it if it changed.

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

diff --git a/src/msw/checkbox.cpp b/src/msw/checkbox.cpp
index cd9dd38df8b3385a730953902ac946c0d6b9419e..38a41092c9f2f4a7a7250505765b2b494967dea1 100644 (file)
--- a/src/msw/checkbox.cpp
+++ b/src/msw/checkbox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msw/checkbox.cpp
+// Name:        src/msw/checkbox.cpp

 // Purpose:     wxCheckBox
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxCheckBox
 // Author:      Julian Smart
 // Modified by:


@@ -26,40 +26,24 @@
 
 #if wxUSE_CHECKBOX
 
 
 #if wxUSE_CHECKBOX
 

+#include "wx/checkbox.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/checkbox.h"

     #include "wx/brush.h"
     #include "wx/brush.h"

+    #include "wx/dcclient.h"

     #include "wx/dcscreen.h"
     #include "wx/settings.h"
 #endif
 
     #include "wx/dcscreen.h"
     #include "wx/settings.h"
 #endif
 

+#include "wx/msw/dc.h"          // for wxDCTemp
+#include "wx/renderer.h"

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

-#include "wx/msw/private.h"
+#include "wx/msw/private/button.h"

 
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 

-#ifndef BST_UNCHECKED
-    #define BST_UNCHECKED 0x0000
-#endif
-
-#ifndef BST_CHECKED
-    #define BST_CHECKED 0x0001
-#endif
-
-#ifndef BST_INDETERMINATE
-    #define BST_INDETERMINATE 0x0002
-#endif
-
-#ifndef DFCS_HOT
-    #define DFCS_HOT 0x1000
-#endif
-
-#ifndef DT_HIDEPREFIX
-    #define DT_HIDEPREFIX 0x00100000
-#endif
-

 #ifndef BP_CHECKBOX
     #define BP_CHECKBOX 3
 #endif
 #ifndef BP_CHECKBOX
     #define BP_CHECKBOX 3
 #endif


@@ -190,6 +174,8 @@ bool wxCheckBox::Create(wxWindow *parent,
         msStyle |= BS_LEFTTEXT | BS_RIGHT;
     }
 
         msStyle |= BS_LEFTTEXT | BS_RIGHT;
     }
 

+    msStyle |= wxMSWButton::GetMultilineStyle(label);
+

     return MSWCreateControl(wxT("BUTTON"), msStyle, pos, size, label, 0);
 }
 
     return MSWCreateControl(wxT("BUTTON"), msStyle, pos, size, label, 0);
 }
 


@@ -212,9 +198,11 @@ wxSize wxCheckBox::DoGetBestSize() const
     wxString str = wxGetWindowText(GetHWND());
 
     int wCheckbox, hCheckbox;
     wxString str = wxGetWindowText(GetHWND());
 
     int wCheckbox, hCheckbox;

-    if ( !str.IsEmpty() )
+    if ( !str.empty() )

     {
     {

-        GetTextExtent(str, &wCheckbox, &hCheckbox);
+        wxClientDC dc(const_cast<wxCheckBox *>(this));
+        dc.SetFont(GetFont());
+        dc.GetMultiLineTextExtent(GetLabelText(str), &wCheckbox, &hCheckbox);

         wCheckbox += s_checkSize + GetCharWidth();
 
         if ( hCheckbox < s_checkSize )
         wCheckbox += s_checkSize + GetCharWidth();
 
         if ( hCheckbox < s_checkSize )


@@ -238,6 +226,13 @@ wxSize wxCheckBox::DoGetBestSize() const
 // wxCheckBox operations
 // ----------------------------------------------------------------------------
 
 // wxCheckBox operations
 // ----------------------------------------------------------------------------
 

+void wxCheckBox::SetLabel(const wxString& label)
+{
+    wxMSWButton::UpdateMultilineStyle(GetHwnd(), label);
+
+    wxCheckBoxBase::SetLabel(label);
+}
+

 void wxCheckBox::SetValue(bool val)
 {
     Set3StateValue(val ? wxCHK_CHECKED : wxCHK_UNCHECKED);
 void wxCheckBox::SetValue(bool val)
 {
     Set3StateValue(val ? wxCHK_CHECKED : wxCHK_UNCHECKED);


@@ -448,28 +443,24 @@ bool wxCheckBox::MSWOnDraw(WXDRAWITEMSTRUCT *item)
     const bool isFocused = m_isPressed || FindFocus() == this;
 
 
     const bool isFocused = m_isPressed || FindFocus() == this;
 
 

-    // draw the checkbox itself: note that this should really, really be in
-    // wxRendererNative but unfortunately we can't add a new virtual function
-    // to it without breaking backwards compatibility
+    // draw the checkbox itself
+    wxDCTemp dc(hdc);

 
 

-    // classic Win32 version -- this can be useful when we move this into
-    // wxRendererNative
-#if defined(__WXWINCE__) || !wxUSE_UXTHEME
-    UINT state = DFCS_BUTTONCHECK;
+    int flags = 0;

     if ( !IsEnabled() )
     if ( !IsEnabled() )

-        state |= DFCS_INACTIVE;
+        flags |= wxCONTROL_DISABLED;

     switch ( Get3StateValue() )
     {
         case wxCHK_CHECKED:
     switch ( Get3StateValue() )
     {
         case wxCHK_CHECKED:

-            state |= DFCS_CHECKED;
+            flags |= wxCONTROL_CHECKED;

             break;
 
         case wxCHK_UNDETERMINED:
             break;
 
         case wxCHK_UNDETERMINED:

-            state |= DFCS_PUSHED;
+            flags |= wxCONTROL_PRESSED;

             break;
 
         default:
             break;
 
         default:

-            wxFAIL_MSG( _T("unexpected Get3StateValue() return value") );
+            wxFAIL_MSG( wxT("unexpected Get3StateValue() return value") );

             // fall through
 
         case wxCHK_UNCHECKED:
             // fall through
 
         case wxCHK_UNCHECKED:


@@ -478,62 +469,10 @@ bool wxCheckBox::MSWOnDraw(WXDRAWITEMSTRUCT *item)
     }
 
     if ( wxFindWindowAtPoint(wxGetMousePosition()) == this )
     }
 
     if ( wxFindWindowAtPoint(wxGetMousePosition()) == this )

-        state |= DFCS_HOT;
-
-    if ( !::DrawFrameControl(hdc, &rectCheck, DFC_BUTTON, state) )
-    {
-        wxLogLastError(_T("DrawFrameControl(DFC_BUTTON)"));
-    }
-#else // XP version
-    wxUxThemeEngine *themeEngine = wxUxThemeEngine::GetIfActive();
-    if ( !themeEngine )
-        return false;
+        flags |= wxCONTROL_CURRENT;

 
 

-    wxUxThemeHandle theme(this, L"BUTTON");
-    if ( !theme )
-        return false;
-
-    int state;
-    switch ( Get3StateValue() )
-    {
-        case wxCHK_CHECKED:
-            state = CBS_CHECKEDNORMAL;
-            break;
-
-        case wxCHK_UNDETERMINED:
-            state = CBS_MIXEDNORMAL;
-            break;
-
-        default:
-            wxFAIL_MSG( _T("unexpected Get3StateValue() return value") );
-            // fall through
-
-        case wxCHK_UNCHECKED:
-            state = CBS_UNCHECKEDNORMAL;
-            break;
-    }
-
-    if ( !IsEnabled() )
-        state += CBS_DISABLED_OFFSET;
-    else if ( m_isPressed )
-        state += CBS_PRESSED_OFFSET;
-    else if ( m_isHot )
-        state += CBS_HOT_OFFSET;
-
-    HRESULT hr = themeEngine->DrawThemeBackground
-                              (
-                                theme,
-                                hdc,
-                                BP_CHECKBOX,
-                                state,
-                                &rectCheck,
-                                NULL
-                              );
-    if ( FAILED(hr) )
-    {
-        wxLogApiError(_T("DrawThemeBackground(BP_CHECKBOX)"), hr);
-    }
-#endif // 0/1
+    wxRendererNative::Get().
+        DrawCheckBox(this, dc, wxRectFromRECT(rectCheck), flags);

 
     // draw the text
     const wxString& label = GetLabel();
 
     // draw the text
     const wxString& label = GetLabel();


@@ -553,10 +492,10 @@ bool wxCheckBox::MSWOnDraw(WXDRAWITEMSTRUCT *item)
     // around it
     if ( isFocused )
     {
     // around it
     if ( isFocused )
     {

-        if ( !::DrawText(hdc, label, label.length(), &rectLabel,
+        if ( !::DrawText(hdc, label.wx_str(), label.length(), &rectLabel,

                          fmt | DT_CALCRECT) )
         {
                          fmt | DT_CALCRECT) )
         {

-            wxLogLastError(_T("DrawText(DT_CALCRECT)"));
+            wxLogLastError(wxT("DrawText(DT_CALCRECT)"));

         }
     }
 
         }
     }
 


@@ -565,9 +504,9 @@ bool wxCheckBox::MSWOnDraw(WXDRAWITEMSTRUCT *item)
         ::SetTextColor(hdc, ::GetSysColor(COLOR_GRAYTEXT));
     }
 
         ::SetTextColor(hdc, ::GetSysColor(COLOR_GRAYTEXT));
     }
 

-    if ( !::DrawText(hdc, label, label.length(), &rectLabel, fmt) )
+    if ( !::DrawText(hdc, label.wx_str(), label.length(), &rectLabel, fmt) )

     {
     {

-        wxLogLastError(_T("DrawText()"));
+        wxLogLastError(wxT("DrawText()"));

     }
 
     // finally draw the focus
     }
 
     // finally draw the focus


@@ -577,7 +516,7 @@ bool wxCheckBox::MSWOnDraw(WXDRAWITEMSTRUCT *item)
         rectLabel.right++;
         if ( !::DrawFocusRect(hdc, &rectLabel) )
         {
         rectLabel.right++;
         if ( !::DrawFocusRect(hdc, &rectLabel) )
         {

-            wxLogLastError(_T("DrawFocusRect()"));
+            wxLogLastError(wxT("DrawFocusRect()"));

         }
     }
 
         }
     }