X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6ebf3215ff079c11a4b8943f50a39c8e63dd4d93..6901ac371fdedbd206ba0eee5f5d3e47ffbf9663:/include/wx/defs.h diff --git a/include/wx/defs.h b/include/wx/defs.h index 183929d0f3..537c94c0d7 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -76,7 +76,7 @@ /* For VC++ 5.0 for release mode, the warning 'C4702: unreachable code */ /* is buggy, and occurs for code that does actually get executed */ # if !defined __WXDEBUG__ && __VISUALC__ <= 1100 -# pragma warning(disable:4702) /* unreachable code */ +# pragma warning(disable:4702) /* unreachable code */ # endif /* Deprecated functions such as sprintf, localtime */ @@ -1034,7 +1034,7 @@ inline void *wxUIntToPtr(wxUIntPtr p) #define wxHAS_INT64 1 -#else // !wxUSE_LONGLONG +#else /* !wxUSE_LONGLONG */ #define wxHAS_INT64 0 @@ -1526,9 +1526,11 @@ enum wxBorder /* always show an entire number of rows */ #define wxLB_INT_HEIGHT 0x0800 -/* deprecated synonyms */ -#define wxPROCESS_ENTER 0x0400 /* wxTE_PROCESS_ENTER */ -#define wxPASSWORD 0x0800 /* wxTE_PASSWORD */ +#if WXWIN_COMPATIBILITY_2_6 + /* deprecated synonyms */ + #define wxPROCESS_ENTER 0x0400 /* wxTE_PROCESS_ENTER */ + #define wxPASSWORD 0x0800 /* wxTE_PASSWORD */ +#endif /* * wxComboBox style flags @@ -2084,8 +2086,6 @@ enum wxKeyCode WXK_MENU, WXK_PAUSE, WXK_CAPITAL, - WXK_PRIOR, /* Page up */ - WXK_NEXT, /* Page down */ WXK_END, WXK_HOME, WXK_LEFT, @@ -2142,6 +2142,10 @@ enum wxKeyCode WXK_SCROLL, WXK_PAGEUP, WXK_PAGEDOWN, +#if WXWIN_COMPATIBILITY_2_6 + WXK_PRIOR = WXK_PAGEUP, + WXK_NEXT = WXK_PAGEDOWN, +#endif WXK_NUMPAD_SPACE, WXK_NUMPAD_TAB, @@ -2155,10 +2159,12 @@ enum wxKeyCode WXK_NUMPAD_UP, WXK_NUMPAD_RIGHT, WXK_NUMPAD_DOWN, - WXK_NUMPAD_PRIOR, WXK_NUMPAD_PAGEUP, - WXK_NUMPAD_NEXT, WXK_NUMPAD_PAGEDOWN, +#if WXWIN_COMPATIBILITY_2_6 + WXK_NUMPAD_PRIOR = WXK_NUMPAD_PAGEUP, + WXK_NUMPAD_NEXT = WXK_NUMPAD_PAGEDOWN, +#endif WXK_NUMPAD_END, WXK_NUMPAD_BEGIN, WXK_NUMPAD_INSERT, @@ -2873,7 +2879,10 @@ typedef GtkWidget *WXWidget; #ifdef __WXGTK20__ #define G_DISABLE_DEPRECATED #define PANGO_DISABLE_DEPRECATED -#define GTK_DISABLE_DEPRECATED +#ifndef __VMS +/* GtkCombo is not defined on VMS if this is defined */ +# define GTK_DISABLE_DEPRECATED +#endif #endif #endif /* __WXGTK__ */