Made changes to allow build with new mingw32/gcc-2.95

added wxUSE_NORLANDER_HEADERS for mingw32/gcc-2.95

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 5e225385ecf2e1f9b719d5cc04250477bee8b6ca..f99ef2326b78933e03d2b17a79d22aefc6365fa9 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -129,6 +129,14 @@
 #if defined(__HPUX__) && defined(__GNUG__)
     #define va_list __gnuc_va_list
 #endif // HP-UX
+    
+// Mingw32 gcc-2.95 uses new windows headers which are more ms-like
+// we are setting this define because of the complex check
+// using NORLANDER as Cygwin may follow. (header author is Anders Norlander)
+#if defined(__MINGW32__) && (__GNUC__>=2) && (__GNUC_MINOR__>=95)
+#   define wxUSE_NORLANDER_HEADERS 1
+#endif
+
 
 //////////////////////////////////////////////////////////////////////////////////
 // Currently Only MS-Windows/NT, XView and Motif are supported

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index 8d4eee417ec1b7aa443446b995ee6eb6d63539c0..0ff6b1a46d288b4f54ac17db36cabb6ead13d9eb 100644 (file)
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -56,7 +56,7 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
 // window proc
 // ---------------------------------------------------------------------------
 
-#if defined(__GNUWIN32__) 
+#if defined(__GNUWIN32__) && !defined(wxUSE_NORLANDER_HEADERS)
 #  define CASTWNDPROC (long unsigned)
 #else
 #  ifdef __BORLANDC__
@@ -69,7 +69,7 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
 #  endif
 
 #  else
-#    if defined (__WIN32__) && defined(STRICT)
+#    if defined (__WIN32__) && defined(STRICT) 
        typedef long (_stdcall * WndProcCast) (HWND, unsigned int, unsigned int, long);
 #      define CASTWNDPROC (WndProcCast)
 #    elif defined(__WIN16__)

diff --git a/include/wx/msw/registry.h b/include/wx/msw/registry.h
index 693207b3fd31a4c6f9d2a4ab69ab6ee3b9568136..958b78c878df9fd6e4040a734577c875b5b907f4 100644 (file)
--- a/include/wx/msw/registry.h
+++ b/include/wx/msw/registry.h
@@ -125,7 +125,7 @@ public:
   bool  Exists() const;
     // get the info about key (any number of these pointers may be NULL)
 
