applied patch 439186 (mingw and VC5 fixes)

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

diff --git a/include/wx/generic/treelay.h b/include/wx/generic/treelay.h
index 92963b63dbc7c7de0d54bcbc8412f643c9d3d1a3..b59e1488f8588a675b32e818cbdf416115e23500 100644 (file)
--- a/include/wx/generic/treelay.h
+++ b/include/wx/generic/treelay.h
@@ -16,6 +16,13 @@
 #pragma interface "wxtree.h"
 #endif
 
 #pragma interface "wxtree.h"
 #endif
 

+#ifndef WX_PRECOMP
+#include <wx/object.h>
+class wxList;
+class wxDC;
+class wxMouseEvent;
+#endif
+

 #include <wx/string.h>
 
 class WXDLLEXPORT wxTreeLayout: public wxObject
 #include <wx/string.h>
 
 class WXDLLEXPORT wxTreeLayout: public wxObject

diff --git a/include/wx/msw/gccpriv.h b/include/wx/msw/gccpriv.h
index 5fff4db8262c6f7f183f8370767e29d8aaa29a96..9830ad99fd25333967280b7c0457d9c339f05bbb 100644 (file)
--- a/include/wx/msw/gccpriv.h
+++ b/include/wx/msw/gccpriv.h
@@ -3,6 +3,13 @@
 #ifndef _WX_MSW_GCCPRIV_H_
 #define _WX_MSW_GCCPRIV_H_
 
 #ifndef _WX_MSW_GCCPRIV_H_
 #define _WX_MSW_GCCPRIV_H_
 

+#if defined( __MINGW32__ )
+    #include <_mingw.h>
+    #if __MINGW32_MAJOR_VERSION >= 1
+        #define HAVE_W32API_H
+    #endif
+#endif
+

 // check for MinGW/Cygwin w32api version ( releases >= 0.5, only )
 #if defined( HAVE_W32API_H )
 #include <w32api.h>
 // check for MinGW/Cygwin w32api version ( releases >= 0.5, only )
 #if defined( HAVE_W32API_H )
 #include <w32api.h>

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index 20b4d94676bc723a73e6f0fd734abd95b1a001d6..3193fa73c38a65798fb8c3f7dddab0d7f4ed5c5d 100644 (file)
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -14,6 +14,10 @@
 #ifndef _WX_PRIVATE_H_
 #define _WX_PRIVATE_H_
 
 #ifndef _WX_PRIVATE_H_
 #define _WX_PRIVATE_H_
 

+#ifndef STRICT
+    #define STRICT 1
+#endif
+

 #include <windows.h>
 
 #ifdef __WXMICROWIN__
 #include <windows.h>
 
 #ifdef __WXMICROWIN__

diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index 0bfccf8d0dc86c1ab673e771f7f643bd3926e2b9..f8f2e432bc361a52db8200544655d02a9ff6f1d9 100644 (file)
--- a/include/wx/wxprec.h
+++ b/include/wx/wxprec.h
@@ -33,6 +33,10 @@
 
 // include standard Windows headers
 #if defined(__WXMSW__) && !wxUSE_MFC
 
 // include standard Windows headers
 #if defined(__WXMSW__) && !wxUSE_MFC

+    #ifndef STRICT
+        #define STRICT 1
+    #endif
+

     #include <windows.h>
     #include "wx/msw/winundef.h"
 #endif
     #include <windows.h>
     #include "wx/msw/winundef.h"
 #endif

diff --git a/src/common/mimecmn.cpp b/src/common/mimecmn.cpp
index e28e6f9272385dac86bb1b0fe4ad9333501b6311..8a16ced893591f3c2bd0bfedbf94587588b1b72f 100644 (file)
--- a/src/common/mimecmn.cpp
+++ b/src/common/mimecmn.cpp
@@ -34,6 +34,8 @@
 #ifndef WX_PRECOMP
     #include "wx/module.h"
 #endif
 #ifndef WX_PRECOMP
     #include "wx/module.h"
 #endif

+// this one is needed for MSVC5
+#include "wx/module.h"

 
 #ifndef WX_PRECOMP
   #include "wx/string.h"
 
 #ifndef WX_PRECOMP
   #include "wx/string.h"

