removed Win16 code (patch 905241), last version with remains of Win16 support tagged with BEFORE_WIN16_REMOVAL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26423 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -234,11 +234,7 @@ typedef int wxWindowID;
|
||||
/* general, but there are places where you can use them to advantage */
|
||||
/* without totally breaking ports that cannot use them. If you do, then */
|
||||
/* wrap it in this guard, but such cases should still be relatively rare. */
|
||||
#ifndef __WIN16__
|
||||
#define wxUSE_NESTED_CLASSES 1
|
||||
#else
|
||||
#define wxUSE_NESTED_CLASSES 0
|
||||
#endif
|
||||
#define wxUSE_NESTED_CLASSES 1
|
||||
|
||||
/* check for explicit keyword support */
|
||||
#ifndef HAVE_EXPLICIT
|
||||
@@ -566,14 +562,8 @@ enum
|
||||
/* to ensure compatibility with 2.0, we must use long */
|
||||
#define wxCoord long
|
||||
#else /* !wxUSE_COMPATIBLE_COORD_TYPES */
|
||||
#ifdef __WIN16__
|
||||
/* under Win16, int is too small, so use long to allow for bigger */
|
||||
/* virtual canvases */
|
||||
typedef long wxCoord;
|
||||
#else /* !Win16 */
|
||||
/* other platforms we support have at least 32bit int - quite enough */
|
||||
typedef int wxCoord;
|
||||
#endif /* Win16/!Win16 */
|
||||
#endif /* wxUSE_COMPATIBLE_COORD_TYPES/!wxUSE_COMPATIBLE_COORD_TYPES */
|
||||
|
||||
|
||||
@@ -2158,17 +2148,9 @@ typedef WX_NSView WXWidget; /* wxWindows BASE definition */
|
||||
#ifdef __WXMSW__
|
||||
|
||||
/* the keywords needed for WinMain() declaration */
|
||||
#ifdef __WIN16__
|
||||
# ifdef __VISUALC__
|
||||
# define WXFAR __far
|
||||
# else
|
||||
# define WXFAR _far
|
||||
# endif
|
||||
#else /* Win32 */
|
||||
# ifndef WXFAR
|
||||
#ifndef WXFAR
|
||||
# define WXFAR
|
||||
# endif
|
||||
#endif /* Win16/32 */
|
||||
#endif
|
||||
|
||||
/* Stand-ins for Windows types to avoid #including all of windows.h */
|
||||
typedef void * WXHWND;
|
||||
|
Reference in New Issue
Block a user