AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

some compilation fixes for mingw32 and not only

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5362 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2000-01-12 21:23:26 +00:00
parent 5e64b2b6a1
commit c5c32d72aa
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/defs.h
View File

@ -349,7 +349,6 @@ typedef int wxWindowID;
#else #else
// no stdcall under Unix nor Win16 // no stdcall under Unix nor Win16
#define wxCALLBACK #define wxCALLBACK
#endif // platform #endif // platform
// callling convention for the qsort(3) callback // callling convention for the qsort(3) callback
@ -1800,6 +1799,8 @@ typedef WXHWND WXWidget;
#define FAR _far #define FAR _far
#endif #endif
#endif // no FAR #endif // no FAR
#else // Win32
#define FAR
#endif // Win16/32 #endif // Win16/32
#endif // MSW #endif // MSW

10
src/msw/fontenum.cpp
View File

@ -110,10 +110,12 @@ bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
return TRUE; return TRUE;
} }
#if defined(__GNUWIN32__) #if defined(__GNUWIN32__)
//BJ : FIXME? I have the second implementation in 2.95. Does it work with other versions? #if defined(__MINGW32__) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95)))
// #define wxFONTENUMPROC int(*)(ENUMLOGFONTEX *, NEWTEXTMETRICEX*, int, LPARAM) #define wxFONTENUMPROC int(*)(const LOGFONTA *, const TEXTMETRICA *, long unsigned int, LPARAM)
#define wxFONTENUMPROC int(*)(const LOGFONTA *, const TEXTMETRICA *, long unsigned int, LPARAM) #else
#define wxFONTENUMPROC int(*)(ENUMLOGFONTEX *, NEWTEXTMETRICEX*, int, LPARAM)
#endif
#else #else
#define wxFONTENUMPROC FONTENUMPROC #define wxFONTENUMPROC FONTENUMPROC
#endif #endif