Use the data scheme to load resources in the WebKitGTK+ implementation, rather than...

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

diff --git a/src/msw/combo.cpp b/src/msw/combo.cpp
index c02a3ee3453dd70ef7fee9edff26464b455a546c..1e59def4d8714cd8fac1cc11bcbf2bc3f5624762 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.


@@ -114,9 +117,7 @@
 #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 TEXTCTRLXADJUST_XP          1

 #define TEXTCTRLYADJUST_XP          3
 #define TEXTCTRLYADJUST_XP          3

-#define TEXTCTRLXADJUST_CLASSIC     1

 #define TEXTCTRLYADJUST_CLASSIC     3
 
 #define COMBOBOX_ANIMATION_RESOLUTION   10
 #define TEXTCTRLYADJUST_CLASSIC     3
 
 #define COMBOBOX_ANIMATION_RESOLUTION   10


@@ -159,10 +160,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 +174,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;


@@ -182,28 +187,33 @@ 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;
 

+#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;
 

+    // 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);
 


@@ -214,42 +224,21 @@ wxComboCtrl::~wxComboCtrl()
 {
 }
 
 {
 }
 

-void wxComboCtrl::OnThemeChange()
-{
-    wxUxThemeEngine* theme = wxUxThemeEngine::GetIfActive();
-    if ( theme )
-    {
-        wxUxThemeHandle hTheme(this, L"COMBOBOX");
-
-        COLORREF col;
-        theme->GetThemeColor(hTheme,EP_EDITTEXT,ETS_NORMAL,TMT_FILLCOLOR,&col);
-        SetBackgroundColour(wxRGBToColour(col));
-        theme->GetThemeColor(hTheme,EP_EDITTEXT,ETS_NORMAL,TMT_TEXTCOLOR,&col);
-        SetForegroundColour(wxRGBToColour(col));
-    }
-    else
-    {
-        SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
-        SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
-    }
-}
-

 void wxComboCtrl::OnResize()
 {
     //
     // Recalculates button and textctrl areas
 
 void wxComboCtrl::OnResize()
 {
     //
     // Recalculates button and textctrl areas
 

-    int textCtrlXAdjust;

     int textCtrlYAdjust;
 
     int textCtrlYAdjust;
 

+#if wxUSE_UXTHEME

     if ( wxUxThemeEngine::GetIfActive() )
     {
     if ( wxUxThemeEngine::GetIfActive() )
     {

-        textCtrlXAdjust = TEXTCTRLXADJUST_XP;

         textCtrlYAdjust = TEXTCTRLYADJUST_XP;
     }
     else
         textCtrlYAdjust = TEXTCTRLYADJUST_XP;
     }
     else

+#endif

     {
     {

-        textCtrlXAdjust = TEXTCTRLXADJUST_CLASSIC;

         textCtrlYAdjust = TEXTCTRLYADJUST_CLASSIC;
     }
 
         textCtrlYAdjust = TEXTCTRLYADJUST_CLASSIC;
     }
 


@@ -259,7 +248,7 @@ void wxComboCtrl::OnResize()
     CalculateAreas(btnWidth);
 
     // Position textctrl using standard routine
     CalculateAreas(btnWidth);
 
     // Position textctrl using standard routine

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

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


@@ -282,7 +271,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);


@@ -306,7 +295,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;


@@ -322,6 +313,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 )
         {


@@ -330,6 +322,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 )


@@ -367,10 +360,11 @@ 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();
 

+    wxColour fgCol;

     wxColour bgCol;
     bool doDrawDottedEdge = false;
     bool doDrawSelRect = true;
     wxColour bgCol;
     bool doDrawDottedEdge = false;
     bool doDrawSelRect = true;


@@ -396,28 +390,31 @@ wxComboCtrl::PrepareBackground( wxDC& dc, const wxRect& rect, int flags ) const
             if ( (m_iFlags & wxCC_FULL_BUTTON) && !(flags & wxCONTROL_ISSUBMENU) )
             {
                 // Vista style read-only combo
             if ( (m_iFlags & wxCC_FULL_BUTTON) && !(flags & wxCONTROL_ISSUBMENU) )
             {
                 // Vista style read-only combo

+                fgCol = GetForegroundColour();
+                bgCol = GetBackgroundColour();

                 doDrawSelRect = false;
                 doDrawDottedEdge = true;
             }
             else
             {
                 doDrawSelRect = false;
                 doDrawDottedEdge = true;
             }
             else
             {

-                dc.SetTextForeground( wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT) );
+                fgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);

                 bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
             }
         }
         else
         {
                 bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
             }
         }
         else
         {

-            dc.SetTextForeground( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT) );
+            fgCol = GetForegroundColour();

             bgCol = GetBackgroundColour();
             doDrawSelRect = false;
         }
     }
     else
     {
             bgCol = GetBackgroundColour();
             doDrawSelRect = false;
         }
     }
     else
     {

-        dc.SetTextForeground( wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT) );
+        fgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT);

         bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE);
     }
 
         bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE);
     }
 

+    dc.SetTextForeground(fgCol);

     dc.SetBrush(bgCol);
     if ( doDrawSelRect )
     {
     dc.SetBrush(bgCol);
     if ( doDrawSelRect )
     {


@@ -440,14 +437,18 @@ 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;

-    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;


@@ -455,6 +456,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);
 


@@ -466,6 +468,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;


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

+#endif

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


@@ -640,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 )


@@ -726,10 +732,11 @@ 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;
 

+    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 +748,6 @@ void wxComboCtrl::OnTimerEvent( wxTimerEvent& WXUNUSED(event) )
     {
         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 +765,10 @@ void wxComboCtrl::OnTimerEvent( wxTimerEvent& WXUNUSED(event) )
             }
             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 +779,13 @@ void wxComboCtrl::OnTimerEvent( wxTimerEvent& WXUNUSED(event) )
 
     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


@@ -794,7 +806,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;
     }


@@ -805,8 +817,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;
 }
 


@@ -829,16 +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) &&
-                      !wxUxThemeEngine::GetIfActive()
-                    ) )
-            {
+        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;
     }