From 74052fe83bbeb7e37e98d57c88a05e8a1425c86d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 25 Feb 2008 02:13:36 +0000
Subject: [PATCH] added more includes of wx/msw/dc.h needed since r52054 for
 wxMSW compilation

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/msw/checklst.cpp |  1 +
 src/msw/combobox.cpp | 10 +++++++---
 src/msw/listbox.cpp  |  1 +
 src/msw/notebook.cpp |  1 +
 src/msw/ownerdrw.cpp |  1 +
 src/msw/statbox.cpp  |  1 +
 6 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp
index 1ac17a4420..fd480f4f70 100644
--- a/src/msw/checklst.cpp
+++ b/src/msw/checklst.cpp
@@ -47,6 +47,7 @@
 
 #include "wx/renderer.h"
 #include "wx/msw/private.h"
+#include "wx/msw/dc.h"
 
 // ----------------------------------------------------------------------------
 // private functions
diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 836db69131..71e4192405 100644
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -394,9 +394,13 @@ bool wxComboBox::MSWShouldPreProcessMessage(WXMSG *pMsg)
 
 WXHWND wxComboBox::GetEditHWNDIfAvailable() const
 {
-    // we assume that the only child of the combobox is the edit window so it's
-    // unnecessary to pass "EDIT" as class name parameter
-    return (WXHWND)::FindWindowEx(GetHwnd(), NULL, NULL, NULL);
+    // notice that a slightly safer alternative could be to use FindWindowEx()
+    // but it's not available under WinCE so just take the first child for now
+    // to keep one version of the code for all platforms and fix it later if
+    // problems are discovered
+
+    // we assume that the only child of the combobox is the edit window
+    return (WXHWND)::GetWindow(GetHwnd(), GW_CHILD);
 }
 
 WXHWND wxComboBox::GetEditHWND() const
diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp
index ae8535a88f..5a93bc577c 100644
--- a/src/msw/listbox.cpp
+++ b/src/msw/listbox.cpp
@@ -32,6 +32,7 @@
 #endif
 
 #include "wx/msw/private.h"
+#include "wx/msw/dc.h"
 
 #include <windowsx.h>
 
diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index d1d01fb962..5c9cd14cd2 100644
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -36,6 +36,7 @@
 #include "wx/sysopt.h"
 
 #include "wx/msw/private.h"
+#include "wx/msw/dc.h"
 
 #include <windowsx.h>
 #include "wx/msw/winundef.h"
diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp
index cf3cc95bda..b41cb1734a 100644
--- a/src/msw/ownerdrw.cpp
+++ b/src/msw/ownerdrw.cpp
@@ -35,6 +35,7 @@
 #include "wx/fontutil.h"
 
 #include "wx/msw/private.h"
+#include "wx/msw/dc.h"
 
 #ifndef SPI_GETKEYBOARDCUES
 #define SPI_GETKEYBOARDCUES 0x100A
diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index ca30667415..90c42f05e6 100644
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -41,6 +41,7 @@
 #include "wx/msw/uxtheme.h"
 #include "wx/msw/private.h"
 #include "wx/msw/missing.h"
+#include "wx/msw/dc.h"
 
 // the values coincide with those in tmschema.h
 #define BP_GROUPBOX 4
-- 
2.45.2