Added WXK_SPECIAL... keycodes for special hardware buttons

[wxWidgets.git] / wxPython / wxPython / _core.py

diff --git a/wxPython/wxPython/_core.py b/wxPython/wxPython/_core.py
index 73af7caab32110ebb7bbc48e8b90b928532f8b18..b978c59d94260b450fe53c56bad5f3f06d64756c 100644 (file)
--- a/wxPython/wxPython/_core.py
+++ b/wxPython/wxPython/_core.py
@@ -37,11 +37,6 @@ wxPOPUP_WINDOW = wx._core.POPUP_WINDOW
 wxCENTER_FRAME = wx._core.CENTER_FRAME
 wxCENTRE_ON_SCREEN = wx._core.CENTRE_ON_SCREEN
 wxCENTER_ON_SCREEN = wx._core.CENTER_ON_SCREEN
 wxCENTER_FRAME = wx._core.CENTER_FRAME
 wxCENTRE_ON_SCREEN = wx._core.CENTRE_ON_SCREEN
 wxCENTER_ON_SCREEN = wx._core.CENTER_ON_SCREEN

-wxED_CLIENT_MARGIN = wx._core.ED_CLIENT_MARGIN
-wxED_BUTTONS_BOTTOM = wx._core.ED_BUTTONS_BOTTOM
-wxED_BUTTONS_RIGHT = wx._core.ED_BUTTONS_RIGHT
-wxED_STATIC_LINE = wx._core.ED_STATIC_LINE
-wxEXT_DIALOG_STYLE = wx._core.EXT_DIALOG_STYLE

 wxCLIP_CHILDREN = wx._core.CLIP_CHILDREN
 wxCLIP_SIBLINGS = wx._core.CLIP_SIBLINGS
 wxALWAYS_SHOW_SB = wx._core.ALWAYS_SHOW_SB
 wxCLIP_CHILDREN = wx._core.CLIP_CHILDREN
 wxCLIP_SIBLINGS = wx._core.CLIP_SIBLINGS
 wxALWAYS_SHOW_SB = wx._core.ALWAYS_SHOW_SB


@@ -694,6 +689,11 @@ wxIMAGE_OPTION_BITSPERSAMPLE = wx._core.IMAGE_OPTION_BITSPERSAMPLE
 wxIMAGE_OPTION_SAMPLESPERPIXEL = wx._core.IMAGE_OPTION_SAMPLESPERPIXEL
 wxIMAGE_OPTION_COMPRESSION = wx._core.IMAGE_OPTION_COMPRESSION
 wxIMAGE_OPTION_IMAGEDESCRIPTOR = wx._core.IMAGE_OPTION_IMAGEDESCRIPTOR
 wxIMAGE_OPTION_SAMPLESPERPIXEL = wx._core.IMAGE_OPTION_SAMPLESPERPIXEL
 wxIMAGE_OPTION_COMPRESSION = wx._core.IMAGE_OPTION_COMPRESSION
 wxIMAGE_OPTION_IMAGEDESCRIPTOR = wx._core.IMAGE_OPTION_IMAGEDESCRIPTOR

+wxIMAGE_OPTION_PNG_FORMAT = wx._core.IMAGE_OPTION_PNG_FORMAT
+wxIMAGE_OPTION_PNG_BITDEPTH = wx._core.IMAGE_OPTION_PNG_BITDEPTH
+wxPNG_TYPE_COLOUR = wx._core.PNG_TYPE_COLOUR
+wxPNG_TYPE_GREY = wx._core.PNG_TYPE_GREY
+wxPNG_TYPE_GREY_RED = wx._core.PNG_TYPE_GREY_RED

 wxBMP_24BPP = wx._core.BMP_24BPP
 wxBMP_8BPP = wx._core.BMP_8BPP
 wxBMP_8BPP_GREY = wx._core.BMP_8BPP_GREY
 wxBMP_24BPP = wx._core.BMP_24BPP
 wxBMP_8BPP = wx._core.BMP_8BPP
 wxBMP_8BPP_GREY = wx._core.BMP_8BPP_GREY