Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxMSW compilation fixes for old mingw32

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5237 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-01-04 16:35:55 +00:00
parent ce96b7a010
commit e47c4d4874
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/msw/private.h
View File

@@ -80,7 +80,7 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
# endif # endif
# else # else
# if defined (__WIN32__) && defined(STRICT) # if defined (__WIN32__) && defined(STRICT)
typedef long (_stdcall * WndProcCast) (HWND, unsigned int, unsigned int, long); typedef long (_stdcall * WndProcCast) (HWND, unsigned int, unsigned int, long);
# define CASTWNDPROC (WndProcCast) # define CASTWNDPROC (WndProcCast)
# elif defined(__WIN16__) # elif defined(__WIN16__)

2
src/common/cmndata.cpp
View File

@@ -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() static wxString wxGetPrintDlgError()
{ {
DWORD err = CommDlgExtendedError(); DWORD err = CommDlgExtendedError();

6
src/msw/fontenum.cpp
View File

@@ -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 #if defined(__GNUWIN32__) && !defined(__MINGW32__)
// for Cygwin b20 (JACS)
#if (defined(__GNUWIN32_OLD__) || defined(__GNUWIN32__)) && !defined(__MINGW32__)
#define wxFONTENUMPROC int(*)(ENUMLOGFONTEX *, NEWTEXTMETRICEX*, int, LPARAM) #define wxFONTENUMPROC int(*)(ENUMLOGFONTEX *, NEWTEXTMETRICEX*, int, LPARAM)
#else #else
#define wxFONTENUMPROC FONTENUMPROC #define wxFONTENUMPROC FONTENUMEXPROC
#endif #endif
void wxFontEnumeratorHelper::DoEnumerate() void wxFontEnumeratorHelper::DoEnumerate()

4
src/msw/treectrl.cpp
View File

@@ -149,6 +149,8 @@ public:
return TRUE; return TRUE;
} }
size_t GetCount() const { return m_selections.GetCount(); }
private: private:
wxArrayTreeItemIds& m_selections; 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();
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------