wxMSW compilation fixes for old mingw32

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

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index eac661347d680e9a51e316eada040b83220bea19..e0d3918849ef53a005ea7bf388795f1190e24875 100644 (file)
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -80,7 +80,7 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
 #  endif
 
 #  else
 #  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__)
        typedef long (_stdcall * WndProcCast) (HWND, unsigned int, unsigned int, long);
 #      define CASTWNDPROC (WndProcCast)
 #    elif defined(__WIN16__)

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index 2e5cabad1316714e533df518c076339584c3871a..c818294206cb3f1c4b1c75a17dd7860c954d06fe 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -222,7 +222,7 @@ wxPrintData::~wxPrintData()
 
 #if defined(__WXMSW__) // && defined(__WIN32__)
 
 
 #if defined(__WXMSW__) // && defined(__WIN32__)
 

-#ifdef __WIN32__
+#if defined(__WXDEBUG__) && defined(__WIN32__)

 static wxString wxGetPrintDlgError()
 {
     DWORD err = CommDlgExtendedError();
 static wxString wxGetPrintDlgError()
 {
     DWORD err = CommDlgExtendedError();

diff --git a/src/msw/fontenum.cpp b/src/msw/fontenum.cpp
index 9d7e1820d03f22e2b29584dd4cabc25585c6a901..8b9d993b14cc1ffe486b39887f3ff0870df2d868 100644 (file)
--- a/src/msw/fontenum.cpp
+++ b/src/msw/fontenum.cpp
@@ -110,12 +110,10 @@ bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
     return TRUE;
 }
 
     return TRUE;
 }
 

-// I've no idea what __GNUWIN32_OLD__ is. Anyway, I had to add the 2nd condition
-// for Cygwin b20 (JACS)
-#if (defined(__GNUWIN32_OLD__) || defined(__GNUWIN32__)) && !defined(__MINGW32__)
+#if defined(__GNUWIN32__) && !defined(__MINGW32__)

     #define wxFONTENUMPROC int(*)(ENUMLOGFONTEX *, NEWTEXTMETRICEX*, int, LPARAM)
 #else
     #define wxFONTENUMPROC int(*)(ENUMLOGFONTEX *, NEWTEXTMETRICEX*, int, LPARAM)
 #else

-    #define wxFONTENUMPROC FONTENUMPROC
+    #define wxFONTENUMPROC FONTENUMEXPROC

 #endif
 
 void wxFontEnumeratorHelper::DoEnumerate()
 #endif
 
 void wxFontEnumeratorHelper::DoEnumerate()

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index b309b707020a17e204bb96c8c965d5900ac061a1..d328e047c7ebe6bc6e02992b395072315780f130 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -149,6 +149,8 @@ public:
         return TRUE;
     }
 
         return TRUE;
     }
 

+    size_t GetCount() const { return m_selections.GetCount(); }
+

 private:
     wxArrayTreeItemIds& m_selections;
 };
 private:
     wxArrayTreeItemIds& m_selections;
 };


@@ -978,7 +980,7 @@ size_t wxTreeCtrl::GetSelections(wxArrayTreeItemIds& selections) const
 {
     TraverseSelections selector(this, selections);
 
 {
     TraverseSelections selector(this, selections);
 

-    return selections.GetCount();
+    return selector.GetCount();

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------