simplify Refresh() and Update()

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

diff --git a/src/msw/combo.cpp b/src/msw/combo.cpp
index 6ffbb31861b19771f222bdfec4522969bcc0696d..a37257ae652f5ee4de9498cd2035c9bfb01aace4 100644 (file)
--- a/src/msw/combo.cpp
+++ b/src/msw/combo.cpp
@@ -38,7 +38,10 @@
 #include "wx/combo.h"
 
 #include "wx/msw/registry.h"
 #include "wx/combo.h"
 
 #include "wx/msw/registry.h"

+#if wxUSE_UXTHEME

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

+#endif
+#include "wx/msw/dc.h"

 
 // Change to #if 1 to include tmschema.h for easier testing of theme
 // parameters.
 
 // Change to #if 1 to include tmschema.h for easier testing of theme
 // parameters.


@@ -159,10 +162,13 @@ bool wxComboCtrl::Create(wxWindow *parent,
     // Set border
     long border = style & wxBORDER_MASK;
 
     // Set border
     long border = style & wxBORDER_MASK;
 

+#if wxUSE_UXTHEME

     wxUxThemeEngine* theme = wxUxThemeEngine::GetIfActive();
     wxUxThemeEngine* theme = wxUxThemeEngine::GetIfActive();

+#endif

 
     if ( !border )
     {
 
     if ( !border )
     {

+#if wxUSE_UXTHEME

         if ( theme )
         {
             // For XP, have 1-width custom border, for older version use sunken
         if ( theme )
         {
             // For XP, have 1-width custom border, for older version use sunken


@@ -170,6 +176,7 @@ bool wxComboCtrl::Create(wxWindow *parent,
             m_widthCustomBorder = 1;
         }
         else
             m_widthCustomBorder = 1;
         }
         else

+#endif

             border = wxBORDER_SUNKEN;
 
         style = (style & ~(wxBORDER_MASK)) | border;
             border = wxBORDER_SUNKEN;
 
         style = (style & ~(wxBORDER_MASK)) | border;


@@ -186,11 +193,13 @@ bool wxComboCtrl::Create(wxWindow *parent,
                            name) )
         return false;
 
                            name) )
         return false;
 

+#if wxUSE_UXTHEME

     if ( theme )
     {
         if ( ::wxGetWinVersion() >= wxWinVersion_Vista )
             m_iFlags |= wxCC_BUTTON_STAYS_DOWN |wxCC_BUTTON_COVERS_BORDER;
     }
     if ( theme )
     {
         if ( ::wxGetWinVersion() >= wxWinVersion_Vista )
             m_iFlags |= wxCC_BUTTON_STAYS_DOWN |wxCC_BUTTON_COVERS_BORDER;
     }

+#endif

 
     if ( style & wxCC_STD_BUTTON )
         m_iFlags |= wxCC_POPUP_ON_MOUSE_UP;
 
     if ( style & wxCC_STD_BUTTON )
         m_iFlags |= wxCC_POPUP_ON_MOUSE_UP;


@@ -216,29 +225,38 @@ wxComboCtrl::~wxComboCtrl()
 
 void wxComboCtrl::OnThemeChange()
 {
 
 void wxComboCtrl::OnThemeChange()
 {

-    wxUxThemeEngine* theme = wxUxThemeEngine::GetIfActive();
+    // there doesn't seem to be any way to get the text colour using themes
+    // API: TMT_TEXTCOLOR doesn't work neither for EDIT nor COMBOBOX
+    SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
+
+#if wxUSE_UXTHEME
+    wxUxThemeEngine * const theme = wxUxThemeEngine::GetIfActive();

     if ( theme )
     {
     if ( theme )
     {

+        // NB: use EDIT, not COMBOBOX (the latter works in XP but not Vista)

         wxUxThemeHandle hTheme(this, L"EDIT");
         wxUxThemeHandle hTheme(this, L"EDIT");

-

         COLORREF col;
         COLORREF col;

-        HRESULT hr = theme->GetThemeColor(hTheme,EP_EDITTEXT,ETS_NORMAL,TMT_FILLCOLOR,&col);
-        if ( FAILED(hr) )
-            wxLogApiError(_T("GetThemeColor(EDIT, EP_EDITTEXT, ETS_NORMAL, TMT_FILLCOLOR)"), hr);
-        else
+        HRESULT hr = theme->GetThemeColor
+                            (
+                                hTheme,
+                                EP_EDITTEXT,
+                                ETS_NORMAL,
+                                TMT_FILLCOLOR,
+                                &col
+                            );
+        if ( SUCCEEDED(hr) )
+        {

             SetBackgroundColour(wxRGBToColour(col));
 
             SetBackgroundColour(wxRGBToColour(col));
 

-        hr = theme->GetThemeColor(hTheme,EP_EDITTEXT,ETS_NORMAL,TMT_TEXTCOLOR,&col);
-        if ( FAILED(hr) )
-            wxLogApiError(_T("GetThemeColor(EDIT, EP_EDITTEXT, ETS_NORMAL, TMT_TEXTCOLOR)"), hr);
-        else
-            SetForegroundColour(wxRGBToColour(col));
-    }
-    else
-    {
-        SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
-        SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
+            // skip the call below
+            return;
+        }
+
+        wxLogApiError(_T("GetThemeColor(EDIT, ETS_NORMAL, TMT_FILLCOLOR)"), hr);

     }
     }

+#endif
+
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));

 }
 
 void wxComboCtrl::OnResize()
 }
 
 void wxComboCtrl::OnResize()


