Merged modifications from the 2.6 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -107,6 +107,7 @@ wxSIZE_AUTO_HEIGHT = wx._core.SIZE_AUTO_HEIGHT
|
||||
wxSIZE_AUTO = wx._core.SIZE_AUTO
|
||||
wxSIZE_USE_EXISTING = wx._core.SIZE_USE_EXISTING
|
||||
wxSIZE_ALLOW_MINUS_ONE = wx._core.SIZE_ALLOW_MINUS_ONE
|
||||
wxSIZE_FORCE = wx._core.SIZE_FORCE
|
||||
wxPORTRAIT = wx._core.PORTRAIT
|
||||
wxLANDSCAPE = wx._core.LANDSCAPE
|
||||
wxPRINT_QUALITY_HIGH = wx._core.PRINT_QUALITY_HIGH
|
||||
@@ -115,6 +116,7 @@ wxPRINT_QUALITY_LOW = wx._core.PRINT_QUALITY_LOW
|
||||
wxPRINT_QUALITY_DRAFT = wx._core.PRINT_QUALITY_DRAFT
|
||||
wxID_ANY = wx._core.ID_ANY
|
||||
wxID_SEPARATOR = wx._core.ID_SEPARATOR
|
||||
wxID_NONE = wx._core.ID_NONE
|
||||
wxID_LOWEST = wx._core.ID_LOWEST
|
||||
wxID_OPEN = wx._core.ID_OPEN
|
||||
wxID_CLOSE = wx._core.ID_CLOSE
|
||||
@@ -619,8 +621,12 @@ wxHT_MAX = wx._core.HT_MAX
|
||||
wxMOD_NONE = wx._core.MOD_NONE
|
||||
wxMOD_ALT = wx._core.MOD_ALT
|
||||
wxMOD_CONTROL = wx._core.MOD_CONTROL
|
||||
wxMOD_ALTGR = wx._core.MOD_ALTGR
|
||||
wxMOD_SHIFT = wx._core.MOD_SHIFT
|
||||
wxMOD_META = wx._core.MOD_META
|
||||
wxMOD_WIN = wx._core.MOD_WIN
|
||||
wxMOD_CMD = wx._core.MOD_CMD
|
||||
wxMOD_ALL = wx._core.MOD_ALL
|
||||
wxUPDATE_UI_NONE = wx._core.UPDATE_UI_NONE
|
||||
wxUPDATE_UI_RECURSE = wx._core.UPDATE_UI_RECURSE
|
||||
wxUPDATE_UI_FROMIDLE = wx._core.UPDATE_UI_FROMIDLE
|
||||
@@ -732,6 +738,8 @@ wxIMAGE_ALPHA_THRESHOLD = wx._core.IMAGE_ALPHA_THRESHOLD
|
||||
wxIMAGE_ALPHA_OPAQUE = wx._core.IMAGE_ALPHA_OPAQUE
|
||||
wxImageHandler = wx._core.ImageHandler
|
||||
wxImageHandlerPtr = wx._core.ImageHandlerPtr
|
||||
wxPyImageHandler = wx._core.PyImageHandler
|
||||
wxPyImageHandlerPtr = wx._core.PyImageHandlerPtr
|
||||
wxImageHistogram = wx._core.ImageHistogram
|
||||
wxImageHistogramPtr = wx._core.ImageHistogramPtr
|
||||
wxImageHistogram_MakeKey = wx._core.ImageHistogram_MakeKey
|
||||
|
Reference in New Issue
Block a user