diff --git a/src/generic/treelay.cpp b/src/generic/treelay.cpp
index 44ab82d2331d1f8c86a3280c9bb9f7921f10dfbc..fa5db2eceae911c21d4f21a26652b0ce08e2e1c8 100644 (file)
--- a/src/generic/treelay.cpp
+++ b/src/generic/treelay.cpp
@@ -21,6 +21,8 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

+#include "wx/dc.h"
+#include "wx/event.h"

 #endif
 
 #if wxUSE_TREELAYOUT
 #endif
 
 #if wxUSE_TREELAYOUT

diff --git a/src/html/htmlpars.cpp b/src/html/htmlpars.cpp
index 3153ef819d269f76ee4f7fbfcc13a6ff750ab095..612f74bbfe5a067f6c15e09558a9de5716bdf8b6 100644 (file)
--- a/src/html/htmlpars.cpp
+++ b/src/html/htmlpars.cpp
@@ -219,7 +219,9 @@ wxHtmlEntitiesParser::wxHtmlEntitiesParser()
 
 wxHtmlEntitiesParser::~wxHtmlEntitiesParser()
 {
 
 wxHtmlEntitiesParser::~wxHtmlEntitiesParser()
 {

+#if wxUSE_WCHAR_T && !wxUSE_UNICODE

     delete m_conv;
     delete m_conv;

+#endif

 }
 
 void wxHtmlEntitiesParser::SetEncoding(wxFontEncoding encoding)
 }
 
 void wxHtmlEntitiesParser::SetEncoding(wxFontEncoding encoding)

diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index 4c6c3e688d4efc9f2cfb1de1e6571a663eb9f547..9b25e01dc6a67edc3915c375e48b8dc220b49f8f 100644 (file)
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -25,6 +25,7 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/intl.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/intl.h"

+    #include "wx/dc.h"

 #endif
 
 #if wxUSE_HTML && wxUSE_PRINTING_ARCHITECTURE && wxUSE_STREAMS
 #endif
 
 #if wxUSE_HTML && wxUSE_PRINTING_ARCHITECTURE && wxUSE_STREAMS

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 3adeae2cb4a2f40099f74757021bedf12b638efd..7cfe66ae9e5325a3870653b86e2c5bbf4adfc865 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -115,7 +115,8 @@
     #define _WIN32_IE 0x0200
 #endif
 
     #define _WIN32_IE 0x0200
 #endif
 

-#if _WIN32_IE >= 0x0300
+#if _WIN32_IE >= 0x0300 \
+    && !( defined(__MINGW32__) && !wxCHECK_W32API_VERSION( 1, 0 ) )

     #include <shlwapi.h>
 #endif
 
     #include <shlwapi.h>
 #endif
 

