AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't include wx/msw/private.h from dynlib.h.

Browse Source 
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
This commit is contained in:
Václav Slavík 2010-04-25 12:07:37 +00:00
parent fe42ab1d7b
commit 142ae7b388
7 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/defs.h
View File

@ -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;

12
include/wx/dynlib.h
View File

@ -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:

2
src/common/filename.cpp
View File

@ -98,7 +98,7 @@
#include "wx/msw/gccpriv.h"
#endif
#ifdef __WXWINCE__
#ifdef __WXMSW__
#include "wx/msw/private.h"
#endif

1
src/msw/dialup.cpp
View File

@ -39,6 +39,7 @@
#include "wx/generic/choicdgg.h"
#include "wx/msw/private.h"
#include "wx/dynlib.h"
wxDEFINE_EVENT( wxEVT_DIALUP_CONNECTED, wxDialUpEvent );

1
src/msw/display.cpp
View File

@ -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

2
src/msw/dlmsw.cpp
View File

@ -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

1
src/msw/taskbar.cpp
View File

@ -31,6 +31,7 @@
#include <string.h>
#include "wx/taskbar.h"
#include "wx/msw/private.h"
#include "wx/dynlib.h"
#ifndef NIN_BALLOONTIMEOUT