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

include/wx/dynlib.h

@@ -40,7 +40,7 @@
 #   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

include/wx/wxprec.h

@@ -29,7 +29,7 @@
 
 // include standard Windows headers
 #ifdef __WXMSW__
-    #include <windows.h>
+//    #include <windows.h>
     #include "wx/msw/winundef.h"
 #endif
 

src/common/cmdline.cpp

@@ -37,6 +37,8 @@
     #include "wx/filefn.h"
 #endif //WX_PRECOMP
 
+#include <ctype.h>
+
 #include "wx/datetime.h"
 #include "wx/cmdline.h"
 

src/common/datetime.cpp

@@ -75,6 +75,8 @@
 
 #define wxDEFINE_TIME_CONSTANTS // before including datetime.h
 
+#include <ctype.h>
+
 #include "wx/datetime.h"
 
 // ----------------------------------------------------------------------------

src/common/dynlib.cpp

@@ -22,6 +22,9 @@
 #endif
 
 #include  "wx/wxprec.h"
+#if defined(__WINDOWS__)
+#include "wx/msw/private.h"
+#endif
 
 #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
+aaa=1
 #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;
@@ -55,8 +59,6 @@
             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)

src/common/menucmn.cpp

@@ -24,6 +24,8 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#include <ctype.h>
+
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif

src/common/serbase.cpp

@@ -15,6 +15,9 @@
 
 // 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"

src/msw/dc.cpp

@@ -23,6 +23,7 @@
 
 // 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
@@ -56,8 +57,6 @@
     #include <print.h>
 #endif
 
-#include "wx/msw/private.h"
-
     IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
 
 // ---------------------------------------------------------------------------

src/msw/dialup.cpp

@@ -38,6 +38,8 @@
     #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
@@ -54,8 +56,6 @@
 
 #include <wininet.h>
 
-#include "wx/msw/private.h"
-
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------

src/msw/dragimag.cpp

@@ -15,6 +15,7 @@
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
+#include "wx/msw/private.h"
 
 #ifdef __BORLANDC__
 #pragma hdrstop

src/msw/filedlg.cpp

@@ -15,6 +15,7 @@
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
+#include "wx/msw/private.h"
 
 #ifdef __BORLANDC__
     #pragma hdrstop
@@ -28,7 +29,7 @@
     #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__)

src/msw/ownerdrw.cpp

@@ -15,6 +15,7 @@
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
+#include "wx/msw/private.h"
 
 #ifdef __BORLANDC__
 #pragma hdrstop
@@ -22,7 +23,7 @@
 
 #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"