diff --git a/src/msw/dialup.cpp b/src/msw/dialup.cpp
index 8e01b68a87cd127099c9727dc4c4fcf411cbb9a8..5d94d8d8dfa9ca6bfa8885a5b1b69765f82804ed 100644 (file)
--- a/src/msw/dialup.cpp
+++ b/src/msw/dialup.cpp
@@ -865,7 +865,7 @@ bool wxDialUpManagerMSW::Dial(const wxString& nameOfISP,
     if ( dwRet != 0 )
     {
         wxLogError(_("Failed to %s dialup connection: %s"),
     if ( dwRet != 0 )
     {
         wxLogError(_("Failed to %s dialup connection: %s"),

-                   async ? _("initiate") : _("establish"),
+                   wxString(async ? _("initiate") : _("establish")).c_str(),

                    GetErrorString(dwRet).c_str());
 
         // we should still call RasHangUp() if we got a non 0 connection
                    GetErrorString(dwRet).c_str());
 
         // we should still call RasHangUp() if we got a non 0 connection

diff --git a/src/msw/helpchm.cpp b/src/msw/helpchm.cpp
index b730931d20a33dcbbc12ad8d48021cd94e8b40a9..d8e5426f5aae964cafceece585900b8c44266e86 100644 (file)
--- a/src/msw/helpchm.cpp
+++ b/src/msw/helpchm.cpp
@@ -185,8 +185,8 @@ bool wxCHMHelpController::DisplayContextPopup(int contextId)
     popup.idString = contextId ;
 
     GetCursorPos(& popup.pt);
     popup.idString = contextId ;
 
     GetCursorPos(& popup.pt);

-    popup.clrForeground = -1;
-    popup.clrBackground = -1;
+    popup.clrForeground = (COLORREF)-1;
+    popup.clrBackground = (COLORREF)-1;

     popup.rcMargins.top = popup.rcMargins.left = popup.rcMargins.right = popup.rcMargins.bottom = -1;
     popup.pszFont = NULL;
     popup.pszText = NULL;
     popup.rcMargins.top = popup.rcMargins.left = popup.rcMargins.right = popup.rcMargins.bottom = -1;
     popup.pszFont = NULL;
     popup.pszText = NULL;


@@ -202,8 +202,8 @@ bool wxCHMHelpController::DisplayTextPopup(const wxString& text, const wxPoint&
     popup.hinst = (HINSTANCE) wxGetInstance();
     popup.idString = 0 ;
     popup.pt.x = pos.x; popup.pt.y = pos.y;
     popup.hinst = (HINSTANCE) wxGetInstance();
     popup.idString = 0 ;
     popup.pt.x = pos.x; popup.pt.y = pos.y;

-    popup.clrForeground = -1;
-    popup.clrBackground = -1;
+    popup.clrForeground = (COLORREF)-1;
+    popup.clrBackground = (COLORREF)-1;

     popup.rcMargins.top = popup.rcMargins.left = popup.rcMargins.right = popup.rcMargins.bottom = -1;
     popup.pszFont = NULL;
     popup.pszText = (const wxChar*) text;
     popup.rcMargins.top = popup.rcMargins.left = popup.rcMargins.right = popup.rcMargins.bottom = -1;
     popup.pszFont = NULL;
     popup.pszText = (const wxChar*) text;

diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp
index 640e15e40739d354d5503d8eea73f5ba6043877c..bbfae8f866a5d05b92e9e1ea7cc083040e59329c 100644 (file)
--- a/src/msw/slider95.cpp
+++ b/src/msw/slider95.cpp
@@ -25,6 +25,7 @@
 #ifndef WX_PRECOMP
 #include "wx/utils.h"
 #include "wx/brush.h"
 #ifndef WX_PRECOMP
 #include "wx/utils.h"
 #include "wx/brush.h"

+#include "wx/slider.h"

 #endif
 
 #ifdef __WIN95__
 #endif
 
 #ifdef __WIN95__

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 4ffad796938921f6ad15beca87d55c3419c65538..7d024387b609d2c24413d05811ad6986afcec490 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -856,7 +856,8 @@ void wxToolBar::SetRows(int nRows)
 wxSize wxToolBar::GetToolSize() const
 {
     // TB_GETBUTTONSIZE is supported from version 4.70
 wxSize wxToolBar::GetToolSize() const
 {
     // TB_GETBUTTONSIZE is supported from version 4.70

-#if defined(_WIN32_IE) && (_WIN32_IE >= 0x300 )
+#if defined(_WIN32_IE) && (_WIN32_IE >= 0x300 ) \
+    && !( defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 1, 0 ) )

     if ( wxTheApp->GetComCtl32Version() >= 470 )
     {
         DWORD dw = ::SendMessage(GetHwnd(), TB_GETBUTTONSIZE, 0, 0);
     if ( wxTheApp->GetComCtl32Version() >= 470 )
     {
         DWORD dw = ::SendMessage(GetHwnd(), TB_GETBUTTONSIZE, 0, 0);

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index b21c0ec0c0935edef5b27826884d3ed2e84151ad..18b888bb9b3d845212a004d3b14b128dfa14c684 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -2138,7 +2138,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
             }
             break;
 
             }
             break;
 

-#if defined(_WIN32_IE) && _WIN32_IE >= 0x300 && !wxUSE_COMCTL32_SAFELY
+#if defined(_WIN32_IE) && _WIN32_IE >= 0x300 && !wxUSE_COMCTL32_SAFELY && !defined(__GNUWIN32__)

         case NM_CUSTOMDRAW:
             {
                 LPNMTVCUSTOMDRAW lptvcd = (LPNMTVCUSTOMDRAW)lParam;
         case NM_CUSTOMDRAW:
             {
                 LPNMTVCUSTOMDRAW lptvcd = (LPNMTVCUSTOMDRAW)lParam;