Fixed duplicate definition of wxWindow::SetAcceleratorTable, more swig
code regenerated. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -428,6 +428,16 @@ wxJOY_BUTTON3 = wxc.wxJOY_BUTTON3
|
||||
wxJOY_BUTTON4 = wxc.wxJOY_BUTTON4
|
||||
wxJOY_BUTTON_ANY = wxc.wxJOY_BUTTON_ANY
|
||||
wxWS_EX_VALIDATE_RECURSIVELY = wxc.wxWS_EX_VALIDATE_RECURSIVELY
|
||||
wxMM_TEXT = wxc.wxMM_TEXT
|
||||
wxMM_LOMETRIC = wxc.wxMM_LOMETRIC
|
||||
wxMM_HIMETRIC = wxc.wxMM_HIMETRIC
|
||||
wxMM_LOENGLISH = wxc.wxMM_LOENGLISH
|
||||
wxMM_HIENGLISH = wxc.wxMM_HIENGLISH
|
||||
wxMM_TWIPS = wxc.wxMM_TWIPS
|
||||
wxMM_ISOTROPIC = wxc.wxMM_ISOTROPIC
|
||||
wxMM_ANISOTROPIC = wxc.wxMM_ANISOTROPIC
|
||||
wxMM_POINTS = wxc.wxMM_POINTS
|
||||
wxMM_METRIC = wxc.wxMM_METRIC
|
||||
wxDEFAULT = wxc.wxDEFAULT
|
||||
wxDECORATIVE = wxc.wxDECORATIVE
|
||||
wxROMAN = wxc.wxROMAN
|
||||
@@ -491,6 +501,7 @@ WXK_CANCEL = wxc.WXK_CANCEL
|
||||
WXK_MBUTTON = wxc.WXK_MBUTTON
|
||||
WXK_CLEAR = wxc.WXK_CLEAR
|
||||
WXK_SHIFT = wxc.WXK_SHIFT
|
||||
WXK_ALT = wxc.WXK_ALT
|
||||
WXK_CONTROL = wxc.WXK_CONTROL
|
||||
WXK_MENU = wxc.WXK_MENU
|
||||
WXK_PAUSE = wxc.WXK_PAUSE
|
||||
@@ -553,6 +564,33 @@ WXK_NUMLOCK = wxc.WXK_NUMLOCK
|
||||
WXK_SCROLL = wxc.WXK_SCROLL
|
||||
WXK_PAGEUP = wxc.WXK_PAGEUP
|
||||
WXK_PAGEDOWN = wxc.WXK_PAGEDOWN
|
||||
WXK_NUMPAD_SPACE = wxc.WXK_NUMPAD_SPACE
|
||||
WXK_NUMPAD_TAB = wxc.WXK_NUMPAD_TAB
|
||||
WXK_NUMPAD_ENTER = wxc.WXK_NUMPAD_ENTER
|
||||
WXK_NUMPAD_F1 = wxc.WXK_NUMPAD_F1
|
||||
WXK_NUMPAD_F2 = wxc.WXK_NUMPAD_F2
|
||||
WXK_NUMPAD_F3 = wxc.WXK_NUMPAD_F3
|
||||
WXK_NUMPAD_F4 = wxc.WXK_NUMPAD_F4
|
||||
WXK_NUMPAD_HOME = wxc.WXK_NUMPAD_HOME
|
||||
WXK_NUMPAD_LEFT = wxc.WXK_NUMPAD_LEFT
|
||||
WXK_NUMPAD_UP = wxc.WXK_NUMPAD_UP
|
||||
WXK_NUMPAD_RIGHT = wxc.WXK_NUMPAD_RIGHT
|
||||
WXK_NUMPAD_DOWN = wxc.WXK_NUMPAD_DOWN
|
||||
WXK_NUMPAD_PRIOR = wxc.WXK_NUMPAD_PRIOR
|
||||
WXK_NUMPAD_PAGEUP = wxc.WXK_NUMPAD_PAGEUP
|
||||
WXK_NUMPAD_NEXT = wxc.WXK_NUMPAD_NEXT
|
||||
WXK_NUMPAD_PAGEDOWN = wxc.WXK_NUMPAD_PAGEDOWN
|
||||
WXK_NUMPAD_END = wxc.WXK_NUMPAD_END
|
||||
WXK_NUMPAD_BEGIN = wxc.WXK_NUMPAD_BEGIN
|
||||
WXK_NUMPAD_INSERT = wxc.WXK_NUMPAD_INSERT
|
||||
WXK_NUMPAD_DELETE = wxc.WXK_NUMPAD_DELETE
|
||||
WXK_NUMPAD_EQUAL = wxc.WXK_NUMPAD_EQUAL
|
||||
WXK_NUMPAD_MULTIPLY = wxc.WXK_NUMPAD_MULTIPLY
|
||||
WXK_NUMPAD_ADD = wxc.WXK_NUMPAD_ADD
|
||||
WXK_NUMPAD_SEPARATOR = wxc.WXK_NUMPAD_SEPARATOR
|
||||
WXK_NUMPAD_SUBTRACT = wxc.WXK_NUMPAD_SUBTRACT
|
||||
WXK_NUMPAD_DECIMAL = wxc.WXK_NUMPAD_DECIMAL
|
||||
WXK_NUMPAD_DIVIDE = wxc.WXK_NUMPAD_DIVIDE
|
||||
wxBITMAP_TYPE_INVALID = wxc.wxBITMAP_TYPE_INVALID
|
||||
wxBITMAP_TYPE_BMP = wxc.wxBITMAP_TYPE_BMP
|
||||
wxBITMAP_TYPE_BMP_RESOURCE = wxc.wxBITMAP_TYPE_BMP_RESOURCE
|
||||
@@ -1393,7 +1431,7 @@ NULL = None # For backwards compatibility only. You should really be
|
||||
|
||||
wxColor = wxColour
|
||||
wxNamedColor = wxNamedColour
|
||||
|
||||
wxPen = wxPyPen
|
||||
|
||||
# backwards compatibility
|
||||
wxNoRefBitmap = wxBitmap
|
||||
|
Reference in New Issue
Block a user