reSWIGged

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36637 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

wxPython/src/gtk/_controls.py

@@ -502,6 +502,19 @@ class Choice(_core.ControlWithItems):
         """
         return _controls_.Choice_Create(*args, **kwargs)
 
+    def GetCurrentSelection(*args, **kwargs):
+        """
+        GetCurrentSelection(self) -> int
+
+        Unlike `GetSelection` which only returns the accepted selection value,
+        i.e. the selection in the control once the user closes the dropdown
+        list, this function returns the current selection.  That is, while the
+        dropdown list is shown, it returns the currently selected item in
+        it. When it is not shown, its result is the same as for the other
+        function.
+        """
+        return _controls_.Choice_GetCurrentSelection(*args, **kwargs)
+
     def GetClassDefaultAttributes(*args, **kwargs):
         """
         GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
@@ -689,6 +702,19 @@ class ComboBox(_core.Control,_core.ItemContainer):
         """
         return _controls_.ComboBox_GetMark(*args, **kwargs)
 
+    def GetCurrentSelection(*args, **kwargs):
+        """
+        GetCurrentSelection(self) -> int
+
+        Unlike `GetSelection` which only returns the accepted selection value,
+        i.e. the selection in the control once the user closes the dropdown
+        list, this function returns the current selection.  That is, while the
+        dropdown list is shown, it returns the currently selected item in
+        it. When it is not shown, its result is the same as for the other
+        function.
+        """
+        return _controls_.ComboBox_GetCurrentSelection(*args, **kwargs)
+
     def SetStringSelection(*args, **kwargs):
         """
         SetStringSelection(self, String string) -> bool
@@ -1167,6 +1193,17 @@ class StaticText(_core.Control):
         """
         return _controls_.StaticText_Create(*args, **kwargs)
 
+    def Wrap(*args, **kwargs):
+        """
+        Wrap(self, int width)
+
+        This functions wraps the control's label so that each of its lines
+        becomes at most ``width`` pixels wide if possible (the lines are
+        broken at words boundaries so it might not be the case if words are
+        too long). If ``width`` is negative, no wrapping is done.
+        """
+        return _controls_.StaticText_Wrap(*args, **kwargs)
+
     def GetClassDefaultAttributes(*args, **kwargs):
         """
         GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
@@ -3421,96 +3458,6 @@ EVT_CHOICEBOOK_PAGE_CHANGING = wx.PyEventBinder( wxEVT_COMMAND_CHOICEBOOK_PAGE_C
 
 #---------------------------------------------------------------------------
 
-class BookCtrlSizer(_core.Sizer):
-    """Proxy of C++ BookCtrlSizer class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxBookCtrlSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
-        """__init__(self, BookCtrlBase nb) -> BookCtrlSizer"""
-        newobj = _controls_.new_BookCtrlSizer(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-        self._setOORInfo(self)
-
-    def RecalcSizes(*args, **kwargs):
-        """
-        RecalcSizes(self)
-
-        Using the sizes calculated by `CalcMin` reposition and resize all the
-        items managed by this sizer.  You should not need to call this directly as
-        it is called by `Layout`.
-        """
-        return _controls_.BookCtrlSizer_RecalcSizes(*args, **kwargs)
-
-    def CalcMin(*args, **kwargs):
-        """
-        CalcMin(self) -> Size
-
-        This method is where the sizer will do the actual calculation of its
-        children's minimal sizes.  You should not need to call this directly as
-        it is called by `Layout`.
-        """
-        return _controls_.BookCtrlSizer_CalcMin(*args, **kwargs)
-
-    def GetControl(*args, **kwargs):
-        """GetControl(self) -> BookCtrlBase"""
-        return _controls_.BookCtrlSizer_GetControl(*args, **kwargs)
-
-
-class BookCtrlSizerPtr(BookCtrlSizer):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = BookCtrlSizer
-_controls_.BookCtrlSizer_swigregister(BookCtrlSizerPtr)
-
-class NotebookSizer(_core.Sizer):
-    """Proxy of C++ NotebookSizer class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxNotebookSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
-        """__init__(self, Notebook nb) -> NotebookSizer"""
-        newobj = _controls_.new_NotebookSizer(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-        self._setOORInfo(self)
-
-    def RecalcSizes(*args, **kwargs):
-        """
-        RecalcSizes(self)
-
-        Using the sizes calculated by `CalcMin` reposition and resize all the
-        items managed by this sizer.  You should not need to call this directly as
-        it is called by `Layout`.
-        """
-        return _controls_.NotebookSizer_RecalcSizes(*args, **kwargs)
-
-    def CalcMin(*args, **kwargs):
-        """
-        CalcMin(self) -> Size
-
-        This method is where the sizer will do the actual calculation of its
-        children's minimal sizes.  You should not need to call this directly as
-        it is called by `Layout`.
-        """
-        return _controls_.NotebookSizer_CalcMin(*args, **kwargs)
-
-    def GetNotebook(*args, **kwargs):
-        """GetNotebook(self) -> Notebook"""
-        return _controls_.NotebookSizer_GetNotebook(*args, **kwargs)
-
-
-class NotebookSizerPtr(NotebookSizer):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = NotebookSizer
-_controls_.NotebookSizer_swigregister(NotebookSizerPtr)
-
-NotebookSizer.__init__ = wx._deprecated(NotebookSizer.__init__, "NotebookSizer is no longer needed.") 
-BookCtrlSizer.__init__ = wx._deprecated(BookCtrlSizer.__init__, "BookCtrlSizer is no longer needed.") 
 #---------------------------------------------------------------------------
 
 TOOL_STYLE_BUTTON = _controls_.TOOL_STYLE_BUTTON
@@ -4451,16 +4398,16 @@ wxEVT_COMMAND_LIST_COL_BEGIN_DRAG = _controls_.wxEVT_COMMAND_LIST_COL_BEGIN_DRAG
 wxEVT_COMMAND_LIST_COL_DRAGGING = _controls_.wxEVT_COMMAND_LIST_COL_DRAGGING
 wxEVT_COMMAND_LIST_COL_END_DRAG = _controls_.wxEVT_COMMAND_LIST_COL_END_DRAG
 wxEVT_COMMAND_LIST_ITEM_FOCUSED = _controls_.wxEVT_COMMAND_LIST_ITEM_FOCUSED
-wxEVT_COMMAND_LIST_GET_INFO = _controls_.wxEVT_COMMAND_LIST_GET_INFO
-wxEVT_COMMAND_LIST_SET_INFO = _controls_.wxEVT_COMMAND_LIST_SET_INFO
 EVT_LIST_BEGIN_DRAG        = wx.PyEventBinder(wxEVT_COMMAND_LIST_BEGIN_DRAG       , 1)
 EVT_LIST_BEGIN_RDRAG       = wx.PyEventBinder(wxEVT_COMMAND_LIST_BEGIN_RDRAG      , 1)
 EVT_LIST_BEGIN_LABEL_EDIT  = wx.PyEventBinder(wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT , 1)
 EVT_LIST_END_LABEL_EDIT    = wx.PyEventBinder(wxEVT_COMMAND_LIST_END_LABEL_EDIT   , 1)
 EVT_LIST_DELETE_ITEM       = wx.PyEventBinder(wxEVT_COMMAND_LIST_DELETE_ITEM      , 1)
 EVT_LIST_DELETE_ALL_ITEMS  = wx.PyEventBinder(wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS , 1)
-EVT_LIST_GET_INFO          = wx.PyEventBinder(wxEVT_COMMAND_LIST_GET_INFO         , 1)
-EVT_LIST_SET_INFO          = wx.PyEventBinder(wxEVT_COMMAND_LIST_SET_INFO         , 1)
+
+
+
+
 EVT_LIST_ITEM_SELECTED     = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_SELECTED    , 1)
 EVT_LIST_ITEM_DESELECTED   = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_DESELECTED  , 1)
 EVT_LIST_KEY_DOWN          = wx.PyEventBinder(wxEVT_COMMAND_LIST_KEY_DOWN         , 1)
@@ -4476,8 +4423,9 @@ EVT_LIST_COL_DRAGGING      = wx.PyEventBinder(wxEVT_COMMAND_LIST_COL_DRAGGING
 EVT_LIST_COL_END_DRAG      = wx.PyEventBinder(wxEVT_COMMAND_LIST_COL_END_DRAG     , 1)
 EVT_LIST_ITEM_FOCUSED      = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_FOCUSED     , 1)
 
-EVT_LIST_GET_INFO = wx._deprecated(EVT_LIST_GET_INFO)
-EVT_LIST_SET_INFO = wx._deprecated(EVT_LIST_SET_INFO)
+
+
+
 
 #---------------------------------------------------------------------------
 
@@ -4807,6 +4755,14 @@ class ListCtrl(_core.Control):
         """GetItemBackgroundColour(self, long item) -> Colour"""
         return _controls_.ListCtrl_GetItemBackgroundColour(*args, **kwargs)
 
+    def SetItemFont(*args, **kwargs):
+        """SetItemFont(self, long item, Font f)"""
+        return _controls_.ListCtrl_SetItemFont(*args, **kwargs)
+
+    def GetItemFont(*args, **kwargs):
+        """GetItemFont(self, long item) -> Font"""
+        return _controls_.ListCtrl_GetItemFont(*args, **kwargs)
+
     #
     # Some helpers...
     def Select(self, idx, on=1):

wxPython/src/gtk/_core.py

@@ -161,6 +161,7 @@ SIZE_AUTO_HEIGHT = _core_.SIZE_AUTO_HEIGHT
 SIZE_AUTO = _core_.SIZE_AUTO
 SIZE_USE_EXISTING = _core_.SIZE_USE_EXISTING
 SIZE_ALLOW_MINUS_ONE = _core_.SIZE_ALLOW_MINUS_ONE