-#ifdef __GNUWIN32__
+#if defined( __GNUWIN32__) && !defined(wxUSE_NORLANDER_HEADERS)
   bool  GetKeyInfo(size_t *pnSubKeys,      // number of subkeys
                    size_t *pnMaxKeyLen,    // max len of subkey name
                    size_t *pnValues,       // number of values

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index ef1ba88aa14dd00b564841c9441090123a8a5892..a3158210e28d26848bc82e2519b66061f59e8938 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -276,7 +276,7 @@ wxDllLoader::GetSymbol(wxDllType dllHandle, const wxString &name)
 // wxLibraries (only one instance should normally exist)
 // ---------------------------------------------------------------------------
 
-wxLibraries::wxLibraries()
+wxLibraries::wxLibraries():m_loaded(wxKEY_STRING)
 {
 }
 

diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp
index ad93ae8f818a74305e8f3da4147907eeec898332..4aebcf06e30e8255de21d89d0b2807cc7bf2ee3a 100644 (file)
--- a/src/generic/tipdlg.cpp
+++ b/src/generic/tipdlg.cpp
@@ -152,7 +152,7 @@ wxString wxFileTipProvider::GetTip()
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(wxTipDialog, wxDialog)
-    EVT_BUTTON(wxID_NEXT_TIP, OnNextTip)
+    EVT_BUTTON(wxID_NEXT_TIP, wxTipDialog::OnNextTip)
 END_EVENT_TABLE()
 
 wxTipDialog::wxTipDialog(wxWindow *parent,

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 35c8510c4872d2a90d8b21b30ef9ed8e0907407d..dc4e711541d8e0e4be1bc4254f96d73e88d0f2d6 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -82,7 +82,7 @@
 #include <string.h>
 #include <ctype.h>
 
-#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
+#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
     #include <commctrl.h>
 #endif
 

diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp
index f9de4075a89e918b968566a452d232a911174c03..963c661c4394ea880038f0689adc038c42617441 100644 (file)
--- a/src/msw/checklst.cpp
+++ b/src/msw/checklst.cpp
@@ -45,7 +45,7 @@
 #include <windows.h>
 #include <windowsx.h>
 
-#ifdef __GNUWIN32__
+#if defined(__GNUWIN32__) && !defined(wxUSE_NORLANDER_HEADERS)
 #include "wx/msw/gnuwin32/extra.h"
 #endif
 

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index 88ab79da903f1ad3a1b38c4b3dc4cf1d605638e9..3ae9f711d211cce38bbf0caf2f87435b3ee5f51f 100644 (file)
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -30,7 +30,7 @@
 
 #include "wx/msw/private.h"
 
-#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
+#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
 #include <commctrl.h>
 #endif
 

diff --git a/src/msw/curico.cpp b/src/msw/curico.cpp
index 7cabfd7ce054e4aa7b8ecf15444889b007c84829..5bd16e67a0867a723c2a7cfef1e51587e2424dc0 100644 (file)
--- a/src/msw/curico.cpp
+++ b/src/msw/curico.cpp
@@ -25,7 +25,7 @@
 #endif
 
 #ifndef __TWIN32__
-#ifdef __GNUWIN32__
+#if defined (__GNUWIN32__) && !defined(wxUSE_NORLANDER_HEADERS)
 #include "wx/msw/gnuwin32/extra.h"
 #endif
 #endif

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index d17e9b196137b35cc9628f1b159de6226d551c97..f424405768d840d002d44ca63677659eaf6162f9 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -46,6 +46,9 @@
 #include <math.h>
 
 #if wxUSE_COMMON_DIALOGS
+#if wxUSE_NORLANDER_HEADERS
+    #include <windows.h>
+#endif
     #include <commdlg.h>
 #endif
 

diff --git a/src/msw/dde.cpp b/src/msw/dde.cpp
index 2d28519eccd48830ed0e8a9d09bbe3b22565ecd8..cff1fb1a1a966a0fb175bc811e1e775f32c0c0ad 100644 (file)
--- a/src/msw/dde.cpp
+++ b/src/msw/dde.cpp
@@ -39,10 +39,12 @@
 #include <ddeml.h>
 
 #ifndef __TWIN32__
+#if !wxUSE_NORLANDER_HEADERS
 #ifdef __GNUWIN32__
 #include "wx/msw/gnuwin32/extra.h"
 #endif
 #endif
+#endif
 
 #include <string.h>
 

diff --git a/src/msw/dib.cpp b/src/msw/dib.cpp
index 54ccf8ab88cf35239c1b7119448fee8660c07a7c..e4f8360ad673c4f0f87f777121c3e87e05d3ed90 100644 (file)
--- a/src/msw/dib.cpp
+++ b/src/msw/dib.cpp
@@ -49,10 +49,12 @@
 #include "wx/msw/dib.h"
 
 #ifndef __TWIN32__
+#ifndef wxUSE_NORLANDER_HEADERS
 #ifdef __GNUWIN32__
 #include "wx/msw/gnuwin32/extra.h"
 #endif
 #endif
+#endif
 
 #ifndef SEEK_CUR
 /* flags for _lseek */

diff --git a/src/msw/dibutils.cpp b/src/msw/dibutils.cpp
index e8f639f22c3dedfbff30ef054eb5a1eaaa533481..31bcfb7e29144c0c9b5b45d61ffebd8e2349507f 100644 (file)
--- a/src/msw/dibutils.cpp
+++ b/src/msw/dibutils.cpp
@@ -167,7 +167,7 @@ int DibWriteFile(LPTSTR szFile, LPBITMAPINFOHEADER lpbi)
   bmf.bfReserved1 = 0;
   bmf.bfReserved2 = 0;
   bmf.bfOffBits = sizeof(bmf) + (char FAR*)(DibPtr(lpbi)) - (char FAR*)lpbi;
-#if defined( __WATCOMC__) || defined(__VISUALC__) || defined(__SC__) || defined(__SALFORDC__) || defined(__MWERKS__)
+#if defined( __WATCOMC__) || defined(__VISUALC__) || defined(__SC__) || defined(__SALFORDC__) || defined(__MWERKS__) || defined(wxUSE_NORLANDER_HEADERS)
   if (_hwrite(fh, (LPCSTR)(&bmf), sizeof(bmf))<0 ||
   _hwrite(fh, (LPCSTR)lpbi, size)<0) {
     _lclose(fh);

diff --git a/src/msw/dragimag.cpp b/src/msw/dragimag.cpp
index 8c6749eb92f80d4baa70f786ac1c8f44b21a73c9..667462e346f80f2f9a306976e0ad69bfc8496cb5 100644 (file)
--- a/src/msw/dragimag.cpp
+++ b/src/msw/dragimag.cpp
@@ -38,7 +38,7 @@
 #include "wx/msw/dragimag.h"
 #include "wx/msw/private.h"
 
-#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
+#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
 #include <commctrl.h>
 #endif
 

diff --git a/src/msw/gauge95.cpp b/src/msw/gauge95.cpp
index ade3fdca7ce4924ee623022fbb892fb1f40c773c..0ddfcba4d4ea6141e91fa6d74f32ef353d182837 100644 (file)
--- a/src/msw/gauge95.cpp
+++ b/src/msw/gauge95.cpp
@@ -29,7 +29,7 @@
 #include "wx/msw/gauge95.h"
 #include "wx/msw/private.h"
 
-#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
+#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
 #include <commctrl.h>
 #endif
 

diff --git a/src/msw/imaglist.cpp b/src/msw/imaglist.cpp
index a4e2fe629dfde1418c5a09bd3061bad5f5f9ffb4..540c176058af316a8a13c4a4bd0f7fb3c1a6a159 100644 (file)
--- a/src/msw/imaglist.cpp
+++ b/src/msw/imaglist.cpp
@@ -37,7 +37,7 @@
 #include "wx/msw/imaglist.h"
 #include "wx/msw/private.h"
 
-#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
+#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
 #include <commctrl.h>
 #endif
 

diff --git a/src/msw/joystick.cpp b/src/msw/joystick.cpp
index 407e7041308cef05985064547c04764f62a13735..58b763191597c918e3907eb25f3cda1cd7e8a31e 100644 (file)
--- a/src/msw/joystick.cpp
+++ b/src/msw/joystick.cpp
@@ -24,7 +24,7 @@
 #include "wx/window.h"
 #include "wx/msw/private.h"
 
-#ifndef __GNUWIN32__
+#if !defined( __GNUWIN32__ ) || defined(wxUSE_NORLANDER_HEADERS)
 #include <mmsystem.h>
 #endif
 
@@ -34,9 +34,11 @@ typedef UINT MMRESULT;
 
 #ifndef __TWIN32__
 #ifdef __GNUWIN32__
+#ifndef wxUSE_NORLANDER_HEADERS
 #include <wx/msw/gnuwin32/extra.h>
 #endif
 #endif
+#endif
 
 // Why doesn't BC++ have joyGetPosEx?
 #if !defined(__WIN32__) || defined(__BORLANDC__) || defined(__TWIN32__)

diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp
index 34927877b227338b16c6de4fe5e71668cb7ef967..02d55e900d4d19195be5f7e9a758cead0824aa79 100644 (file)
--- a/src/msw/listbox.cpp
+++ b/src/msw/listbox.cpp
@@ -49,7 +49,9 @@
 
 #ifndef __TWIN32__
     #if defined(__GNUWIN32__)
-        #include <wx/msw/gnuwin32/extra.h>
+        #ifndef wxUSE_NORLANDER_HEADERS
+            #include <wx/msw/gnuwin32/extra.h>
+        #endif
     #endif
 #endif
 

diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index 811fadec21bcd816674cb4163f59e2a9eebf4d66..e3372ec70789ab74218b419a1ca4c6211fce2e23 100644 (file)
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -39,7 +39,7 @@
 
 #include "wx/msw/private.h"
 
-#ifdef __GNUWIN32__
+#if defined(__GNUWIN32__) && !defined(wxUSE_NORLANDER_HEADERS)
     #include "wx/msw/gnuwin32/extra.h"
 #else
     #include <commctrl.h>

diff --git a/src/msw/minifram.cpp b/src/msw/minifram.cpp
index 016e7e775a4ed27f0f37241b80bd668b9c4e8782..e40b0532f8ad1ae7dd32606d42dbc8cf6466d5b2 100644 (file)
--- a/src/msw/minifram.cpp
+++ b/src/msw/minifram.cpp
@@ -36,9 +36,11 @@
 
 #ifndef __TWIN32__
 #ifdef __GNUWIN32__
+#ifndef wxUSE_NORLANDER_HEADERS
 #include "wx/msw/gnuwin32/extra.h"
 #endif
 #endif
+#endif
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)

diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index 52bf8dcd0dea663992d6fede27a2ae32ce5f91e9..2961439e4b653d655dcaab0c2e1d3aa822699cf8 100644 (file)
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -42,11 +42,13 @@
 
 #ifndef __TWIN32__
 #ifdef __GNUWIN32__
+#ifndef wxUSE_NORLANDER_HEADERS
   #include "wx/msw/gnuwin32/extra.h"
 #endif
 #endif
+#endif
 
-#if !defined(__GNUWIN32__) || defined(__TWIN32__)
+#if !defined(__GNUWIN32__) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
   #include <commctrl.h>
 #endif
 

diff --git a/src/msw/registry.cpp b/src/msw/registry.cpp
index dca9790b5de68d6f10f5ce869f0cccf473288a22..fe8897463ec947a417234378e63dfade2c0fef94 100644 (file)
--- a/src/msw/registry.cpp
+++ b/src/msw/registry.cpp
@@ -302,7 +302,7 @@ wxString wxRegKey::GetName(bool bShortPrefix) const
   return str;
 }
 
-#ifdef __GNUWIN32__
+#if defined( __GNUWIN32__ ) && !defined(wxUSE_NORLANDER_HEADERS)
 bool wxRegKey::GetKeyInfo(size_t* pnSubKeys,
                           size_t* pnMaxKeyLen,
                           size_t* pnValues,

diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp
index ad622b84fdf3a26efddc29622580ba48e900c225..d6334217be0a04e9a2976b4e839c418db57f0902 100644 (file)
--- a/src/msw/slider95.cpp
+++ b/src/msw/slider95.cpp
@@ -31,7 +31,7 @@
 #include "wx/msw/slider95.h"
 #include "wx/msw/private.h"
 
-#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
+#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
 #include <commctrl.h>
 #endif
 

diff --git a/src/msw/spinbutt.cpp b/src/msw/spinbutt.cpp
index 86e07a7f8403f94c9014e1d1068dcc5321285512..b83b6f0493f8357d98ef933dfd16b2f0533cd600 100644 (file)
--- a/src/msw/spinbutt.cpp
+++ b/src/msw/spinbutt.cpp
@@ -32,7 +32,7 @@
 #include "wx/spinbutt.h"
 #include "wx/msw/private.h"
 
-#if !defined(__GNUWIN32__) || defined(__TWIN32__)
+#if !defined(__GNUWIN32__) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
     #include <commctrl.h>
 #endif
 

diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp
index e6a2d6dbdb53fa10d5345f1389e1832df31a9a73..b8de79f67c6869531fe46d4e2961c84c7d6b633a 100644 (file)
--- a/src/msw/statbr95.cpp
+++ b/src/msw/statbr95.cpp
@@ -36,7 +36,7 @@
 #include "wx/msw/private.h"
 #include <windowsx.h>
 
-#if !defined(__GNUWIN32__) || defined(__TWIN32__)
+#if !defined(__GNUWIN32__) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
 #include <commctrl.h>
 #endif
 

diff --git a/src/msw/tabctrl.cpp b/src/msw/tabctrl.cpp
index 4f525436fcc7b9bab2bbb70b6bb596dfc1854a05..ee06ee6fe493d19af90662255b92cb965b6fb130 100644 (file)
--- a/src/msw/tabctrl.cpp
+++ b/src/msw/tabctrl.cpp
@@ -32,15 +32,17 @@
 
 #include <windows.h>
 
-#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
+#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
 #include <commctrl.h>
 #endif
 
 #ifndef __TWIN32__
 #ifdef __GNUWIN32__
+#ifndef wxUSE_NORLANDER_HEADERS
 #include "wx/msw/gnuwin32/extra.h"
 #endif
 #endif
+#endif
 
 #include "wx/msw/dib.h"
 #include "wx/msw/tabctrl.h"

diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp
index fdf563dc377958c13b6a9de3d0664a1b4a2bb02b..8c8fbe0b6f2b07a19a43ddbe8863f7ce1e39b1cb 100644 (file)
--- a/src/msw/taskbar.cpp
+++ b/src/msw/taskbar.cpp
@@ -37,9 +37,11 @@
 
 #ifndef __TWIN32__
 #ifdef __GNUWIN32__
+#ifndef wxUSE_NORLANDER_HEADERS
 #include <wx/msw/gnuwin32/extra.h>
 #endif
 #endif
+#endif
 
 #ifdef __SALFORDC__
 #include <shellapi.h>

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 6a9fcc6cfa8312b3f8942be7352391883d4ff963..51c70e7556830217ceda5a6586385549d5349827 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -32,15 +32,17 @@
 
 #include <windows.h>
 
-#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
+#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
 #include <commctrl.h>
 #endif
 
 #ifndef __TWIN32__
 #ifdef __GNUWIN32__
+#ifndef wxUSE_NORLANDER_HEADERS
 #include "wx/msw/gnuwin32/extra.h"
 #endif
 #endif
+#endif
 
 #include "wx/msw/dib.h"
 #include "wx/tbar95.h"

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index e953ec4e7daf80a3dc9d8ed8cdf68d7a1232ae4f..6770cc598c17317d9d26a356d1a8a0ca2818d729 100644 (file)
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -57,7 +57,7 @@
 #   include <fstream>
 #endif
 
-#if wxUSE_RICHEDIT && !defined(__GNUWIN32__)
+#if wxUSE_RICHEDIT && (!defined(__GNUWIN32__) || defined(wxUSE_NORLANDER_HEADERS))
     #include <richedit.h>
 #endif
 

diff --git a/src/msw/tooltip.cpp b/src/msw/tooltip.cpp
index c119026190fc3039312275d01d5aea67554f4a58..ca76d82573fdf1711f86e7876e10bb2590cbffa5 100644 (file)
--- a/src/msw/tooltip.cpp
+++ b/src/msw/tooltip.cpp
@@ -32,7 +32,7 @@
 #include "wx/tooltip.h"
 #include "wx/msw/private.h"
 
-#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
+#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
 #include <commctrl.h>
 #endif
 
@@ -47,7 +47,7 @@ public:
     wxToolInfo(wxWindow *win)
     {
         // initialize all members
-#ifdef __GNUWIN32__
+#if defined( __GNUWIN32__ ) && !defined(wxUSE_NORLANDER_HEADERS)
         memset(this, 0, sizeof(TOOLINFO));
 #else
         ::ZeroMemory(this, sizeof(TOOLINFO));

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index 4118355c1a53710d97e3c58be607d0649dfb2ded..8363d6ca9f58e033820252684541e2cb2f9396e3 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -47,10 +47,12 @@
 #include "wx/treectrl.h"
 
 #ifdef __GNUWIN32__
+#ifndef wxUSE_NORLANDER_HEADERS
 #include "wx/msw/gnuwin32/extra.h"
 #endif
+#endif
 
-#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
+#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
     #include <commctrl.h>
 #endif
 
@@ -195,7 +197,7 @@ bool wxTreeCtrl::Create(wxWindow *parent,
     if ( m_windowStyle & wxTR_LINES_AT_ROOT )
         wstyle |= TVS_LINESATROOT;
 
-#ifndef __GNUWIN32__
+#if !defined( __GNUWIN32__ ) && !defined(wxUSE_NORLANDER_HEADERS)
     // we emulate the multiple selection tree controls by using checkboxes: set
     // up the image list we need for this if we do have multiple selections
     if ( m_windowStyle & wxTR_MULTIPLE )

diff --git a/src/msw/wave.cpp b/src/msw/wave.cpp
index df4b95ee7440ad0a15929ef79c1c6f281ed1a152..19b164f5a0e0bb773f9d2498c2a6c35ecae501ea 100644 (file)
--- a/src/msw/wave.cpp
+++ b/src/msw/wave.cpp
@@ -31,15 +31,17 @@
 #include <windows.h>
 #include <windowsx.h>
 
-#ifndef __GNUWIN32__
+#if !defined( __GNUWIN32__ ) || defined(wxUSE_NORLANDER_HEADERS)
 #include <mmsystem.h>
 #endif
 
 #ifndef __TWIN32__
 #ifdef __GNUWIN32__
+#ifndef wxUSE_NORLANDER_HEADERS
 #include "wx/msw/gnuwin32/extra.h"
 #endif
 #endif
+#endif
 
 wxWave::wxWave()
   : m_waveData(NULL), m_waveLength(0), m_isResource(FALSE)

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 5e17c7e732152c378f119ea5db55061e424c233d..b9dfdd75e158613783f1340f0a7bbc278cae2e96 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -80,7 +80,7 @@
 
 #include <string.h>
 
-#ifndef __GNUWIN32__
+#if !defined(__GNUWIN32__)|| defined(wxUSE_NORLANDER_HEADERS)
     #include <shellapi.h>
     #include <mmsystem.h>
 #endif
@@ -89,13 +89,15 @@
     #include <windowsx.h>
 #endif
 
-#if ( defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__ )
+#if ( defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__ ) || defined(wxUSE_NORLANDER_HEADERS)
     #include <commctrl.h>
 #endif
 
 #ifndef __TWIN32__
     #ifdef __GNUWIN32__
-        #include <wx/msw/gnuwin32/extra.h>
+        #ifndef wxUSE_NORLANDER_HEADERS
+            #include <wx/msw/gnuwin32/extra.h>
+        #endif
     #endif
 #endif
 

diff --git a/utils/wxtree/src/makefile.g95 b/utils/wxtree/src/makefile.g95
index 38c05afa709c4cd3e6bf0103db9efbb2c9b0b5c3..721817437c4e3796bdff9f59e3ee09698c6e1149 100644 (file)
--- a/utils/wxtree/src/makefile.g95
+++ b/utils/wxtree/src/makefile.g95
@@ -7,7 +7,7 @@
 #
 # Makefile for wxWindows sample (Cygwin/Mingw32).
 
-WXDIR = ../../..
+WXDIR = $(WXWIN)
 
 TARGET=test
 OBJECTS = $(TARGET).o wxtree.o