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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index a73801290c08d47e18bac7834d20983ce1b776a8..b3819c09aaf8f812390f2028d1addcd0d79742d7 100644 (file)
--- 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 1057f09cae3630bc784b15364430249cc5ca1ca2..a5f60686cf23abb8b4916c126fdceec2b0f23fb5 100644 (file)
--- 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 34d8845668fcbec68e8a8a7db183eb7f32d0a5a9..ee6fc1fe17f2c80b655bac3674a902dc61fba493 100644 (file)
--- 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 24c13f4da6f57112b2cd800623aaf56912ea36a8..b006bdbf37e25a953185c149c4d1c85f987ca3d5 100644 (file)
--- 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 d64dc163fb409771f7f14b320f7a9d6cd7b44d8f..b8b49cacdd6fc793b6a9a5727904ffc2f1a3f1c5 100644 (file)
--- 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 f0f4d43a5c4ea6bb8b7b6417b54f3b502f094792..e3bde950a5d323a28e894226637868dd70df1a99 100644 (file)
--- 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 dd6e1be58883a61de3f9ca0fbfad1de860a7100e..91bd88cfaac9550274138de51d78c5c828853bc3 100644 (file)
--- 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