From 142ae7b38820a89864bf4132ecb78c3d1152a253 Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Sun, 25 Apr 2010 12:07:37 +0000
Subject: [PATCH] Don't include wx/msw/private.h from dynlib.h.

Because it's private header and introduces dependency on window.h.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64139 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/defs.h       |  3 +++
 include/wx/dynlib.h     | 12 ++----------
 src/common/filename.cpp |  2 +-
 src/msw/dialup.cpp      |  1 +
 src/msw/display.cpp     |  1 +
 src/msw/dlmsw.cpp       |  2 +-
 src/msw/taskbar.cpp     |  1 +
 7 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/include/wx/defs.h b/include/wx/defs.h
index a73801290c..b3819c09aa 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -2929,6 +2929,7 @@ WX_MSW_DECLARE_HANDLE(HBITMAP);
 WX_MSW_DECLARE_HANDLE(HIMAGELIST);
 WX_MSW_DECLARE_HANDLE(HGLOBAL);
 WX_MSW_DECLARE_HANDLE(HDC);
+typedef WXHINSTANCE WXHMODULE;
 
 #undef WX_MSW_DECLARE_HANDLE
 
@@ -2986,6 +2987,8 @@ typedef unsigned long   WXHPALETTE;
 typedef unsigned long   WXHCURSOR;
 typedef unsigned long   WXHRGN;
 typedef unsigned long   WXHACCEL;
+typedef unsigned long   WXHINSTANCE;
+typedef unsigned long   WXHMODULE;
 typedef unsigned long   WXHBITMAP;
 typedef unsigned long   WXHDC;
 typedef unsigned int    WXUINT;
diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h
index 1057f09cae..a5f60686cf 100644
--- a/include/wx/dynlib.h
+++ b/include/wx/dynlib.h
@@ -19,14 +19,6 @@
 #include "wx/string.h"
 #include "wx/dynarray.h"
 
-#if defined(__OS2__) || defined(__EMX__)
-#include "wx/os2/private.h"
-#endif
-
-#ifdef __WXMSW__
-#include "wx/msw/private.h"
-#endif
-
 // note that we have our own dlerror() implementation under Darwin
 #if (defined(HAVE_DLERROR) && !defined(__EMX__)) || defined(__DARWIN__)
     #define wxHAVE_DYNLIB_ERROR
@@ -41,7 +33,7 @@ class WXDLLIMPEXP_FWD_BASE wxDynamicLibraryDetailsCreator;
 // Note: __OS2__/EMX has to be tested first, since we want to use
 // native version, even if configure detected presence of DLOPEN.
 #if defined(__OS2__) || defined(__EMX__) || defined(__WINDOWS__)
-    typedef HMODULE             wxDllType;
+    typedef WXHMODULE           wxDllType;
 #elif defined(__DARWIN__)
     // Don't include dlfcn.h on Darwin, we may be using our own replacements.
     typedef void               *wxDllType;
@@ -367,7 +359,7 @@ public:
     // the returned handle reference count is not incremented so it doesn't
     // need to be freed using FreeLibrary() but it also means that it can
     // become invalid if the DLL is unloaded
-    static HINSTANCE MSWGetModuleHandle(const char *name, void *addr);
+    static WXHMODULE MSWGetModuleHandle(const char *name, void *addr);
 #endif // __WXMSW__
 
 protected:
diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index 34d8845668..ee6fc1fe17 100644
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -98,7 +98,7 @@
     #include "wx/msw/gccpriv.h"
 #endif
 
-#ifdef __WXWINCE__
+#ifdef __WXMSW__
 #include "wx/msw/private.h"
 #endif
 
diff --git a/src/msw/dialup.cpp b/src/msw/dialup.cpp
index 24c13f4da6..b006bdbf37 100644
--- a/src/msw/dialup.cpp
+++ b/src/msw/dialup.cpp
@@ -39,6 +39,7 @@
 
 #include "wx/generic/choicdgg.h"
 
+#include "wx/msw/private.h"
 #include "wx/dynlib.h"
 
 wxDEFINE_EVENT( wxEVT_DIALUP_CONNECTED, wxDialUpEvent );
diff --git a/src/msw/display.cpp b/src/msw/display.cpp
index d64dc163fb..b8b49cacdd 100644
--- a/src/msw/display.cpp
+++ b/src/msw/display.cpp
@@ -41,6 +41,7 @@
 #include "wx/display_impl.h"
 #include "wx/msw/wrapwin.h"
 #include "wx/msw/missing.h"
+#include "wx/msw/private.h"
 
 // define this to use DirectDraw for display mode switching: this is disabled
 // by default because ddraw.h is now always available and also it's not really
diff --git a/src/msw/dlmsw.cpp b/src/msw/dlmsw.cpp
index f0f4d43a5c..e3bde950a5 100644
--- a/src/msw/dlmsw.cpp
+++ b/src/msw/dlmsw.cpp
@@ -296,7 +296,7 @@ wxDynamicLibraryDetailsArray wxDynamicLibrary::ListLoaded()
 }
 
 /* static */
-WXHINSTANCE wxDynamicLibrary::MSWGetModuleHandle(const char *name, void *addr)
+WXHMODULE wxDynamicLibrary::MSWGetModuleHandle(const char *name, void *addr)
 {
     // we want to use GetModuleHandleEx() instead of usual GetModuleHandle()
     // because the former works correctly for comctl32.dll while the latter
diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp
index dd6e1be588..91bd88cfaa 100644
--- a/src/msw/taskbar.cpp
+++ b/src/msw/taskbar.cpp
@@ -31,6 +31,7 @@
 
 #include <string.h>
 #include "wx/taskbar.h"
+#include "wx/msw/private.h"
 #include "wx/dynlib.h"
 
 #ifndef NIN_BALLOONTIMEOUT
-- 
2.45.2