+SIZE_FORCE = _core_.SIZE_FORCE
 PORTRAIT = _core_.PORTRAIT
 LANDSCAPE = _core_.LANDSCAPE
 PRINT_QUALITY_HIGH = _core_.PRINT_QUALITY_HIGH
@@ -169,6 +170,7 @@ PRINT_QUALITY_LOW = _core_.PRINT_QUALITY_LOW
 PRINT_QUALITY_DRAFT = _core_.PRINT_QUALITY_DRAFT
 ID_ANY = _core_.ID_ANY
 ID_SEPARATOR = _core_.ID_SEPARATOR
+ID_NONE = _core_.ID_NONE
 ID_LOWEST = _core_.ID_LOWEST
 ID_OPEN = _core_.ID_OPEN
 ID_CLOSE = _core_.ID_CLOSE
@@ -673,8 +675,12 @@ HT_MAX = _core_.HT_MAX
 MOD_NONE = _core_.MOD_NONE
 MOD_ALT = _core_.MOD_ALT
 MOD_CONTROL = _core_.MOD_CONTROL
+MOD_ALTGR = _core_.MOD_ALTGR
 MOD_SHIFT = _core_.MOD_SHIFT
+MOD_META = _core_.MOD_META
 MOD_WIN = _core_.MOD_WIN
+MOD_CMD = _core_.MOD_CMD
+MOD_ALL = _core_.MOD_ALL
 UPDATE_UI_NONE = _core_.UPDATE_UI_NONE
 UPDATE_UI_RECURSE = _core_.UPDATE_UI_RECURSE
 UPDATE_UI_FROMIDLE = _core_.UPDATE_UI_FROMIDLE
@@ -2145,6 +2151,80 @@ class ImageHandlerPtr(ImageHandler):
         self.__class__ = ImageHandler
 _core_.ImageHandler_swigregister(ImageHandlerPtr)
 
