include wx/thread.h in debug build which is needed after last change

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

diff --git a/src/msw/combo.cpp b/src/msw/combo.cpp
index 0fd2c511df0a90438157c2d08a8bc42db79e7bad..7c69f60c861b2c2b838f3b1d277752a62858fe1d 100644 (file)
--- a/src/msw/combo.cpp
+++ b/src/msw/combo.cpp
@@ -68,13 +68,13 @@
 #define TEXTCTRLXADJUST_XP          1
 #define TEXTCTRLYADJUST_XP          3
 #define TEXTCTRLXADJUST_CLASSIC     1
 #define TEXTCTRLXADJUST_XP          1
 #define TEXTCTRLYADJUST_XP          3
 #define TEXTCTRLXADJUST_CLASSIC     1

-#define TEXTCTRLYADJUST_CLASSIC     3
+#define TEXTCTRLYADJUST_CLASSIC     2

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

-#define wxMSW_DESKTOP_USERPREFERENCESMASK_COMBOBOXANIM    (1<<26)
+#define wxMSW_DESKTOP_USERPREFERENCESMASK_COMBOBOXANIM    (1<<2)

 
 
 // ============================================================================
 
 
 // ============================================================================


@@ -85,7 +85,9 @@
 BEGIN_EVENT_TABLE(wxComboCtrl, wxComboCtrlBase)
     EVT_PAINT(wxComboCtrl::OnPaintEvent)
     EVT_MOUSE_EVENTS(wxComboCtrl::OnMouseEvent)
 BEGIN_EVENT_TABLE(wxComboCtrl, wxComboCtrlBase)
     EVT_PAINT(wxComboCtrl::OnPaintEvent)
     EVT_MOUSE_EVENTS(wxComboCtrl::OnMouseEvent)

+#if wxUSE_COMBOCTRL_POPUP_ANIMATION

     EVT_TIMER(wxID_ANY, wxComboCtrl::OnTimerEvent)
     EVT_TIMER(wxID_ANY, wxComboCtrl::OnTimerEvent)

+#endif

 END_EVENT_TABLE()
 
 
 END_EVENT_TABLE()
 
 


@@ -147,8 +149,8 @@ bool wxComboCtrl::Create(wxWindow *parent,
     // Prepare background for double-buffering
     SetBackgroundStyle( wxBG_STYLE_CUSTOM );
 
     // Prepare background for double-buffering
     SetBackgroundStyle( wxBG_STYLE_CUSTOM );
 

-    // SetBestSize should be called last
-    SetBestSize(size);
+    // SetInitialSize should be called last
+    SetInitialSize(size);

 
     return true;
 }
 
     return true;
 }


@@ -454,7 +456,7 @@ void wxComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
     dc.DrawRectangle(rect);
 
     // Button background with theme?
     dc.DrawRectangle(rect);
 
     // Button background with theme?

-    bool drawButBg = true;
+    int drawButFlags = Draw_PaintBg;

     if ( hTheme && m_blankButtonBg )
     {
         RECT r;
     if ( hTheme && m_blankButtonBg )
     {
         RECT r;


@@ -466,11 +468,11 @@ void wxComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
                                          GetHdcOf(dc),
                                          &r);
 
                                          GetHdcOf(dc),
                                          &r);
 

-        drawButBg = false;
+        drawButFlags = 0;

     }
 
     // Standard button rendering
     }
 
     // Standard button rendering

-    DrawButton(dc,rectb,drawButBg);
+    DrawButton(dc,rectb,drawButFlags);

 
     // paint required portion on the control
     if ( (!m_text || m_widthCustomPaint) )
 
     // paint required portion on the control
     if ( (!m_text || m_widthCustomPaint) )


@@ -543,16 +545,28 @@ static wxUint32 GetUserPreferencesMask()
     if ( valueSet )
         return userPreferencesMask;
 
     if ( valueSet )
         return userPreferencesMask;
 

-    wxRegKey key(wxRegKey::HKCU, wxT("Control Panel\\Desktop"));
-    if( key.Open(wxRegKey::Read) )
+    wxRegKey* pKey = NULL;
+    wxRegKey key1(wxRegKey::HKCU, wxT("Software\\Policies\\Microsoft\\Control Panel"));
+    wxRegKey key2(wxRegKey::HKCU, wxT("Software\\Policies\\Microsoft\\Windows\\Control Panel"));
+    wxRegKey key3(wxRegKey::HKCU, wxT("Control Panel\\Desktop"));
+
+    if ( key1.Exists() )
+        pKey = &key1;
+    else if ( key2.Exists() )
+        pKey = &key2;
+    else if ( key3.Exists() )
+        pKey = &key3;
+
+    if ( pKey && pKey->Open(wxRegKey::Read) )

     {
         wxMemoryBuffer buf;
     {
         wxMemoryBuffer buf;

-        if ( key.QueryValue(wxT("UserPreferencesMask"), buf) )
+        if ( pKey->HasValue(wxT("UserPreferencesMask")) &&
+             pKey->QueryValue(wxT("UserPreferencesMask"), buf) )

         {
             if ( buf.GetDataLen() >= 4 )
             {
         {
             if ( buf.GetDataLen() >= 4 )
             {

-                wxByte* p = (wxByte*) buf.GetData();
-                userPreferencesMask = p[3] + (p[2]<<8) + (p[1]<<16) + (p[0]<<24);
+                wxUint32* p = (wxUint32*) buf.GetData();
+                userPreferencesMask = *p;

             }
         }
     }
             }
         }
     }