Fix setting colours for the edit control part of wxComboBox.

Recognize this control as part of wxComboBox and so handle WM_CTLCOLOR for it.

To do this, override ContainsHWND() in wxComboBox and use it, on the parent
window, in wxControl::DoMSWControlColor(), if we fail to find the window
directly.

Closes #811.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72468 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index e6bb2f0e98c65d2f806da1cac9ff6213b299c1f3..49939c7e98889c5fd562bcbf4e9c0acb06c969cc 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -557,6 +557,7 @@ wxGTK:
 
 wxMSW:
 
+- Fix setting colours for the text part of wxComboBox (Igor Korot).
 - Add support for CURRENCY and SCODE types to OLE Automation helpers (PB).
 - Allow setting LCID used by wxAutomationObject (PB).
 - Fix calling Iconize(false) on hidden top level windows (Christian Walther).

diff --git a/include/wx/msw/combobox.h b/include/wx/msw/combobox.h
index 191ebb3f90705b27f82587efd8e7d6052d1800cb..aa10c8dd937ee76e07744547d5e1fa2b8afdb881 100644 (file)
--- a/include/wx/msw/combobox.h
+++ b/include/wx/msw/combobox.h
@@ -92,6 +92,7 @@ public:
     virtual void SetSelection(long from, long to)
         { wxTextEntry::SetSelection(from, to); }
     virtual int GetSelection() const { return wxChoice::GetSelection(); }
+    virtual bool ContainsHWND(WXHWND hWnd) const;
     virtual void GetSelection(long *from, long *to) const;
 
     virtual bool IsEditable() const;

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index d9b39e7d30a6b68b0a682402d41fd806a917856e..46b1c482c17ea2e8b39a8866c94c4ec3ea88a154 100644 (file)
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -550,6 +550,11 @@ void wxComboBox::Clear()
         wxTextEntry::Clear();
 }
 
+bool wxComboBox::ContainsHWND(WXHWND hWnd) const
+{
+    return hWnd == GetEditHWNDIfAvailable();
+}
+
 void wxComboBox::GetSelection(long *from, long *to) const
 {
     if ( !HasFlag(wxCB_READONLY) )

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index 19151d7854f1c37beab4c6e6a86745e1afe3cd51..6fe928cc5772aa3ae4e935eb04851e90c73f8a41 100644 (file)
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -367,7 +367,23 @@ WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd)
     WXHBRUSH hbr = 0;
     if ( !colBg.IsOk() )
     {
-        if ( wxWindow *win = wxFindWinFromHandle(hWnd) )
+        wxWindow *win = wxFindWinFromHandle( hWnd );
+        if ( !win )
+        {
+            // If this HWND doesn't correspond to a wxWindow, it still might be
+            // one of its children for which we need to set the background
+            // brush, e.g. this is the case for the EDIT control that is part
+            // of wxComboBox. Check for this by asking the parent if it has it:
+            HWND parent = ::GetParent(hWnd);
+            if ( parent )
+            {
+                wxWindow *winParent = wxFindWinFromHandle( parent );
+                if( winParent && winParent->ContainsHWND( hWnd ) )
+                    win = winParent;
+             }
+        }
+
+        if ( win )
             hbr = win->MSWGetBgBrush(pDC);
 
         // if the control doesn't have any bg colour, foreground colour will be