+class PyImageHandler(ImageHandler):
+    """
+    This is the base class for implementing image file loading/saving, and
+    image creation from data, all written in Python.  To create a custom
+    image handler derive a new class from wx.PyImageHandler and provide
+    the following methods::
+
+        def DoCanRead(self, stream) --> bool
+            '''Check if this handler can read the image on the stream'''
+
+        def LoadFile(self, image, stream, verbose, index) --> bool
+            '''Load image data from the stream and load it into image.'''
+
+        def SaveFile(self, image, stream, verbose) --> bool
+            '''Save the iamge data in image to the stream using
+               this handler's image file format.'''
+
+        def GetImageCount(self, stream) --> int
+            '''If this image format can hold more than one image,
+               how many does the image on the stream have?'''
+
+    To activate your handler create an instance of it and pass it to
+    `wx.Image_AddHandler`.  Be sure to call `SetName`, `SetType`, and
+    `SetExtension` from your constructor.
+
+    """
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyImageHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def __init__(self, *args, **kwargs):
+        """
+        __init__(self) -> PyImageHandler
+
+        This is the base class for implementing image file loading/saving, and
+        image creation from data, all written in Python.  To create a custom
+        image handler derive a new class from wx.PyImageHandler and provide
+        the following methods::
+
+            def DoCanRead(self, stream) --> bool
+                '''Check if this handler can read the image on the stream'''
+
+            def LoadFile(self, image, stream, verbose, index) --> bool
+                '''Load image data from the stream and load it into image.'''
+
+            def SaveFile(self, image, stream, verbose) --> bool
+                '''Save the iamge data in image to the stream using
+                   this handler's image file format.'''
+
+            def GetImageCount(self, stream) --> int
+                '''If this image format can hold more than one image,
+                   how many does the image on the stream have?'''
+
+        To activate your handler create an instance of it and pass it to
+        `wx.Image_AddHandler`.  Be sure to call `SetName`, `SetType`, and
+        `SetExtension` from your constructor.
+
+        """
+        newobj = _core_.new_PyImageHandler(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+        self._SetSelf(self)
+
+    def _SetSelf(*args, **kwargs):
+        """_SetSelf(self, PyObject self)"""
+        return _core_.PyImageHandler__SetSelf(*args, **kwargs)
+
+
+class PyImageHandlerPtr(PyImageHandler):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = PyImageHandler
+_core_.PyImageHandler_swigregister(PyImageHandlerPtr)
+
 class ImageHistogram(object):
     """Proxy of C++ ImageHistogram class"""
     def __repr__(self):
@@ -2215,6 +2295,66 @@ def ImageHistogram_MakeKey(*args, **kwargs):
     """
     return _core_.ImageHistogram_MakeKey(*args, **kwargs)
 
+class Image_RGBValue(object):
+    """
+    An object that contains values for red, green and blue which represent
+    the value of a color. It is used by `wx.Image.HSVtoRGB` and
+    `wx.Image.RGBtoHSV`, which converts between HSV color space and RGB
+    color space.
+    """
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxImage_RGBValue instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def __init__(self, *args, **kwargs):
+        """
+        __init__(self, byte r=0, byte g=0, byte b=0) -> Image_RGBValue
+
+        Constructor.
+        """
+        newobj = _core_.new_Image_RGBValue(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+    red = property(_core_.Image_RGBValue_red_get, _core_.Image_RGBValue_red_set)
+    green = property(_core_.Image_RGBValue_green_get, _core_.Image_RGBValue_green_set)
+    blue = property(_core_.Image_RGBValue_blue_get, _core_.Image_RGBValue_blue_set)
+
+class Image_RGBValuePtr(Image_RGBValue):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = Image_RGBValue
+_core_.Image_RGBValue_swigregister(Image_RGBValuePtr)
+
+class Image_HSVValue(object):
+    """
+    An object that contains values for hue, saturation and value which
+    represent the value of a color.  It is used by `wx.Image.HSVtoRGB` and
+    `wx.Image.RGBtoHSV`, which +converts between HSV color space and RGB
+    color space.
+    """
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxImage_HSVValue instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def __init__(self, *args, **kwargs):
+        """
+        __init__(self, double h=0.0, double s=0.0, double v=0.0) -> Image_HSVValue
+
+        Constructor.
+        """
+        newobj = _core_.new_Image_HSVValue(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+    hue = property(_core_.Image_HSVValue_hue_get, _core_.Image_HSVValue_hue_set)
+    saturation = property(_core_.Image_HSVValue_saturation_get, _core_.Image_HSVValue_saturation_set)
+    value = property(_core_.Image_HSVValue_value_get, _core_.Image_HSVValue_value_set)
+
+class Image_HSVValuePtr(Image_HSVValue):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = Image_HSVValue
+_core_.Image_HSVValue_swigregister(Image_HSVValuePtr)
+
 class Image(Object):
     """
     A platform-independent image class.  An image can be created from
@@ -2892,6 +3032,33 @@ class Image(Object):
         """ConvertToMonoBitmap(self, byte red, byte green, byte blue) -> Bitmap"""
         return _core_.Image_ConvertToMonoBitmap(*args, **kwargs)
 
+    def RotateHue(*args, **kwargs):
+        """
+        RotateHue(self, double angle)
+
+        Rotates the hue of each pixel of the image. Hue is a double in the
+        range -1.0..1.0 where -1.0 is -360 degrees and 1.0 is 360 degrees
+        """
+        return _core_.Image_RotateHue(*args, **kwargs)
+
+    def RGBtoHSV(*args, **kwargs):
+        """
+        RGBtoHSV(Image_RGBValue rgb) -> Image_HSVValue
+
+        Converts a color in RGB color space to HSV color space.
+        """
+        return _core_.Image_RGBtoHSV(*args, **kwargs)
+
+    RGBtoHSV = staticmethod(RGBtoHSV)
+    def HSVtoRGB(*args, **kwargs):
+        """
+        HSVtoRGB(Image_HSVValue hsv) -> Image_RGBValue
+
+        Converts a color in HSV color space to RGB color space.
+        """
+        return _core_.Image_HSVtoRGB(*args, **kwargs)
+
+    HSVtoRGB = staticmethod(HSVtoRGB)
     def __nonzero__(self): return self.Ok() 
 
 class ImagePtr(Image):
@@ -3030,6 +3197,22 @@ def Image_GetImageExtWildcard(*args, **kwargs):
     """
     return _core_.Image_GetImageExtWildcard(*args, **kwargs)
 
+def Image_RGBtoHSV(*args, **kwargs):
+    """
+    Image_RGBtoHSV(Image_RGBValue rgb) -> Image_HSVValue
+
+    Converts a color in RGB color space to HSV color space.
+    """
+    return _core_.Image_RGBtoHSV(*args, **kwargs)
+
+def Image_HSVtoRGB(*args, **kwargs):
+    """
+    Image_HSVtoRGB(Image_HSVValue hsv) -> Image_RGBValue
+
+    Converts a color in HSV color space to RGB color space.
+    """
+    return _core_.Image_HSVtoRGB(*args, **kwargs)
+
 def InitAllImageHandlers():
     """
     The former functionality of InitAllImageHanders is now done internal to
@@ -6399,8 +6582,15 @@ _core_.WindowCreateEvent_swigregister(WindowCreateEventPtr)
 
 class WindowDestroyEvent(CommandEvent):
     """
-    The EVT_WINDOW_DESTROY event is sent right before the window is
-    destroyed.
+    The EVT_WINDOW_DESTROY event is sent from the `wx.Window` destructor
+    when the GUI window is destroyed.
+
+    When a class derived from `wx.Window` is destroyed its destructor will
+    have already run by the time this event is sent. Therefore this event
+    will not usually be received at all by the window itself.  Since it is
+    received after the destructor has run, an object should not try to
+    handle its own wx.WindowDestroyEvent, but it can be used to get
+    notification of the destruction of another window.
     """
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxWindowDestroyEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
@@ -6408,8 +6598,15 @@ class WindowDestroyEvent(CommandEvent):
         """
         __init__(self, Window win=None) -> WindowDestroyEvent
 
-        The EVT_WINDOW_DESTROY event is sent right before the window is
-        destroyed.
+        The EVT_WINDOW_DESTROY event is sent from the `wx.Window` destructor
+        when the GUI window is destroyed.
+
+        When a class derived from `wx.Window` is destroyed its destructor will
+        have already run by the time this event is sent. Therefore this event
+        will not usually be received at all by the window itself.  Since it is
+        received after the destructor has run, an object should not try to
+        handle its own wx.WindowDestroyEvent, but it can be used to get
+        notification of the destruction of another window.
         """
         newobj = _core_.new_WindowDestroyEvent(*args, **kwargs)
         self.this = newobj.this
@@ -7897,22 +8094,6 @@ class Window(EvtHandler):
         """
         return _core_.Window_IsBeingDeleted(*args, **kwargs)
 
-    def SetTitle(*args, **kwargs):
-        """
-        SetTitle(self, String title)
-
-        Sets the window's title. Applicable only to frames and dialogs.
-        """
-        return _core_.Window_SetTitle(*args, **kwargs)
-
-    def GetTitle(*args, **kwargs):
-        """
-        GetTitle(self) -> String
-
-        Gets the window's title. Applicable only to frames and dialogs.
-        """
-        return _core_.Window_GetTitle(*args, **kwargs)
-
     def SetLabel(*args, **kwargs):
         """
         SetLabel(self, String label)
@@ -8092,8 +8273,8 @@ class Window(EvtHandler):
         """
         Raise(self)
 
-        Raises the window to the top of the window hierarchy if it is a
-        managed window (dialog or frame).
+        Raises the window to the top of the window hierarchy.  In current
+        version of wxWidgets this works both for manage and child windows.
         """
         return _core_.Window_Raise(*args, **kwargs)
 
@@ -8101,8 +8282,8 @@ class Window(EvtHandler):
         """
         Lower(self)
 
-        Lowers the window to the bottom of the window hierarchy if it is a
-        managed window (dialog or frame).
+        Lowers the window to the bottom of the window hierarchy.  In current
+        version of wxWidgets this works both for manage and child windows.
         """
         return _core_.Window_Lower(*args, **kwargs)
 

wxPython/src/gtk/_gdi.py

@@ -1597,10 +1597,6 @@ class FontMapper(object):
         return _gdi_.FontMapper_GetEncodingFromName(*args, **kwargs)
 
     GetEncodingFromName = staticmethod(GetEncodingFromName)
-    def SetConfig(*args, **kwargs):
-        """SetConfig(self, ConfigBase config)"""
-        return _gdi_.FontMapper_SetConfig(*args, **kwargs)
-
     def SetConfigPath(*args, **kwargs):
         """SetConfigPath(self, String prefix)"""
         return _gdi_.FontMapper_SetConfigPath(*args, **kwargs)

wxPython/src/gtk/_misc.py

@@ -348,7 +348,7 @@ def GetOsDescription(*args, **kwargs):
     return _misc_.GetOsDescription(*args, **kwargs)
 
 def GetFreeMemory(*args, **kwargs):
-    """GetFreeMemory() -> long"""
+    """GetFreeMemory() -> wxMemorySize"""
     return _misc_.GetFreeMemory(*args, **kwargs)
 SHUTDOWN_POWEROFF = _misc_.SHUTDOWN_POWEROFF
 SHUTDOWN_REBOOT = _misc_.SHUTDOWN_REBOOT
@@ -486,14 +486,6 @@ def MessageBox(*args, **kwargs):
     """
     return _misc_.MessageBox(*args, **kwargs)
 
-def GetNumberFromUser(*args, **kwargs):
-    """
-    GetNumberFromUser(String message, String prompt, String caption, long value, 
-        long min=0, long max=100, Window parent=None, 
-        Point pos=DefaultPosition) -> long
-    """
-    return _misc_.GetNumberFromUser(*args, **kwargs)
-
 def ColourDisplay(*args, **kwargs):
     """ColourDisplay() -> bool"""
     return _misc_.ColourDisplay(*args, **kwargs)
@@ -3681,6 +3673,22 @@ class DateTime(object):
         """MakeTimezone(self, wxDateTime::TimeZone tz, bool noDST=False) -> DateTime"""
         return _misc_.DateTime_MakeTimezone(*args, **kwargs)
 
+    def FromTimezone(*args, **kwargs):
+        """FromTimezone(self, wxDateTime::TimeZone tz, bool noDST=False) -> DateTime"""
+        return _misc_.DateTime_FromTimezone(*args, **kwargs)
+
+    def MakeFromTimezone(*args, **kwargs):
+        """MakeFromTimezone(self, wxDateTime::TimeZone tz, bool noDST=False) -> DateTime"""
+        return _misc_.DateTime_MakeFromTimezone(*args, **kwargs)
+
+    def ToUTC(*args, **kwargs):
+        """ToUTC(self, bool noDST=False) -> DateTime"""
+        return _misc_.DateTime_ToUTC(*args, **kwargs)
+
+    def MakeUTC(*args, **kwargs):
+        """MakeUTC(self, bool noDST=False) -> DateTime"""
+        return _misc_.DateTime_MakeUTC(*args, **kwargs)
+
     def ToGMT(*args, **kwargs):
         """ToGMT(self, bool noDST=False) -> DateTime"""
         return _misc_.DateTime_ToGMT(*args, **kwargs)
@@ -3689,6 +3697,14 @@ class DateTime(object):
         """MakeGMT(self, bool noDST=False) -> DateTime"""
         return _misc_.DateTime_MakeGMT(*args, **kwargs)
 
+    def FromUTC(*args, **kwargs):
+        """FromUTC(self, bool noDST=False) -> DateTime"""
+        return _misc_.DateTime_FromUTC(*args, **kwargs)
+
+    def MakeFromUTC(*args, **kwargs):
+        """MakeFromUTC(self, bool noDST=False) -> DateTime"""
+        return _misc_.DateTime_MakeFromUTC(*args, **kwargs)
+
     def IsDST(*args, **kwargs):
         """IsDST(self, int country=Country_Default) -> int"""
         return _misc_.DateTime_IsDST(*args, **kwargs)
@@ -5621,7 +5637,8 @@ class _wxPyDelayedInitWrapper(object):
         self._instance = None
     def _checkInstance(self):
         if self._instance is None:
-            self._instance = self._initfunc(*self._args, **self._kwargs)        
+            if wx.GetApp():
+                self._instance = self._initfunc(*self._args, **self._kwargs)        
     def __getattr__(self, name):
         self._checkInstance()
         return getattr(self._instance, name)

wxPython/src/gtk/_windows.py

@@ -413,19 +413,11 @@ class TopLevelWindow(_core.Window):
         return _windows_.TopLevelWindow_IsFullScreen(*args, **kwargs)
 
     def SetTitle(*args, **kwargs):
-        """
-        SetTitle(self, String title)
-
-        Sets the window's title. Applicable only to frames and dialogs.
-        """
+        """SetTitle(self, String title)"""
         return _windows_.TopLevelWindow_SetTitle(*args, **kwargs)
 
     def GetTitle(*args, **kwargs):
-        """
-        GetTitle(self) -> String
-
-        Gets the window's title. Applicable only to frames and dialogs.
-        """
+        """GetTitle(self) -> String"""
         return _windows_.TopLevelWindow_GetTitle(*args, **kwargs)
 
     def SetShape(*args, **kwargs):
@@ -4027,78 +4019,6 @@ class PrintData(_core.Object):
         """SetPrivData(self, PyObject data)"""
         return _windows_.PrintData_SetPrivData(*args, **kwargs)
 
-    def GetPrinterCommand(*args, **kwargs):
-        """GetPrinterCommand(self) -> String"""
-        return _windows_.PrintData_GetPrinterCommand(*args, **kwargs)
-
-    def GetPrinterOptions(*args, **kwargs):
-        """GetPrinterOptions(self) -> String"""
-        return _windows_.PrintData_GetPrinterOptions(*args, **kwargs)
-
-    def GetPreviewCommand(*args, **kwargs):
-        """GetPreviewCommand(self) -> String"""
-        return _windows_.PrintData_GetPreviewCommand(*args, **kwargs)
-
-    def GetFontMetricPath(*args, **kwargs):
-        """GetFontMetricPath(self) -> String"""
-        return _windows_.PrintData_GetFontMetricPath(*args, **kwargs)
-
-    def GetPrinterScaleX(*args, **kwargs):
-        """GetPrinterScaleX(self) -> double"""
-        return _windows_.PrintData_GetPrinterScaleX(*args, **kwargs)
-
-    def GetPrinterScaleY(*args, **kwargs):
-        """GetPrinterScaleY(self) -> double"""
-        return _windows_.PrintData_GetPrinterScaleY(*args, **kwargs)
-
-    def GetPrinterTranslateX(*args, **kwargs):
-        """GetPrinterTranslateX(self) -> long"""
-        return _windows_.PrintData_GetPrinterTranslateX(*args, **kwargs)
-
-    def GetPrinterTranslateY(*args, **kwargs):
-        """GetPrinterTranslateY(self) -> long"""
-        return _windows_.PrintData_GetPrinterTranslateY(*args, **kwargs)
-
-    def SetPrinterCommand(*args, **kwargs):
-        """SetPrinterCommand(self, String command)"""
-        return _windows_.PrintData_SetPrinterCommand(*args, **kwargs)
-
-    def SetPrinterOptions(*args, **kwargs):
-        """SetPrinterOptions(self, String options)"""
-        return _windows_.PrintData_SetPrinterOptions(*args, **kwargs)
-
-    def SetPreviewCommand(*args, **kwargs):
-        """SetPreviewCommand(self, String command)"""
-        return _windows_.PrintData_SetPreviewCommand(*args, **kwargs)
-
-    def SetFontMetricPath(*args, **kwargs):
-        """SetFontMetricPath(self, String path)"""
-        return _windows_.PrintData_SetFontMetricPath(*args, **kwargs)
-
-    def SetPrinterScaleX(*args, **kwargs):
-        """SetPrinterScaleX(self, double x)"""
-        return _windows_.PrintData_SetPrinterScaleX(*args, **kwargs)
-
-    def SetPrinterScaleY(*args, **kwargs):
-        """SetPrinterScaleY(self, double y)"""
-        return _windows_.PrintData_SetPrinterScaleY(*args, **kwargs)
-
-    def SetPrinterScaling(*args, **kwargs):
-        """SetPrinterScaling(self, double x, double y)"""
-        return _windows_.PrintData_SetPrinterScaling(*args, **kwargs)
-
-    def SetPrinterTranslateX(*args, **kwargs):
-        """SetPrinterTranslateX(self, long x)"""
-        return _windows_.PrintData_SetPrinterTranslateX(*args, **kwargs)
-
-    def SetPrinterTranslateY(*args, **kwargs):
-        """SetPrinterTranslateY(self, long y)"""
-        return _windows_.PrintData_SetPrinterTranslateY(*args, **kwargs)
-
-    def SetPrinterTranslation(*args, **kwargs):
-        """SetPrinterTranslation(self, long x, long y)"""
-        return _windows_.PrintData_SetPrinterTranslation(*args, **kwargs)
-
 
 class PrintDataPtr(PrintData):
     def __init__(self, this):
@@ -4348,14 +4268,6 @@ class PrintDialogData(_core.Object):
         """GetPrintToFile(self) -> bool"""
         return _windows_.PrintDialogData_GetPrintToFile(*args, **kwargs)
 
-    def GetSetupDialog(*args, **kwargs):
-        """GetSetupDialog(self) -> bool"""
-        return _windows_.PrintDialogData_GetSetupDialog(*args, **kwargs)
-
-    def SetSetupDialog(*args, **kwargs):
-        """SetSetupDialog(self, bool flag)"""
-        return _windows_.PrintDialogData_SetSetupDialog(*args, **kwargs)
-
     def SetFromPage(*args, **kwargs):
         """SetFromPage(self, int v)"""
         return _windows_.PrintDialogData_SetFromPage(*args, **kwargs)

wxPython/src/gtk/html.py

@@ -1079,9 +1079,9 @@ class HtmlWindow(_windows.ScrolledWindow):
         """SetStandardFonts(self, int size=-1, String normal_face=EmptyString, String fixed_face=EmptyString)"""
         return _html.HtmlWindow_SetStandardFonts(*args, **kwargs)
 
-    def SetTitle(*args, **kwargs):
-        """SetTitle(self, String title)"""
-        return _html.HtmlWindow_SetTitle(*args, **kwargs)
+    def SetLabel(*args, **kwargs):
+        """SetLabel(self, String title)"""
+        return _html.HtmlWindow_SetLabel(*args, **kwargs)
 
     def SetBorders(*args, **kwargs):
         """SetBorders(self, int b)"""
@@ -1488,39 +1488,6 @@ class HtmlBookRecordPtr(HtmlBookRecord):
         self.__class__ = HtmlBookRecord
 _html.HtmlBookRecord_swigregister(HtmlBookRecordPtr)
 
-class HtmlContentsItem(object):
-    """Proxy of C++ HtmlContentsItem class"""
-    def __init__(self): raise RuntimeError, "No constructor defined"
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxHtmlContentsItem instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def GetLevel(*args, **kwargs):
-        """GetLevel(self) -> int"""
-        return _html.HtmlContentsItem_GetLevel(*args, **kwargs)
-
-    def GetID(*args, **kwargs):
-        """GetID(self) -> int"""
-        return _html.HtmlContentsItem_GetID(*args, **kwargs)
-
-    def GetName(*args, **kwargs):
-        """GetName(self) -> String"""
-        return _html.HtmlContentsItem_GetName(*args, **kwargs)
-
-    def GetPage(*args, **kwargs):
-        """GetPage(self) -> String"""
-        return _html.HtmlContentsItem_GetPage(*args, **kwargs)
-
-    def GetBook(*args, **kwargs):
-        """GetBook(self) -> HtmlBookRecord"""
-        return _html.HtmlContentsItem_GetBook(*args, **kwargs)
-
-
-class HtmlContentsItemPtr(HtmlContentsItem):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = HtmlContentsItem
-_html.HtmlContentsItem_swigregister(HtmlContentsItemPtr)
-
 class HtmlSearchStatus(object):
     """Proxy of C++ HtmlSearchStatus class"""
     def __init__(self): raise RuntimeError, "No constructor defined"
@@ -1546,10 +1513,6 @@ class HtmlSearchStatus(object):
         """GetName(self) -> String"""
         return _html.HtmlSearchStatus_GetName(*args, **kwargs)
 
-    def GetContentsItem(*args, **kwargs):
-        """GetContentsItem(self) -> HtmlContentsItem"""
-        return _html.HtmlSearchStatus_GetContentsItem(*args, **kwargs)
-
 
 class HtmlSearchStatusPtr(HtmlSearchStatus):
     def __init__(self, this):
@@ -1594,22 +1557,6 @@ class HtmlHelpData(object):
         """GetBookRecArray(self) -> wxHtmlBookRecArray"""
         return _html.HtmlHelpData_GetBookRecArray(*args, **kwargs)
 
-    def GetContents(*args, **kwargs):
-        """GetContents(self) -> HtmlContentsItem"""
-        return _html.HtmlHelpData_GetContents(*args, **kwargs)
-
-    def GetContentsCnt(*args, **kwargs):
-        """GetContentsCnt(self) -> int"""
-        return _html.HtmlHelpData_GetContentsCnt(*args, **kwargs)
-
-    def GetIndex(*args, **kwargs):
-        """GetIndex(self) -> HtmlContentsItem"""
-        return _html.HtmlHelpData_GetIndex(*args, **kwargs)
-
-    def GetIndexCnt(*args, **kwargs):
-        """GetIndexCnt(self) -> int"""
-        return _html.HtmlHelpData_GetIndexCnt(*args, **kwargs)
-
 
 class HtmlHelpDataPtr(HtmlHelpData):
     def __init__(self, this):

wxPython/src/gtk/media.py

@@ -112,22 +112,6 @@ class MediaCtrl(_core.Control):
         """Stop(self) -> bool"""
         return _media.MediaCtrl_Stop(*args, **kwargs)
 
-    def GetVolume(*args, **kwargs):
-        """GetVolume(self) -> double"""
-        return _media.MediaCtrl_GetVolume(*args, **kwargs)
-
-    def SetVolume(*args, **kwargs):
-        """SetVolume(self, double dVolume) -> bool"""
-        return _media.MediaCtrl_SetVolume(*args, **kwargs)
-
-    def Load(*args, **kwargs):
-        """Load(self, String fileName) -> bool"""
-        return _media.MediaCtrl_Load(*args, **kwargs)
-
-    def LoadFromURI(*args, **kwargs):
-        """LoadFromURI(self, String location) -> bool"""
-        return _media.MediaCtrl_LoadFromURI(*args, **kwargs)
-
     def GetState(*args, **kwargs):
         """GetState(self) -> int"""
         return _media.MediaCtrl_GetState(*args, **kwargs)
@@ -152,6 +136,31 @@ class MediaCtrl(_core.Control):
         """Length(self) -> wxFileOffset"""
         return _media.MediaCtrl_Length(*args, **kwargs)
 
+    def GetVolume(*args, **kwargs):
+        """GetVolume(self) -> double"""
+        return _media.MediaCtrl_GetVolume(*args, **kwargs)
+
+    def SetVolume(*args, **kwargs):
+        """SetVolume(self, double dVolume) -> bool"""
+        return _media.MediaCtrl_SetVolume(*args, **kwargs)
+
+    def ShowPlayerControls(*args, **kwargs):
+        """ShowPlayerControls(self, wxMediaCtrlPlayerControls flags=wxMEDIACTRLPLAYERCONTROLS_DEFAULT) -> bool"""
+        return _media.MediaCtrl_ShowPlayerControls(*args, **kwargs)
+
+    def Load(*args, **kwargs):
+        """Load(self, String fileName) -> bool"""
+        return _media.MediaCtrl_Load(*args, **kwargs)
+
+    def LoadURI(*args, **kwargs):
+        """LoadURI(self, String fileName) -> bool"""
+        return _media.MediaCtrl_LoadURI(*args, **kwargs)
+
+    def LoadURIWithProxy(*args, **kwargs):
+        """LoadURIWithProxy(self, String fileName, String proxy) -> bool"""
+        return _media.MediaCtrl_LoadURIWithProxy(*args, **kwargs)
+
+    LoadFromURI = LoadURI 
 
 class MediaCtrlPtr(MediaCtrl):
     def __init__(self, this):

wxPython/src/gtk/xrc.py

@@ -87,6 +87,10 @@ class XmlResource(_core.Object):
         """LoadFromString(self, String data) -> bool"""
         return _xrc.XmlResource_LoadFromString(*args, **kwargs)
 
+    def Unload(*args, **kwargs):
+        """Unload(self, String filename) -> bool"""
+        return _xrc.XmlResource_Unload(*args, **kwargs)
+
     def InitAllHandlers(*args, **kwargs):
         """InitAllHandlers(self)"""
         return _xrc.XmlResource_InitAllHandlers(*args, **kwargs)

wxPython/src/mac/_controls.py

@@ -502,6 +502,19 @@ class Choice(_core.ControlWithItems):
         """
         return _controls_.Choice_Create(*args, **kwargs)
 
+    def GetCurrentSelection(*args, **kwargs):
+        """
+        GetCurrentSelection(self) -> int
+
+        Unlike `GetSelection` which only returns the accepted selection value,
+        i.e. the selection in the control once the user closes the dropdown
+        list, this function returns the current selection.  That is, while the
+        dropdown list is shown, it returns the currently selected item in
+        it. When it is not shown, its result is the same as for the other
+        function.
+        """
+        return _controls_.Choice_GetCurrentSelection(*args, **kwargs)
+
     def GetClassDefaultAttributes(*args, **kwargs):
         """
         GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
@@ -680,6 +693,19 @@ class ComboBox(_core.Control,_core.ItemContainer):
         """
         return _controls_.ComboBox_SetMark(*args, **kwargs)
 
+    def GetCurrentSelection(*args, **kwargs):
+        """
+        GetCurrentSelection(self) -> int
+
+        Unlike `GetSelection` which only returns the accepted selection value,
+        i.e. the selection in the control once the user closes the dropdown
+        list, this function returns the current selection.  That is, while the
+        dropdown list is shown, it returns the currently selected item in
+        it. When it is not shown, its result is the same as for the other
+        function.
+        """
+        return _controls_.ComboBox_GetCurrentSelection(*args, **kwargs)
+
     def SetStringSelection(*args, **kwargs):
         """
         SetStringSelection(self, String string) -> bool
@@ -1158,6 +1184,17 @@ class StaticText(_core.Control):
         """
         return _controls_.StaticText_Create(*args, **kwargs)
 
+    def Wrap(*args, **kwargs):
+        """
+        Wrap(self, int width)
+
+        This functions wraps the control's label so that each of its lines
+        becomes at most ``width`` pixels wide if possible (the lines are
+        broken at words boundaries so it might not be the case if words are
+        too long). If ``width`` is negative, no wrapping is done.
+        """
+        return _controls_.StaticText_Wrap(*args, **kwargs)
+
     def GetClassDefaultAttributes(*args, **kwargs):
         """
         GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
@@ -3408,96 +3445,6 @@ EVT_CHOICEBOOK_PAGE_CHANGING = wx.PyEventBinder( wxEVT_COMMAND_CHOICEBOOK_PAGE_C
 
 #---------------------------------------------------------------------------
 
-class BookCtrlSizer(_core.Sizer):
-    """Proxy of C++ BookCtrlSizer class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxBookCtrlSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
-        """__init__(self, BookCtrlBase nb) -> BookCtrlSizer"""
-        newobj = _controls_.new_BookCtrlSizer(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-        self._setOORInfo(self)
-
-    def RecalcSizes(*args, **kwargs):
-        """
-        RecalcSizes(self)
-
-        Using the sizes calculated by `CalcMin` reposition and resize all the
-        items managed by this sizer.  You should not need to call this directly as
-        it is called by `Layout`.
-        """
-        return _controls_.BookCtrlSizer_RecalcSizes(*args, **kwargs)
-
-    def CalcMin(*args, **kwargs):
-        """
-        CalcMin(self) -> Size
-
-        This method is where the sizer will do the actual calculation of its
-        children's minimal sizes.  You should not need to call this directly as
-        it is called by `Layout`.
-        """
-        return _controls_.BookCtrlSizer_CalcMin(*args, **kwargs)
-
-    def GetControl(*args, **kwargs):
-        """GetControl(self) -> BookCtrlBase"""
-        return _controls_.BookCtrlSizer_GetControl(*args, **kwargs)
-
-
-class BookCtrlSizerPtr(BookCtrlSizer):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = BookCtrlSizer
-_controls_.BookCtrlSizer_swigregister(BookCtrlSizerPtr)
-
-class NotebookSizer(_core.Sizer):
-    """Proxy of C++ NotebookSizer class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxNotebookSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
-        """__init__(self, Notebook nb) -> NotebookSizer"""
-        newobj = _controls_.new_NotebookSizer(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-        self._setOORInfo(self)
-
-    def RecalcSizes(*args, **kwargs):
-        """
-        RecalcSizes(self)
-
-        Using the sizes calculated by `CalcMin` reposition and resize all the
-        items managed by this sizer.  You should not need to call this directly as
-        it is called by `Layout`.
-        """
-        return _controls_.NotebookSizer_RecalcSizes(*args, **kwargs)
-
-    def CalcMin(*args, **kwargs):
-        """
-        CalcMin(self) -> Size
-
-        This method is where the sizer will do the actual calculation of its
-        children's minimal sizes.  You should not need to call this directly as
-        it is called by `Layout`.
-        """
-        return _controls_.NotebookSizer_CalcMin(*args, **kwargs)
-
-    def GetNotebook(*args, **kwargs):
-        """GetNotebook(self) -> Notebook"""
-        return _controls_.NotebookSizer_GetNotebook(*args, **kwargs)
-
-
-class NotebookSizerPtr(NotebookSizer):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = NotebookSizer
-_controls_.NotebookSizer_swigregister(NotebookSizerPtr)
-
-NotebookSizer.__init__ = wx._deprecated(NotebookSizer.__init__, "NotebookSizer is no longer needed.") 
-BookCtrlSizer.__init__ = wx._deprecated(BookCtrlSizer.__init__, "BookCtrlSizer is no longer needed.") 
 #---------------------------------------------------------------------------
 
 TOOL_STYLE_BUTTON = _controls_.TOOL_STYLE_BUTTON
@@ -4438,16 +4385,16 @@ wxEVT_COMMAND_LIST_COL_BEGIN_DRAG = _controls_.wxEVT_COMMAND_LIST_COL_BEGIN_DRAG
 wxEVT_COMMAND_LIST_COL_DRAGGING = _controls_.wxEVT_COMMAND_LIST_COL_DRAGGING
 wxEVT_COMMAND_LIST_COL_END_DRAG = _controls_.wxEVT_COMMAND_LIST_COL_END_DRAG
 wxEVT_COMMAND_LIST_ITEM_FOCUSED = _controls_.wxEVT_COMMAND_LIST_ITEM_FOCUSED
-wxEVT_COMMAND_LIST_GET_INFO = _controls_.wxEVT_COMMAND_LIST_GET_INFO
-wxEVT_COMMAND_LIST_SET_INFO = _controls_.wxEVT_COMMAND_LIST_SET_INFO
 EVT_LIST_BEGIN_DRAG        = wx.PyEventBinder(wxEVT_COMMAND_LIST_BEGIN_DRAG       , 1)
 EVT_LIST_BEGIN_RDRAG       = wx.PyEventBinder(wxEVT_COMMAND_LIST_BEGIN_RDRAG      , 1)
 EVT_LIST_BEGIN_LABEL_EDIT  = wx.PyEventBinder(wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT , 1)
 EVT_LIST_END_LABEL_EDIT    = wx.PyEventBinder(wxEVT_COMMAND_LIST_END_LABEL_EDIT   , 1)
 EVT_LIST_DELETE_ITEM       = wx.PyEventBinder(wxEVT_COMMAND_LIST_DELETE_ITEM      , 1)
 EVT_LIST_DELETE_ALL_ITEMS  = wx.PyEventBinder(wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS , 1)
-EVT_LIST_GET_INFO          = wx.PyEventBinder(wxEVT_COMMAND_LIST_GET_INFO         , 1)
-EVT_LIST_SET_INFO          = wx.PyEventBinder(wxEVT_COMMAND_LIST_SET_INFO         , 1)
+
+
+
+
 EVT_LIST_ITEM_SELECTED     = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_SELECTED    , 1)
 EVT_LIST_ITEM_DESELECTED   = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_DESELECTED  , 1)
 EVT_LIST_KEY_DOWN          = wx.PyEventBinder(wxEVT_COMMAND_LIST_KEY_DOWN         , 1)
@@ -4463,8 +4410,9 @@ EVT_LIST_COL_DRAGGING      = wx.PyEventBinder(wxEVT_COMMAND_LIST_COL_DRAGGING
 EVT_LIST_COL_END_DRAG      = wx.PyEventBinder(wxEVT_COMMAND_LIST_COL_END_DRAG     , 1)
 EVT_LIST_ITEM_FOCUSED      = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_FOCUSED     , 1)
 
-EVT_LIST_GET_INFO = wx._deprecated(EVT_LIST_GET_INFO)
-EVT_LIST_SET_INFO = wx._deprecated(EVT_LIST_SET_INFO)
+
+
+
 
 #---------------------------------------------------------------------------
 
@@ -4794,6 +4742,14 @@ class ListCtrl(_core.Control):
         """GetItemBackgroundColour(self, long item) -> Colour"""
         return _controls_.ListCtrl_GetItemBackgroundColour(*args, **kwargs)
 
+    def SetItemFont(*args, **kwargs):
+        """SetItemFont(self, long item, Font f)"""
+        return _controls_.ListCtrl_SetItemFont(*args, **kwargs)
+
+    def GetItemFont(*args, **kwargs):
+        """GetItemFont(self, long item) -> Font"""
+        return _controls_.ListCtrl_GetItemFont(*args, **kwargs)
+
     #
     # Some helpers...
     def Select(self, idx, on=1):

wxPython/src/mac/_core.py

@@ -161,6 +161,7 @@ SIZE_AUTO_HEIGHT = _core_.SIZE_AUTO_HEIGHT
 SIZE_AUTO = _core_.SIZE_AUTO
 SIZE_USE_EXISTING = _core_.SIZE_USE_EXISTING
 SIZE_ALLOW_MINUS_ONE = _core_.SIZE_ALLOW_MINUS_ONE
+SIZE_FORCE = _core_.SIZE_FORCE
 PORTRAIT = _core_.PORTRAIT
 LANDSCAPE = _core_.LANDSCAPE
 PRINT_QUALITY_HIGH = _core_.PRINT_QUALITY_HIGH
@@ -169,6 +170,7 @@ PRINT_QUALITY_LOW = _core_.PRINT_QUALITY_LOW
 PRINT_QUALITY_DRAFT = _core_.PRINT_QUALITY_DRAFT
 ID_ANY = _core_.ID_ANY
 ID_SEPARATOR = _core_.ID_SEPARATOR
+ID_NONE = _core_.ID_NONE
 ID_LOWEST = _core_.ID_LOWEST
 ID_OPEN = _core_.ID_OPEN
 ID_CLOSE = _core_.ID_CLOSE
@@ -673,8 +675,12 @@ HT_MAX = _core_.HT_MAX
 MOD_NONE = _core_.MOD_NONE
 MOD_ALT = _core_.MOD_ALT
 MOD_CONTROL = _core_.MOD_CONTROL
+MOD_ALTGR = _core_.MOD_ALTGR
 MOD_SHIFT = _core_.MOD_SHIFT
+MOD_META = _core_.MOD_META
 MOD_WIN = _core_.MOD_WIN
+MOD_CMD = _core_.MOD_CMD
+MOD_ALL = _core_.MOD_ALL
 UPDATE_UI_NONE = _core_.UPDATE_UI_NONE
 UPDATE_UI_RECURSE = _core_.UPDATE_UI_RECURSE
 UPDATE_UI_FROMIDLE = _core_.UPDATE_UI_FROMIDLE
@@ -2145,6 +2151,80 @@ class ImageHandlerPtr(ImageHandler):
         self.__class__ = ImageHandler
 _core_.ImageHandler_swigregister(ImageHandlerPtr)
 
+class PyImageHandler(ImageHandler):
+    """
+    This is the base class for implementing image file loading/saving, and
+    image creation from data, all written in Python.  To create a custom
+    image handler derive a new class from wx.PyImageHandler and provide
+    the following methods::
+
+        def DoCanRead(self, stream) --> bool
+            '''Check if this handler can read the image on the stream'''
+
+        def LoadFile(self, image, stream, verbose, index) --> bool
+            '''Load image data from the stream and load it into image.'''
+
+        def SaveFile(self, image, stream, verbose) --> bool
+            '''Save the iamge data in image to the stream using
+               this handler's image file format.'''
+
+        def GetImageCount(self, stream) --> int
+            '''If this image format can hold more than one image,
+               how many does the image on the stream have?'''
+
+    To activate your handler create an instance of it and pass it to
+    `wx.Image_AddHandler`.  Be sure to call `SetName`, `SetType`, and
+    `SetExtension` from your constructor.
+
+    """
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyImageHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def __init__(self, *args, **kwargs):
+        """
+        __init__(self) -> PyImageHandler
+
+        This is the base class for implementing image file loading/saving, and
+        image creation from data, all written in Python.  To create a custom
+        image handler derive a new class from wx.PyImageHandler and provide
+        the following methods::
+
+            def DoCanRead(self, stream) --> bool
+                '''Check if this handler can read the image on the stream'''
+
+            def LoadFile(self, image, stream, verbose, index) --> bool
+                '''Load image data from the stream and load it into image.'''
+
+            def SaveFile(self, image, stream, verbose) --> bool
+                '''Save the iamge data in image to the stream using
+                   this handler's image file format.'''
+
+            def GetImageCount(self, stream) --> int
+                '''If this image format can hold more than one image,
+                   how many does the image on the stream have?'''
+
+        To activate your handler create an instance of it and pass it to
+        `wx.Image_AddHandler`.  Be sure to call `SetName`, `SetType`, and
+        `SetExtension` from your constructor.
+
+        """
+        newobj = _core_.new_PyImageHandler(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+        self._SetSelf(self)
+
+    def _SetSelf(*args, **kwargs):
+        """_SetSelf(self, PyObject self)"""
+        return _core_.PyImageHandler__SetSelf(*args, **kwargs)
+
+
+class PyImageHandlerPtr(PyImageHandler):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = PyImageHandler
+_core_.PyImageHandler_swigregister(PyImageHandlerPtr)
+
 class ImageHistogram(object):
     """Proxy of C++ ImageHistogram class"""
     def __repr__(self):
@@ -2215,6 +2295,66 @@ def ImageHistogram_MakeKey(*args, **kwargs):
     """
     return _core_.ImageHistogram_MakeKey(*args, **kwargs)
 
+class Image_RGBValue(object):
+    """
+    An object that contains values for red, green and blue which represent
+    the value of a color. It is used by `wx.Image.HSVtoRGB` and
+    `wx.Image.RGBtoHSV`, which converts between HSV color space and RGB
+    color space.
+    """
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxImage_RGBValue instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def __init__(self, *args, **kwargs):
+        """
+        __init__(self, byte r=0, byte g=0, byte b=0) -> Image_RGBValue
+
+        Constructor.
+        """
+        newobj = _core_.new_Image_RGBValue(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+    red = property(_core_.Image_RGBValue_red_get, _core_.Image_RGBValue_red_set)
+    green = property(_core_.Image_RGBValue_green_get, _core_.Image_RGBValue_green_set)
+    blue = property(_core_.Image_RGBValue_blue_get, _core_.Image_RGBValue_blue_set)
+
+class Image_RGBValuePtr(Image_RGBValue):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = Image_RGBValue
+_core_.Image_RGBValue_swigregister(Image_RGBValuePtr)
+
+class Image_HSVValue(object):
+    """
+    An object that contains values for hue, saturation and value which
+    represent the value of a color.  It is used by `wx.Image.HSVtoRGB` and
+    `wx.Image.RGBtoHSV`, which +converts between HSV color space and RGB
+    color space.
+    """
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxImage_HSVValue instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def __init__(self, *args, **kwargs):
+        """
+        __init__(self, double h=0.0, double s=0.0, double v=0.0) -> Image_HSVValue
+
+        Constructor.
+        """
+        newobj = _core_.new_Image_HSVValue(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+    hue = property(_core_.Image_HSVValue_hue_get, _core_.Image_HSVValue_hue_set)
+    saturation = property(_core_.Image_HSVValue_saturation_get, _core_.Image_HSVValue_saturation_set)
+    value = property(_core_.Image_HSVValue_value_get, _core_.Image_HSVValue_value_set)
+
+class Image_HSVValuePtr(Image_HSVValue):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = Image_HSVValue
+_core_.Image_HSVValue_swigregister(Image_HSVValuePtr)
+
 class Image(Object):
     """
     A platform-independent image class.  An image can be created from
@@ -2892,6 +3032,33 @@ class Image(Object):
         """ConvertToMonoBitmap(self, byte red, byte green, byte blue) -> Bitmap"""
         return _core_.Image_ConvertToMonoBitmap(*args, **kwargs)
 
+    def RotateHue(*args, **kwargs):
+        """
+        RotateHue(self, double angle)
+
+        Rotates the hue of each pixel of the image. Hue is a double in the
+        range -1.0..1.0 where -1.0 is -360 degrees and 1.0 is 360 degrees
+        """
+        return _core_.Image_RotateHue(*args, **kwargs)
+
+    def RGBtoHSV(*args, **kwargs):
+        """
+        RGBtoHSV(Image_RGBValue rgb) -> Image_HSVValue
+
+        Converts a color in RGB color space to HSV color space.
+        """
+        return _core_.Image_RGBtoHSV(*args, **kwargs)
+
+    RGBtoHSV = staticmethod(RGBtoHSV)
+    def HSVtoRGB(*args, **kwargs):
+        """
+        HSVtoRGB(Image_HSVValue hsv) -> Image_RGBValue
+
+        Converts a color in HSV color space to RGB color space.
+        """
+        return _core_.Image_HSVtoRGB(*args, **kwargs)
+
+    HSVtoRGB = staticmethod(HSVtoRGB)
     def __nonzero__(self): return self.Ok() 
 
 class ImagePtr(Image):
@@ -3030,6 +3197,22 @@ def Image_GetImageExtWildcard(*args, **kwargs):
     """
     return _core_.Image_GetImageExtWildcard(*args, **kwargs)
 
+def Image_RGBtoHSV(*args, **kwargs):
+    """
+    Image_RGBtoHSV(Image_RGBValue rgb) -> Image_HSVValue
+
+    Converts a color in RGB color space to HSV color space.
+    """
+    return _core_.Image_RGBtoHSV(*args, **kwargs)
+
+def Image_HSVtoRGB(*args, **kwargs):
+    """
+    Image_HSVtoRGB(Image_HSVValue hsv) -> Image_RGBValue
+
+    Converts a color in HSV color space to RGB color space.
+    """
+    return _core_.Image_HSVtoRGB(*args, **kwargs)
+
 def InitAllImageHandlers():
     """
     The former functionality of InitAllImageHanders is now done internal to
@@ -6399,8 +6582,15 @@ _core_.WindowCreateEvent_swigregister(WindowCreateEventPtr)
 
 class WindowDestroyEvent(CommandEvent):
     """
-    The EVT_WINDOW_DESTROY event is sent right before the window is
-    destroyed.
+    The EVT_WINDOW_DESTROY event is sent from the `wx.Window` destructor
+    when the GUI window is destroyed.
+
+    When a class derived from `wx.Window` is destroyed its destructor will
+    have already run by the time this event is sent. Therefore this event
+    will not usually be received at all by the window itself.  Since it is
+    received after the destructor has run, an object should not try to
+    handle its own wx.WindowDestroyEvent, but it can be used to get
+    notification of the destruction of another window.
     """
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxWindowDestroyEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
@@ -6408,8 +6598,15 @@ class WindowDestroyEvent(CommandEvent):
         """
         __init__(self, Window win=None) -> WindowDestroyEvent
 
-        The EVT_WINDOW_DESTROY event is sent right before the window is
-        destroyed.
+        The EVT_WINDOW_DESTROY event is sent from the `wx.Window` destructor
+        when the GUI window is destroyed.
+
+        When a class derived from `wx.Window` is destroyed its destructor will
+        have already run by the time this event is sent. Therefore this event
+        will not usually be received at all by the window itself.  Since it is
+        received after the destructor has run, an object should not try to
+        handle its own wx.WindowDestroyEvent, but it can be used to get
+        notification of the destruction of another window.
         """
         newobj = _core_.new_WindowDestroyEvent(*args, **kwargs)
         self.this = newobj.this
@@ -7897,22 +8094,6 @@ class Window(EvtHandler):
         """
         return _core_.Window_IsBeingDeleted(*args, **kwargs)
 
-    def SetTitle(*args, **kwargs):
-        """
-        SetTitle(self, String title)
-
-        Sets the window's title. Applicable only to frames and dialogs.
-        """
-        return _core_.Window_SetTitle(*args, **kwargs)
-
-    def GetTitle(*args, **kwargs):
-        """
-        GetTitle(self) -> String
-
-        Gets the window's title. Applicable only to frames and dialogs.
-        """
-        return _core_.Window_GetTitle(*args, **kwargs)
-
     def SetLabel(*args, **kwargs):
         """
         SetLabel(self, String label)
@@ -8092,8 +8273,8 @@ class Window(EvtHandler):
         """
         Raise(self)
 
-        Raises the window to the top of the window hierarchy if it is a
-        managed window (dialog or frame).
+        Raises the window to the top of the window hierarchy.  In current
+        version of wxWidgets this works both for manage and child windows.
         """
         return _core_.Window_Raise(*args, **kwargs)
 
@@ -8101,8 +8282,8 @@ class Window(EvtHandler):
         """
         Lower(self)
 
-        Lowers the window to the bottom of the window hierarchy if it is a
-        managed window (dialog or frame).
+        Lowers the window to the bottom of the window hierarchy.  In current
+        version of wxWidgets this works both for manage and child windows.
         """
         return _core_.Window_Lower(*args, **kwargs)
 

wxPython/src/mac/_gdi.py

@@ -1597,10 +1597,6 @@ class FontMapper(object):
         return _gdi_.FontMapper_GetEncodingFromName(*args, **kwargs)
 
     GetEncodingFromName = staticmethod(GetEncodingFromName)
-    def SetConfig(*args, **kwargs):
-        """SetConfig(self, ConfigBase config)"""
-        return _gdi_.FontMapper_SetConfig(*args, **kwargs)
-
     def SetConfigPath(*args, **kwargs):
         """SetConfigPath(self, String prefix)"""
         return _gdi_.FontMapper_SetConfigPath(*args, **kwargs)

wxPython/src/mac/_misc.py

@@ -348,7 +348,7 @@ def GetOsDescription(*args, **kwargs):
     return _misc_.GetOsDescription(*args, **kwargs)
 
 def GetFreeMemory(*args, **kwargs):
-    """GetFreeMemory() -> long"""
+    """GetFreeMemory() -> wxMemorySize"""
     return _misc_.GetFreeMemory(*args, **kwargs)
 SHUTDOWN_POWEROFF = _misc_.SHUTDOWN_POWEROFF
 SHUTDOWN_REBOOT = _misc_.SHUTDOWN_REBOOT
@@ -486,14 +486,6 @@ def MessageBox(*args, **kwargs):
     """
     return _misc_.MessageBox(*args, **kwargs)
 
-def GetNumberFromUser(*args, **kwargs):
-    """
-    GetNumberFromUser(String message, String prompt, String caption, long value, 
-        long min=0, long max=100, Window parent=None, 
-        Point pos=DefaultPosition) -> long
-    """
-    return _misc_.GetNumberFromUser(*args, **kwargs)
-
 def ColourDisplay(*args, **kwargs):
     """ColourDisplay() -> bool"""
     return _misc_.ColourDisplay(*args, **kwargs)
@@ -3681,6 +3673,22 @@ class DateTime(object):
         """MakeTimezone(self, wxDateTime::TimeZone tz, bool noDST=False) -> DateTime"""
         return _misc_.DateTime_MakeTimezone(*args, **kwargs)
 
+    def FromTimezone(*args, **kwargs):
+        """FromTimezone(self, wxDateTime::TimeZone tz, bool noDST=False) -> DateTime"""
+        return _misc_.DateTime_FromTimezone(*args, **kwargs)
+
+    def MakeFromTimezone(*args, **kwargs):
+        """MakeFromTimezone(self, wxDateTime::TimeZone tz, bool noDST=False) -> DateTime"""
+        return _misc_.DateTime_MakeFromTimezone(*args, **kwargs)
+
+    def ToUTC(*args, **kwargs):
+        """ToUTC(self, bool noDST=False) -> DateTime"""
+        return _misc_.DateTime_ToUTC(*args, **kwargs)
+
+    def MakeUTC(*args, **kwargs):
+        """MakeUTC(self, bool noDST=False) -> DateTime"""
+        return _misc_.DateTime_MakeUTC(*args, **kwargs)
+
     def ToGMT(*args, **kwargs):
         """ToGMT(self, bool noDST=False) -> DateTime"""
         return _misc_.DateTime_ToGMT(*args, **kwargs)
@@ -3689,6 +3697,14 @@ class DateTime(object):
         """MakeGMT(self, bool noDST=False) -> DateTime"""
         return _misc_.DateTime_MakeGMT(*args, **kwargs)
 
+    def FromUTC(*args, **kwargs):
+        """FromUTC(self, bool noDST=False) -> DateTime"""
+        return _misc_.DateTime_FromUTC(*args, **kwargs)
+
+    def MakeFromUTC(*args, **kwargs):
+        """MakeFromUTC(self, bool noDST=False) -> DateTime"""
+        return _misc_.DateTime_MakeFromUTC(*args, **kwargs)
+
     def IsDST(*args, **kwargs):
         """IsDST(self, int country=Country_Default) -> int"""
         return _misc_.DateTime_IsDST(*args, **kwargs)
@@ -5629,7 +5645,8 @@ class _wxPyDelayedInitWrapper(object):
         self._instance = None
     def _checkInstance(self):
         if self._instance is None:
-            self._instance = self._initfunc(*self._args, **self._kwargs)        
+            if wx.GetApp():
+                self._instance = self._initfunc(*self._args, **self._kwargs)        
     def __getattr__(self, name):
         self._checkInstance()
         return getattr(self._instance, name)

wxPython/src/mac/_windows.py

@@ -421,19 +421,11 @@ class TopLevelWindow(_core.Window):
         return _windows_.TopLevelWindow_IsFullScreen(*args, **kwargs)
 
     def SetTitle(*args, **kwargs):
-        """
-        SetTitle(self, String title)
-
-        Sets the window's title. Applicable only to frames and dialogs.
-        """
+        """SetTitle(self, String title)"""
         return _windows_.TopLevelWindow_SetTitle(*args, **kwargs)
 
     def GetTitle(*args, **kwargs):
-        """
-        GetTitle(self) -> String
-
-        Gets the window's title. Applicable only to frames and dialogs.
-        """
+        """GetTitle(self) -> String"""
         return _windows_.TopLevelWindow_GetTitle(*args, **kwargs)
 
     def SetShape(*args, **kwargs):
@@ -4007,78 +3999,6 @@ class PrintData(_core.Object):
         """SetPrivData(self, PyObject data)"""
         return _windows_.PrintData_SetPrivData(*args, **kwargs)
 
-    def GetPrinterCommand(*args, **kwargs):
-        """GetPrinterCommand(self) -> String"""
-        return _windows_.PrintData_GetPrinterCommand(*args, **kwargs)
-
-    def GetPrinterOptions(*args, **kwargs):
-        """GetPrinterOptions(self) -> String"""
-        return _windows_.PrintData_GetPrinterOptions(*args, **kwargs)
-
-    def GetPreviewCommand(*args, **kwargs):
-        """GetPreviewCommand(self) -> String"""
-        return _windows_.PrintData_GetPreviewCommand(*args, **kwargs)
-
-    def GetFontMetricPath(*args, **kwargs):
-        """GetFontMetricPath(self) -> String"""
-        return _windows_.PrintData_GetFontMetricPath(*args, **kwargs)
-
-    def GetPrinterScaleX(*args, **kwargs):
-        """GetPrinterScaleX(self) -> double"""
-        return _windows_.PrintData_GetPrinterScaleX(*args, **kwargs)
-
-    def GetPrinterScaleY(*args, **kwargs):
-        """GetPrinterScaleY(self) -> double"""
-        return _windows_.PrintData_GetPrinterScaleY(*args, **kwargs)
-
-    def GetPrinterTranslateX(*args, **kwargs):
-        """GetPrinterTranslateX(self) -> long"""
-        return _windows_.PrintData_GetPrinterTranslateX(*args, **kwargs)
-
-    def GetPrinterTranslateY(*args, **kwargs):
-        """GetPrinterTranslateY(self) -> long"""
-        return _windows_.PrintData_GetPrinterTranslateY(*args, **kwargs)
-
-    def SetPrinterCommand(*args, **kwargs):
-        """SetPrinterCommand(self, String command)"""
-        return _windows_.PrintData_SetPrinterCommand(*args, **kwargs)
-
-    def SetPrinterOptions(*args, **kwargs):
-        """SetPrinterOptions(self, String options)"""
-        return _windows_.PrintData_SetPrinterOptions(*args, **kwargs)
-
-    def SetPreviewCommand(*args, **kwargs):
-        """SetPreviewCommand(self, String command)"""
-        return _windows_.PrintData_SetPreviewCommand(*args, **kwargs)
-
-    def SetFontMetricPath(*args, **kwargs):
-        """SetFontMetricPath(self, String path)"""
-        return _windows_.PrintData_SetFontMetricPath(*args, **kwargs)
-
-    def SetPrinterScaleX(*args, **kwargs):
-        """SetPrinterScaleX(self, double x)"""
-        return _windows_.PrintData_SetPrinterScaleX(*args, **kwargs)
-
-    def SetPrinterScaleY(*args, **kwargs):
-        """SetPrinterScaleY(self, double y)"""
-        return _windows_.PrintData_SetPrinterScaleY(*args, **kwargs)
-
-    def SetPrinterScaling(*args, **kwargs):
-        """SetPrinterScaling(self, double x, double y)"""
-        return _windows_.PrintData_SetPrinterScaling(*args, **kwargs)
-
-    def SetPrinterTranslateX(*args, **kwargs):
-        """SetPrinterTranslateX(self, long x)"""
-        return _windows_.PrintData_SetPrinterTranslateX(*args, **kwargs)
-
-    def SetPrinterTranslateY(*args, **kwargs):
-        """SetPrinterTranslateY(self, long y)"""
-        return _windows_.PrintData_SetPrinterTranslateY(*args, **kwargs)
-
-    def SetPrinterTranslation(*args, **kwargs):
-        """SetPrinterTranslation(self, long x, long y)"""
-        return _windows_.PrintData_SetPrinterTranslation(*args, **kwargs)
-
 
 class PrintDataPtr(PrintData):
     def __init__(self, this):
@@ -4328,14 +4248,6 @@ class PrintDialogData(_core.Object):
         """GetPrintToFile(self) -> bool"""
         return _windows_.PrintDialogData_GetPrintToFile(*args, **kwargs)
 
-    def GetSetupDialog(*args, **kwargs):
-        """GetSetupDialog(self) -> bool"""
-        return _windows_.PrintDialogData_GetSetupDialog(*args, **kwargs)
-
-    def SetSetupDialog(*args, **kwargs):
-        """SetSetupDialog(self, bool flag)"""
-        return _windows_.PrintDialogData_SetSetupDialog(*args, **kwargs)
-
     def SetFromPage(*args, **kwargs):
         """SetFromPage(self, int v)"""
         return _windows_.PrintDialogData_SetFromPage(*args, **kwargs)

wxPython/src/mac/html.py

@@ -1079,9 +1079,9 @@ class HtmlWindow(_windows.ScrolledWindow):
         """SetStandardFonts(self, int size=-1, String normal_face=EmptyString, String fixed_face=EmptyString)"""
         return _html.HtmlWindow_SetStandardFonts(*args, **kwargs)
 
-    def SetTitle(*args, **kwargs):
-        """SetTitle(self, String title)"""
-        return _html.HtmlWindow_SetTitle(*args, **kwargs)
+    def SetLabel(*args, **kwargs):
+        """SetLabel(self, String title)"""
+        return _html.HtmlWindow_SetLabel(*args, **kwargs)
 
     def SetBorders(*args, **kwargs):
         """SetBorders(self, int b)"""
@@ -1488,39 +1488,6 @@ class HtmlBookRecordPtr(HtmlBookRecord):
         self.__class__ = HtmlBookRecord
 _html.HtmlBookRecord_swigregister(HtmlBookRecordPtr)
 
-class HtmlContentsItem(object):
-    """Proxy of C++ HtmlContentsItem class"""
-    def __init__(self): raise RuntimeError, "No constructor defined"
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxHtmlContentsItem instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def GetLevel(*args, **kwargs):
-        """GetLevel(self) -> int"""
-        return _html.HtmlContentsItem_GetLevel(*args, **kwargs)
-
-    def GetID(*args, **kwargs):
-        """GetID(self) -> int"""
-        return _html.HtmlContentsItem_GetID(*args, **kwargs)
-
-    def GetName(*args, **kwargs):
-        """GetName(self) -> String"""
-        return _html.HtmlContentsItem_GetName(*args, **kwargs)
-
-    def GetPage(*args, **kwargs):
-        """GetPage(self) -> String"""
-        return _html.HtmlContentsItem_GetPage(*args, **kwargs)
-
-    def GetBook(*args, **kwargs):
-        """GetBook(self) -> HtmlBookRecord"""
-        return _html.HtmlContentsItem_GetBook(*args, **kwargs)
-
-
-class HtmlContentsItemPtr(HtmlContentsItem):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = HtmlContentsItem
-_html.HtmlContentsItem_swigregister(HtmlContentsItemPtr)
-
 class HtmlSearchStatus(object):
     """Proxy of C++ HtmlSearchStatus class"""
     def __init__(self): raise RuntimeError, "No constructor defined"
@@ -1546,10 +1513,6 @@ class HtmlSearchStatus(object):
         """GetName(self) -> String"""
         return _html.HtmlSearchStatus_GetName(*args, **kwargs)
 
-    def GetContentsItem(*args, **kwargs):
-        """GetContentsItem(self) -> HtmlContentsItem"""
-        return _html.HtmlSearchStatus_GetContentsItem(*args, **kwargs)
-
 
 class HtmlSearchStatusPtr(HtmlSearchStatus):
     def __init__(self, this):
@@ -1594,22 +1557,6 @@ class HtmlHelpData(object):
         """GetBookRecArray(self) -> wxHtmlBookRecArray"""
         return _html.HtmlHelpData_GetBookRecArray(*args, **kwargs)
 
-    def GetContents(*args, **kwargs):
-        """GetContents(self) -> HtmlContentsItem"""
-        return _html.HtmlHelpData_GetContents(*args, **kwargs)
-
-    def GetContentsCnt(*args, **kwargs):
-        """GetContentsCnt(self) -> int"""
-        return _html.HtmlHelpData_GetContentsCnt(*args, **kwargs)
-
-    def GetIndex(*args, **kwargs):
-        """GetIndex(self) -> HtmlContentsItem"""
-        return _html.HtmlHelpData_GetIndex(*args, **kwargs)
-
-    def GetIndexCnt(*args, **kwargs):
-        """GetIndexCnt(self) -> int"""
-        return _html.HtmlHelpData_GetIndexCnt(*args, **kwargs)
-
 
 class HtmlHelpDataPtr(HtmlHelpData):
     def __init__(self, this):

wxPython/src/mac/media.py

@@ -112,22 +112,6 @@ class MediaCtrl(_core.Control):
         """Stop(self) -> bool"""
         return _media.MediaCtrl_Stop(*args, **kwargs)
 
-    def GetVolume(*args, **kwargs):
-        """GetVolume(self) -> double"""
-        return _media.MediaCtrl_GetVolume(*args, **kwargs)
-
-    def SetVolume(*args, **kwargs):
-        """SetVolume(self, double dVolume) -> bool"""
-        return _media.MediaCtrl_SetVolume(*args, **kwargs)
-
-    def Load(*args, **kwargs):
-        """Load(self, String fileName) -> bool"""
-        return _media.MediaCtrl_Load(*args, **kwargs)
-
-    def LoadFromURI(*args, **kwargs):
-        """LoadFromURI(self, String location) -> bool"""
-        return _media.MediaCtrl_LoadFromURI(*args, **kwargs)
-
     def GetState(*args, **kwargs):
         """GetState(self) -> int"""
         return _media.MediaCtrl_GetState(*args, **kwargs)
@@ -152,6 +136,31 @@ class MediaCtrl(_core.Control):
         """Length(self) -> wxFileOffset"""
         return _media.MediaCtrl_Length(*args, **kwargs)
 
+    def GetVolume(*args, **kwargs):
+        """GetVolume(self) -> double"""
+        return _media.MediaCtrl_GetVolume(*args, **kwargs)
+
+    def SetVolume(*args, **kwargs):
+        """SetVolume(self, double dVolume) -> bool"""
+        return _media.MediaCtrl_SetVolume(*args, **kwargs)
+
+    def ShowPlayerControls(*args, **kwargs):
+        """ShowPlayerControls(self, wxMediaCtrlPlayerControls flags=wxMEDIACTRLPLAYERCONTROLS_DEFAULT) -> bool"""
+        return _media.MediaCtrl_ShowPlayerControls(*args, **kwargs)
+
+    def Load(*args, **kwargs):
+        """Load(self, String fileName) -> bool"""
+        return _media.MediaCtrl_Load(*args, **kwargs)
+
+    def LoadURI(*args, **kwargs):
+        """LoadURI(self, String fileName) -> bool"""
+        return _media.MediaCtrl_LoadURI(*args, **kwargs)
+
+    def LoadURIWithProxy(*args, **kwargs):
+        """LoadURIWithProxy(self, String fileName, String proxy) -> bool"""
+        return _media.MediaCtrl_LoadURIWithProxy(*args, **kwargs)
+
+    LoadFromURI = LoadURI 
 
 class MediaCtrlPtr(MediaCtrl):
     def __init__(self, this):

wxPython/src/mac/xrc.py

@@ -87,6 +87,10 @@ class XmlResource(_core.Object):
         """LoadFromString(self, String data) -> bool"""
         return _xrc.XmlResource_LoadFromString(*args, **kwargs)
 
+    def Unload(*args, **kwargs):
+        """Unload(self, String filename) -> bool"""
+        return _xrc.XmlResource_Unload(*args, **kwargs)
+
     def InitAllHandlers(*args, **kwargs):
         """InitAllHandlers(self)"""
         return _xrc.XmlResource_InitAllHandlers(*args, **kwargs)