Added ability to switch off more components of the size page UI

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

diff --git a/src/msw/combo.cpp b/src/msw/combo.cpp
index 996728d4c4f0d4099363d5a8de25c7675e008514..2ef7d8925a4df77ecac03c0d629f194a933c0ca4 100644 (file)
--- a/src/msw/combo.cpp
+++ b/src/msw/combo.cpp
@@ -117,9 +117,6 @@
 #define NATIVE_TEXT_INDENT_XP       4
 #define NATIVE_TEXT_INDENT_CLASSIC  2
 
 #define NATIVE_TEXT_INDENT_XP       4
 #define NATIVE_TEXT_INDENT_CLASSIC  2
 

-#define TEXTCTRLYADJUST_XP          3
-#define TEXTCTRLYADJUST_CLASSIC     3
-

 #define COMBOBOX_ANIMATION_RESOLUTION   10
 
 #define COMBOBOX_ANIMATION_DURATION     200  // In milliseconds
 #define COMBOBOX_ANIMATION_RESOLUTION   10
 
 #define COMBOBOX_ANIMATION_DURATION     200  // In milliseconds


@@ -187,7 +184,7 @@ bool wxComboCtrl::Create(wxWindow *parent,
                            pos,
                            size,
                            style | wxFULL_REPAINT_ON_RESIZE,
                            pos,
                            size,
                            style | wxFULL_REPAINT_ON_RESIZE,

-                           wxDefaultValidator,
+                           validator,

                            name) )
         return false;
 
                            name) )
         return false;
 


@@ -202,15 +199,18 @@ bool wxComboCtrl::Create(wxWindow *parent,
     if ( style & wxCC_STD_BUTTON )
         m_iFlags |= wxCC_POPUP_ON_MOUSE_UP;
 
     if ( style & wxCC_STD_BUTTON )
         m_iFlags |= wxCC_POPUP_ON_MOUSE_UP;
 

+    // Prepare background for double-buffering or better background theme
+    // support, whichever is possible.
+    SetDoubleBuffered(true);
+    if ( !IsDoubleBuffered() )
+        SetBackgroundStyle( wxBG_STYLE_PAINT );
+

     // Create textctrl, if necessary
     // Create textctrl, if necessary

-    CreateTextCtrl( wxNO_BORDER, validator );
+    CreateTextCtrl( wxNO_BORDER );

 
     // Add keyboard input handlers for main control and textctrl
     InstallInputHandlers();
 
 
     // Add keyboard input handlers for main control and textctrl
     InstallInputHandlers();
 

-    // Prepare background for double-buffering
-    SetBackgroundStyle( wxBG_STYLE_CUSTOM );
-

     // SetInitialSize should be called last
     SetInitialSize(size);
 
     // SetInitialSize should be called last
     SetInitialSize(size);
 


@@ -226,26 +226,13 @@ void wxComboCtrl::OnResize()
     //
     // Recalculates button and textctrl areas
 
     //
     // Recalculates button and textctrl areas
 

-    int textCtrlYAdjust;
-
-#if wxUSE_UXTHEME
-    if ( wxUxThemeEngine::GetIfActive() )
-    {
-        textCtrlYAdjust = TEXTCTRLYADJUST_XP;
-    }
-    else
-#endif
-    {
-        textCtrlYAdjust = TEXTCTRLYADJUST_CLASSIC;
-    }
-

     // Technically Classic Windows style combo has more narrow button,
     // but the native renderer doesn't paint it well like that.
     int btnWidth = 17;
     CalculateAreas(btnWidth);
 
     // Position textctrl using standard routine
     // Technically Classic Windows style combo has more narrow button,
     // but the native renderer doesn't paint it well like that.
     int btnWidth = 17;
     CalculateAreas(btnWidth);
 
     // Position textctrl using standard routine

-    PositionTextCtrl(0, textCtrlYAdjust);
+    PositionTextCtrl();

 }
 
 // Draws non-XP GUI dotted line around the focus area
 }
 
 // Draws non-XP GUI dotted line around the focus area


