Changed code to allow for removal of the #include <windows.h> from wxprec.h for windows

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h
index e6b0bc8c141a7bc55e7fbd9d153a08015d24b295..5f5a9f4f017c6d70f24fdc211782a9f4801d7c84 100644 (file)
--- a/include/wx/dynlib.h
+++ b/include/wx/dynlib.h
@@ -40,7 +40,7 @@
 #   include <dl.h>
     typedef shl_t wxDllType;
 #elif defined(__WINDOWS__)
 #   include <dl.h>
     typedef shl_t wxDllType;
 #elif defined(__WINDOWS__)

-#   include <windows.h>
+//#   include <windows.h>  

     typedef HMODULE wxDllType;
 #elif defined(__OS2__)
 #   define INCL_DOS
     typedef HMODULE wxDllType;
 #elif defined(__OS2__)
 #   define INCL_DOS

diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index 6f28387b898cbb5f1e42a997ff6e4a1ee4b5bf81..df5e79718657521c89e06f1f490b79f8f1694f73 100644 (file)
--- a/include/wx/wxprec.h
+++ b/include/wx/wxprec.h
@@ -29,7 +29,7 @@
 
 // include standard Windows headers
 #ifdef __WXMSW__
 
 // include standard Windows headers
 #ifdef __WXMSW__

-    #include <windows.h>
+//    #include <windows.h>

     #include "wx/msw/winundef.h"
 #endif
 
     #include "wx/msw/winundef.h"
 #endif
 

diff --git a/src/common/cmdline.cpp b/src/common/cmdline.cpp
index a3676830c799c4c6ca2d89e75885eceed0ea2d81..40700df5af937e2fb3c5c82b9a10ea864f4539c7 100644 (file)
--- a/src/common/cmdline.cpp
+++ b/src/common/cmdline.cpp
@@ -37,6 +37,8 @@
     #include "wx/filefn.h"
 #endif //WX_PRECOMP
 
     #include "wx/filefn.h"
 #endif //WX_PRECOMP
 

+#include <ctype.h>
+

 #include "wx/datetime.h"
 #include "wx/cmdline.h"
 
 #include "wx/datetime.h"
 #include "wx/cmdline.h"
 

diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp
index 5326de0e313838d519910451145491ba0ef8bcef..b2f65e9f618c5158641d22d4d269aa0a77a60113 100644 (file)
--- a/src/common/datetime.cpp
+++ b/src/common/datetime.cpp
@@ -75,6 +75,8 @@
 
 #define wxDEFINE_TIME_CONSTANTS // before including datetime.h
 
 
 #define wxDEFINE_TIME_CONSTANTS // before including datetime.h
 

+#include <ctype.h>
+

 #include "wx/datetime.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/datetime.h"
 
 // ----------------------------------------------------------------------------

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index 5086123d9348f2bc78e95fb32d365ed86aa00b3b..eca2040c2b7a786cbead18e60a34c05ac1e12b15 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -22,6 +22,9 @@
 #endif
 
 #include  "wx/wxprec.h"
 #endif
 
 #include  "wx/wxprec.h"

+#if defined(__WINDOWS__)
+#include "wx/msw/private.h"
+#endif

 
 #ifdef __BORLANDC__
   #pragma hdrstop
 
 #ifdef __BORLANDC__
   #pragma hdrstop


@@ -42,10 +45,11 @@
 #   define wxDllOpen(lib)                dlopen(lib.fn_str(), RTLD_NOW/*RTLD_LAZY*/)
 #   define wxDllGetSymbol(handle, name)  dlsym(handle, name.mb_str())
 #   define wxDllClose                    dlclose
 #   define wxDllOpen(lib)                dlopen(lib.fn_str(), RTLD_NOW/*RTLD_LAZY*/)
 #   define wxDllGetSymbol(handle, name)  dlsym(handle, name.mb_str())
 #   define wxDllClose                    dlclose

+aaa=1

 #elif defined(HAVE_SHL_LOAD)
 #   define wxDllOpen(lib)                shl_load(lib.fn_str(), BIND_DEFERRED, 0)
 #   define wxDllClose      shl_unload
 #elif defined(HAVE_SHL_LOAD)
 #   define wxDllOpen(lib)                shl_load(lib.fn_str(), BIND_DEFERRED, 0)
 #   define wxDllClose      shl_unload

-
+bbb=1

     static inline void *wxDllGetSymbol(shl_t handle, const wxString& name)
     {
         void *sym;
     static inline void *wxDllGetSymbol(shl_t handle, const wxString& name)
     {
         void *sym;


@@ -55,8 +59,6 @@
             return (void *)0;
     }
 #elif defined(__WINDOWS__)
             return (void *)0;
     }
 #elif defined(__WINDOWS__)

-#   include <windows.h>
-

     // using LoadLibraryEx under Win32 to avoid name clash with LoadLibrary
 #   ifdef __WIN32__
 #      define wxDllOpen(lib)                  ::LoadLibraryEx(lib, 0, 0)
     // using LoadLibraryEx under Win32 to avoid name clash with LoadLibrary
 #   ifdef __WIN32__
 #      define wxDllOpen(lib)                  ::LoadLibraryEx(lib, 0, 0)

diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp
index 9f16ca8512689404c87394eae0fc8efa143ea81b..ff228f99dc6494a98c715f68e29ae20e95021bd5 100644 (file)
--- a/src/common/menucmn.cpp
+++ b/src/common/menucmn.cpp
@@ -24,6 +24,8 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#include <ctype.h>
+

 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif

diff --git a/src/common/serbase.cpp b/src/common/serbase.cpp
index cea2ce5efbefb8874248b4d28b738266bd048003..7ad3a46705251d2d9fd59e0c470d055fc2151ac2 100644 (file)
--- a/src/common/serbase.cpp
+++ b/src/common/serbase.cpp
@@ -15,6 +15,9 @@
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"

+#if defined(__WINDOWS__)
+#include "wx/msw/private.h"
+#endif

 
 #include "wx/serbase.h"
 #include "wx/datstrm.h"
 
 #include "wx/serbase.h"
 #include "wx/datstrm.h"

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index fbda0e031fe4c74bb1f7ca3dbf38f196aaabbcd7..50135649aa0c09defbc090af84a56cba243d9ead 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -23,6 +23,7 @@
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"

+#include "wx/msw/private.h" // needs to be before #include <commdlg.h>

 
 #ifdef __BORLANDC__
     #pragma hdrstop
 
 #ifdef __BORLANDC__
     #pragma hdrstop


@@ -56,8 +57,6 @@
     #include <print.h>
 #endif
 
     #include <print.h>
 #endif
 

-#include "wx/msw/private.h"
-

     IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
 
 // ---------------------------------------------------------------------------
     IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
 
 // ---------------------------------------------------------------------------

diff --git a/src/msw/dialup.cpp b/src/msw/dialup.cpp
index aad71498674c56bad8327b8cff4fefb7f415c266..c23defa8395674cf35c99f0ebab828fbecdc7567 100644 (file)
--- a/src/msw/dialup.cpp
+++ b/src/msw/dialup.cpp
@@ -38,6 +38,8 @@
     #include "wx/event.h"
 #endif
 
     #include "wx/event.h"
 #endif
 

+#include "wx/msw/private.h"  // must be before #include "dynlib.h"
+

 #if !wxUSE_DYNLIB_CLASS
     #error You need wxUSE_DYNLIB_CLASS to be 1 to compile dialup.cpp.
 #endif
 #if !wxUSE_DYNLIB_CLASS
     #error You need wxUSE_DYNLIB_CLASS to be 1 to compile dialup.cpp.
 #endif


@@ -54,8 +56,6 @@
 
 #include <wininet.h>
 
 
 #include <wininet.h>
 

-#include "wx/msw/private.h"
-

 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------

diff --git a/src/msw/dragimag.cpp b/src/msw/dragimag.cpp
index 55757f2ea6ac8c9bc6a00a636a7864f27dfb9800..a2793f86bc3a874d61415e9710a71aac5c4a67d3 100644 (file)
--- a/src/msw/dragimag.cpp
+++ b/src/msw/dragimag.cpp
@@ -15,6 +15,7 @@
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"

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

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 
 #ifdef __BORLANDC__
 #pragma hdrstop

diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp
index 17612e6fca7ab4bc381cdda26cd91cee24f59a45..a96c48e52b7964b828103b41b1c18784cb7c598e 100644 (file)
--- a/src/msw/filedlg.cpp
+++ b/src/msw/filedlg.cpp
@@ -15,6 +15,7 @@
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"

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

 
 #ifdef __BORLANDC__
     #pragma hdrstop
 
 #ifdef __BORLANDC__
     #pragma hdrstop


@@ -28,7 +29,7 @@
     #include "wx/intl.h"
     #include "wx/log.h"
 
     #include "wx/intl.h"
     #include "wx/log.h"
 

-    #include "wx/msw/private.h"
+//    #include "wx/msw/private.h"

 #endif
 
 #if !defined(__WIN32__) || defined(__SALFORDC__) || defined(__WXWINE__)
 #endif
 
 #if !defined(__WIN32__) || defined(__SALFORDC__) || defined(__WXWINE__)

diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp
index 2c2ec2a8ead4a27cc97fa993bcc0190ff78a1c91..8ea7c54e0f0fd5805a91dd95932abed06398aaa6 100644 (file)
--- a/src/msw/ownerdrw.cpp
+++ b/src/msw/ownerdrw.cpp
@@ -15,6 +15,7 @@
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"

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

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 
 #ifdef __BORLANDC__
 #pragma hdrstop


@@ -22,7 +23,7 @@
 
 #ifndef WX_PRECOMP
   #include "wx/window.h"
 
 #ifndef WX_PRECOMP
   #include "wx/window.h"

-  #include "wx/msw/private.h"
+//  #include "wx/msw/private.h"

   #include "wx/font.h"
   #include "wx/bitmap.h"
   #include "wx/dcmemory.h"
   #include "wx/font.h"
   #include "wx/bitmap.h"
   #include "wx/dcmemory.h"