Merge recent changes from 2.8 branch.
Make updates for recent changes on CVS HEAD. Remove or workaround deprecated items. Fix compile errors. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -520,8 +520,6 @@ enum {
|
||||
wxLB_EXTENDED,
|
||||
wxLB_OWNERDRAW,
|
||||
wxLB_HSCROLL,
|
||||
wxPROCESS_ENTER,
|
||||
wxPASSWORD,
|
||||
|
||||
wxCB_SIMPLE,
|
||||
wxCB_DROPDOWN,
|
||||
@@ -802,9 +800,8 @@ enum wxStretch
|
||||
wxSHAPED,
|
||||
wxFIXED_MINSIZE,
|
||||
wxTILE,
|
||||
wxADJUST_MINSIZE,
|
||||
};
|
||||
|
||||
%pythoncode { ADJUST_MINSIZE = 0 }
|
||||
|
||||
enum wxBorder
|
||||
{
|
||||
@@ -907,8 +904,6 @@ enum wxKeyCode {
|
||||
WXK_MENU,
|
||||
WXK_PAUSE,
|
||||
WXK_CAPITAL,
|
||||
WXK_PRIOR, /* Page up */
|
||||
WXK_NEXT, /* Page down */
|
||||
WXK_END,
|
||||
WXK_HOME,
|
||||
WXK_LEFT,
|
||||
@@ -978,9 +973,7 @@ enum wxKeyCode {
|
||||
WXK_NUMPAD_UP,
|
||||
WXK_NUMPAD_RIGHT,
|
||||
WXK_NUMPAD_DOWN,
|
||||
WXK_NUMPAD_PRIOR,
|
||||
WXK_NUMPAD_PAGEUP,
|
||||
WXK_NUMPAD_NEXT,
|
||||
WXK_NUMPAD_PAGEDOWN,
|
||||
WXK_NUMPAD_END,
|
||||
WXK_NUMPAD_BEGIN,
|
||||
@@ -1023,7 +1016,13 @@ enum wxKeyCode {
|
||||
WXK_SPECIAL20
|
||||
};
|
||||
|
||||
|
||||
// deprecated synonymns
|
||||
%pythoncode {
|
||||
WXK_PRIOR = WXK_PAGEUP
|
||||
WXK_NEXT = WXK_PAGEDOWN
|
||||
WXK_NUMPAD_PRIOR = WXK_NUMPAD_PAGEUP
|
||||
WXK_NUMPAD_NEXT = WXK_NUMPAD_PAGEDOWN
|
||||
}
|
||||
|
||||
typedef enum {
|
||||
wxPAPER_NONE, // Use specific dimensions
|
||||
|
||||
Reference in New Issue
Block a user