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

diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp
index 1ac17a442043ca61afc6fee4621b63c5316dff59..fd480f4f705c848a28c36ec7f6970b6131b6ce29 100644 (file)
--- 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/renderer.h"
 #include "wx/msw/private.h"

+#include "wx/msw/dc.h"

 
 // ----------------------------------------------------------------------------
 // private functions
 
 // ----------------------------------------------------------------------------
 // private functions

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 836db691312eb658dd71a2e031f1272b9133b010..71e4192405e63f483bbc5839bf15fdd0f2e7e318 100644 (file)
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -394,9 +394,13 @@ bool wxComboBox::MSWShouldPreProcessMessage(WXMSG *pMsg)
 
 WXHWND wxComboBox::GetEditHWNDIfAvailable() const
 {
 
 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
 }
 
 WXHWND wxComboBox::GetEditHWND() const

diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp
index ae8535a88f56bc271b540938b4be47abd28b84df..5a93bc577c3e8e022510a5acafd1469151cec212 100644 (file)
--- a/src/msw/listbox.cpp
+++ b/src/msw/listbox.cpp
@@ -32,6 +32,7 @@
 #endif
 
 #include "wx/msw/private.h"
 #endif
 
 #include "wx/msw/private.h"

+#include "wx/msw/dc.h"

 
 #include <windowsx.h>
 
 
 #include <windowsx.h>
 

diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index d1d01fb962ac1aad89f378b00eda6c5867be8335..5c9cd14cd21832c3ecab7e958bdf14a74cc60d72 100644 (file)
--- 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/sysopt.h"
 
 #include "wx/msw/private.h"

+#include "wx/msw/dc.h"

 
 #include <windowsx.h>
 #include "wx/msw/winundef.h"
 
 #include <windowsx.h>
 #include "wx/msw/winundef.h"

diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp
index cf3cc95bdace1f5360f7f5f76bc71018eb7271e4..b41cb1734ae4bd757c79c7d4b9e75e8540d63ec8 100644 (file)
--- 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/fontutil.h"
 
 #include "wx/msw/private.h"

+#include "wx/msw/dc.h"

 
 #ifndef SPI_GETKEYBOARDCUES
 #define SPI_GETKEYBOARDCUES 0x100A
 
 #ifndef SPI_GETKEYBOARDCUES
 #define SPI_GETKEYBOARDCUES 0x100A

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index ca3066741505fe22cb4c45cb4bd03dd71b4d9ab7..90c42f05e6aa63ecd04f9b495a2e568b048a909c 100644 (file)
--- 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/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
 
 // the values coincide with those in tmschema.h
 #define BP_GROUPBOX 4