@@ -307,7 +294,7 @@ wxComboCtrl::PrepareBackground( wxDC& dc, const wxRect& rect, int flags ) const
     if ( !(flags & wxCONTROL_ISSUBMENU) )
     {
         // Drawing control
     if ( !(flags & wxCONTROL_ISSUBMENU) )
     {
         // Drawing control

-        isEnabled = IsEnabled();
+        isEnabled = IsThisEnabled();

         doDrawFocusRect = ShouldDrawFocus();
 
 #if wxUSE_UXTHEME
         doDrawFocusRect = ShouldDrawFocus();
 
 #if wxUSE_UXTHEME


@@ -434,14 +421,22 @@ void wxComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
     // TODO: Convert drawing in this function to Windows API Code
 
     wxSize sz = GetClientSize();
     // TODO: Convert drawing in this function to Windows API Code
 
     wxSize sz = GetClientSize();

-    wxAutoBufferedPaintDC dc(this);
+    wxDC* dcPtr = wxAutoBufferedPaintDCFactory(this);
+    wxDC& dc = *dcPtr;

 
     const wxRect& rectButton = m_btnArea;
     wxRect rectTextField = m_tcArea;
 
     const wxRect& rectButton = m_btnArea;
     wxRect rectTextField = m_tcArea;

-    wxColour bgCol = GetBackgroundColour();
+
+    // FIXME: Either SetBackgroundColour or GetBackgroundColour
+    //        doesn't work under Vista, so here's a temporary
+    //        workaround.
+    //        In the theme-less rendering code below, this fixes incorrect
+    //        background on read-only comboboxes (they are gray, but should be
+    //        white).
+    wxColour bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);

 
 #if wxUSE_UXTHEME
 
 #if wxUSE_UXTHEME

-    const bool isEnabled = IsEnabled();
+    const bool isEnabled = IsThisEnabled();

 
     wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl();
     HDC hDc = GetHdcOf(*impl);
 
     wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl();
     HDC hDc = GetHdcOf(*impl);


@@ -514,11 +509,6 @@ void wxComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
 
         if ( useVistaComboBox )
         {
 
         if ( useVistaComboBox )
         {

-            // FIXME: Either SetBackgroundColour or GetBackgroundColour
-            //        doesn't work under Vista, so here's a temporary
-            //        workaround.
-            bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
-

             // Draw the entire control as a single button?
             if ( !isNonStdButton )
             {
             // Draw the entire control as a single button?
             if ( !isNonStdButton )
             {


@@ -640,6 +630,8 @@ void wxComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
         else
             wxComboPopup::DefaultPaintComboControl(this,dc,rectTextField);
     }
         else
             wxComboPopup::DefaultPaintComboControl(this,dc,rectTextField);
     }

+
+    delete dcPtr;

 }
 
 void wxComboCtrl::OnMouseEvent( wxMouseEvent& event )
 }
 
 void wxComboCtrl::OnMouseEvent( wxMouseEvent& event )


@@ -730,6 +722,7 @@ void wxComboCtrl::DoTimerEvent()
 {
     bool stopTimer = false;
 
 {
     bool stopTimer = false;
 

+    wxWindow* win = GetPopupWindow();

     wxWindow* popup = GetPopupControl()->GetControl();
 
     // Popup was hidden before it was fully shown?
     wxWindow* popup = GetPopupControl()->GetControl();
 
     // Popup was hidden before it was fully shown?


@@ -741,7 +734,6 @@ void wxComboCtrl::DoTimerEvent()
     {
         wxLongLong t = ::wxGetLocalTimeMillis();
         const wxRect& rect = m_animRect;
     {
         wxLongLong t = ::wxGetLocalTimeMillis();
         const wxRect& rect = m_animRect;

-        wxWindow* win = GetPopupWindow();

 
         int pos = (int) (t-m_animStart).GetLo();
         if ( pos < COMBOBOX_ANIMATION_DURATION )
 
         int pos = (int) (t-m_animStart).GetLo();
         if ( pos < COMBOBOX_ANIMATION_DURATION )


@@ -759,8 +751,10 @@ void wxComboCtrl::DoTimerEvent()
             }
             else
             {
             }
             else
             {

-                popup->Move( 0, -y );
+                // Note that apparently Move() should be called after
+                // SetSize() to reduce (or even eliminate) animation garbage

                 win->SetSize( rect.x, rect.y, rect.width, h );
                 win->SetSize( rect.x, rect.y, rect.width, h );

+                popup->Move( 0, -y );

             }
         }
         else
             }
         }
         else


@@ -771,9 +765,13 @@ void wxComboCtrl::DoTimerEvent()
 
     if ( stopTimer )
     {
 
     if ( stopTimer )
     {

-        popup->Move( 0, 0 );

         m_animTimer.Stop();
         DoShowPopup( m_animRect, m_animFlags );
         m_animTimer.Stop();
         DoShowPopup( m_animRect, m_animFlags );

+        popup->Move( 0, 0 );
+
+        // Do a one final refresh to clean up the rare cases of animation
+        // garbage
+        win->Refresh();

     }
 }
 #endif
     }
 }
 #endif