Fix for broken wxGTK1 compilation

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

diff --git a/src/msw/combo.cpp b/src/msw/combo.cpp
index f30d15982e990b5cde7c7297e3419490d860a525..1e59def4d8714cd8fac1cc11bcbf2bc3f5624762 100644 (file)
--- a/src/msw/combo.cpp
+++ b/src/msw/combo.cpp
@@ -187,7 +187,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 +202,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);
 


@@ -221,53 +224,6 @@ wxComboCtrl::~wxComboCtrl()
 {
 }
 
 {
 }
 

-void wxComboCtrl::OnThemeChange()
-{
-    // 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
-    if ( !m_hasFgCol )
-    {
-        wxColour fgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
-        SetForegroundColour(fgCol);
-        m_hasFgCol = false;
-    }
-
-    wxColour bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
-
-#if wxUSE_UXTHEME
-    wxUxThemeEngine * const theme = wxUxThemeEngine::GetIfActive();
-    if ( theme )
-    {
-        // NB: use EDIT, not COMBOBOX (the latter works in XP but not Vista)
-        wxUxThemeHandle hTheme(this, L"EDIT");
-        COLORREF col;
-        HRESULT hr = theme->GetThemeColor
-                            (
-                                hTheme,
-                                EP_EDITTEXT,
-                                ETS_NORMAL,
-                                TMT_FILLCOLOR,
-                                &col
-                            );
-        if ( SUCCEEDED(hr) )
-        {
-            bgCol = wxRGBToColour(col);
-        }
-        else
-        {
-            wxLogApiError("GetThemeColor(EDIT, ETS_NORMAL, TMT_FILLCOLOR)",
-                          hr);
-        }
-    }
-#endif
-
-    if ( !m_hasBgCol )
-    {
-        SetBackgroundColour(bgCol);
-        m_hasBgCol = false;
-    }
-}
-

 void wxComboCtrl::OnResize()
 {
     //
 void wxComboCtrl::OnResize()
 {
     //


@@ -481,7 +437,8 @@ 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;


@@ -687,6 +644,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 )


@@ -777,6 +736,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?


@@ -788,7 +748,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 )


@@ -806,8 +765,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


@@ -818,9 +779,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


@@ -878,18 +843,12 @@ bool wxComboCtrl::IsKeyPopupToggle(const wxKeyEvent& event) const
 
         case WXK_DOWN:
         case WXK_UP:
 
         case WXK_DOWN:
         case WXK_UP:

-            // On XP or with writable combo in Classic, arrows don't open the
-            // popup but Alt-arrow does
-            if ( event.AltDown() ||
-                    ( !isPopupShown &&
-                      HasFlag(wxCB_READONLY)
-#if wxUSE_UXTHEME
-                      && !wxUxThemeEngine::GetIfActive()
-#endif
-                    ) )
-            {
+        case WXK_NUMPAD_DOWN:
+        case WXK_NUMPAD_UP:
+            // Arrow keys (and mouse wheel) toggle the popup in the native
+            // combo boxes
+            if ( event.AltDown() )

                 return true;
                 return true;

-            }

             break;
     }
 
             break;
     }