@@ -249,12 +267,14 @@ void wxComboCtrl::OnResize()
     int textCtrlXAdjust;
     int textCtrlYAdjust;
 
     int textCtrlXAdjust;
     int textCtrlYAdjust;
 

+#if wxUSE_UXTHEME

     if ( wxUxThemeEngine::GetIfActive() )
     {
         textCtrlXAdjust = TEXTCTRLXADJUST_XP;
         textCtrlYAdjust = TEXTCTRLYADJUST_XP;
     }
     else
     if ( wxUxThemeEngine::GetIfActive() )
     {
         textCtrlXAdjust = TEXTCTRLXADJUST_XP;
         textCtrlYAdjust = TEXTCTRLYADJUST_XP;
     }
     else

+#endif

     {
         textCtrlXAdjust = TEXTCTRLXADJUST_CLASSIC;
         textCtrlYAdjust = TEXTCTRLYADJUST_CLASSIC;
     {
         textCtrlXAdjust = TEXTCTRLXADJUST_CLASSIC;
         textCtrlYAdjust = TEXTCTRLYADJUST_CLASSIC;


@@ -289,7 +309,7 @@ static void wxMSWDrawFocusRect( wxDC& dc, const wxRect& rect )
     //   it employs wxCAP_BUTT hack to have line of width 1.
     dc.SetLogicalFunction(wxINVERT);
 
     //   it employs wxCAP_BUTT hack to have line of width 1.
     dc.SetLogicalFunction(wxINVERT);
 

-    wxPen pen(*wxBLACK,1,wxDOT);
+    wxPen pen(*wxBLACK, 1, wxPENSTYLE_DOT);

     pen.SetCap(wxCAP_BUTT);
     dc.SetPen(pen);
     dc.SetBrush(*wxTRANSPARENT_BRUSH);
     pen.SetCap(wxCAP_BUTT);
     dc.SetPen(pen);
     dc.SetBrush(*wxTRANSPARENT_BRUSH);


@@ -313,7 +333,9 @@ static void wxMSWDrawFocusRect( wxDC& dc, const wxRect& rect )
 void
 wxComboCtrl::PrepareBackground( wxDC& dc, const wxRect& rect, int flags ) const
 {
 void
 wxComboCtrl::PrepareBackground( wxDC& dc, const wxRect& rect, int flags ) const
 {

+#if wxUSE_UXTHEME

     wxUxThemeHandle hTheme(this, L"COMBOBOX");
     wxUxThemeHandle hTheme(this, L"COMBOBOX");

+#endif

 
     wxSize sz = GetClientSize();
     bool isEnabled;
 
     wxSize sz = GetClientSize();
     bool isEnabled;


@@ -329,6 +351,7 @@ wxComboCtrl::PrepareBackground( wxDC& dc, const wxRect& rect, int flags ) const
         isEnabled = IsEnabled();
         doDrawFocusRect = ShouldDrawFocus();
 
         isEnabled = IsEnabled();
         doDrawFocusRect = ShouldDrawFocus();
 

+#if wxUSE_UXTHEME

         // Windows-style: for smaller size control (and for disabled background) use less spacing
         if ( hTheme )
         {
         // Windows-style: for smaller size control (and for disabled background) use less spacing
         if ( hTheme )
         {


@@ -337,6 +360,7 @@ wxComboCtrl::PrepareBackground( wxDC& dc, const wxRect& rect, int flags ) const
             focusSpacingY = sz.y > (GetCharHeight()+2) && isEnabled ? 2 : 1;
         }
         else
             focusSpacingY = sz.y > (GetCharHeight()+2) && isEnabled ? 2 : 1;
         }
         else

+#endif

         {
             // Classic Theme
             if ( isEnabled )
         {
             // Classic Theme
             if ( isEnabled )


@@ -374,7 +398,7 @@ wxComboCtrl::PrepareBackground( wxDC& dc, const wxRect& rect, int flags ) const
     selRect.x += wcp + focusSpacingX;
     selRect.width -= wcp + (focusSpacingX*2);
 
     selRect.x += wcp + focusSpacingX;
     selRect.width -= wcp + (focusSpacingX*2);
 

-    //wxUxThemeEngine* theme = (wxUxThemeEngine*) NULL;
+    //wxUxThemeEngine* theme = NULL;

     //if ( hTheme )
     //    theme = wxUxThemeEngine::GetIfActive();
 
     //if ( hTheme )
     //    theme = wxUxThemeEngine::GetIfActive();
 


@@ -451,10 +475,13 @@ void wxComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
 
     const wxRect& rectButton = m_btnArea;
     wxRect rectTextField = m_tcArea;
 
     const wxRect& rectButton = m_btnArea;
     wxRect rectTextField = m_tcArea;

-    const bool isEnabled = IsEnabled();

     wxColour bgCol = GetBackgroundColour();
 
     wxColour bgCol = GetBackgroundColour();
 

-    HDC hDc = GetHdcOf(dc);
+#if wxUSE_UXTHEME
+    const bool isEnabled = IsEnabled();
+
+    wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl();
+    HDC hDc = GetHdcOf(*impl);

     HWND hWnd = GetHwndOf(this);
 
     wxUxThemeEngine* theme = NULL;
     HWND hWnd = GetHwndOf(this);
 
     wxUxThemeEngine* theme = NULL;


@@ -462,6 +489,7 @@ void wxComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
 
     if ( hTheme )
         theme = wxUxThemeEngine::GetIfActive();
 
     if ( hTheme )
         theme = wxUxThemeEngine::GetIfActive();

+#endif // wxUSE_UXTHEME

 
     wxRect borderRect(0,0,sz.x,sz.y);
 
 
     wxRect borderRect(0,0,sz.x,sz.y);
 


@@ -473,6 +501,7 @@ void wxComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
 
     int drawButFlags = 0;
 
 
     int drawButFlags = 0;
 

+#if wxUSE_UXTHEME

     if ( hTheme )
     {
         const bool useVistaComboBox = ::wxGetWinVersion() >= wxWinVersion_Vista;
     if ( hTheme )
     {
         const bool useVistaComboBox = ::wxGetWinVersion() >= wxWinVersion_Vista;


@@ -617,6 +646,7 @@ void wxComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
         }
     }
     else
         }
     }
     else

+#endif

     {
         // Windows 2000 and earlier
         drawButFlags = Button_PaintBackground;
     {
         // Windows 2000 and earlier
         drawButFlags = Button_PaintBackground;


@@ -733,7 +763,7 @@ static wxUint32 GetUserPreferencesMask()
 #endif
 
 #if wxUSE_COMBOCTRL_POPUP_ANIMATION
 #endif
 
 #if wxUSE_COMBOCTRL_POPUP_ANIMATION

-void wxComboCtrl::OnTimerEvent( wxTimerEvent& WXUNUSED(event) )
+void wxComboCtrl::DoTimerEvent()

 {
     bool stopTimer = false;
 
 {
     bool stopTimer = false;
 


@@ -801,7 +831,7 @@ bool wxComboCtrl::AnimateShow( const wxRect& rect, int flags )
         m_animTimer.SetOwner( this, wxID_ANY );
         m_animTimer.Start( COMBOBOX_ANIMATION_RESOLUTION, wxTIMER_CONTINUOUS );
 
         m_animTimer.SetOwner( this, wxID_ANY );
         m_animTimer.Start( COMBOBOX_ANIMATION_RESOLUTION, wxTIMER_CONTINUOUS );
 

-        OnTimerEvent(*((wxTimerEvent*)NULL));  // Event is never used, so we can give NULL
+        DoTimerEvent();

 
         return false;
     }
 
         return false;
     }


@@ -812,8 +842,10 @@ bool wxComboCtrl::AnimateShow( const wxRect& rect, int flags )
 
 wxCoord wxComboCtrl::GetNativeTextIndent() const
 {
 
 wxCoord wxComboCtrl::GetNativeTextIndent() const
 {

+#if wxUSE_UXTHEME

     if ( wxUxThemeEngine::GetIfActive() )
         return NATIVE_TEXT_INDENT_XP;
     if ( wxUxThemeEngine::GetIfActive() )
         return NATIVE_TEXT_INDENT_XP;

+#endif

     return NATIVE_TEXT_INDENT_CLASSIC;
 }
 
     return NATIVE_TEXT_INDENT_CLASSIC;
 }
 


@@ -840,8 +872,10 @@ bool wxComboCtrl::IsKeyPopupToggle(const wxKeyEvent& event) const
             // popup but Alt-arrow does
             if ( event.AltDown() ||
                     ( !isPopupShown &&
             // popup but Alt-arrow does
             if ( event.AltDown() ||
                     ( !isPopupShown &&

-                      HasFlag(wxCB_READONLY) &&
-                      !wxUxThemeEngine::GetIfActive()
+                      HasFlag(wxCB_READONLY)
+#if wxUSE_UXTHEME
+                      && !wxUxThemeEngine::GetIfActive()
+#endif

                     ) )
             {
                 return true;
                     ) )
             {
                 return true;