reSWIGged

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

wxPython/src/__core_rename.i

@@ -218,6 +218,8 @@
 %rename(PD_ELAPSED_TIME)                    wxPD_ELAPSED_TIME;
 %rename(PD_ESTIMATED_TIME)                  wxPD_ESTIMATED_TIME;
 %rename(PD_REMAINING_TIME)                  wxPD_REMAINING_TIME;
+%rename(PD_SMOOTH)                          wxPD_SMOOTH;
+%rename(PD_CAN_SKIP)                        wxPD_CAN_SKIP;
 %rename(DD_NEW_DIR_BUTTON)                  wxDD_NEW_DIR_BUTTON;
 %rename(DD_DEFAULT_STYLE)                   wxDD_DEFAULT_STYLE;
 %rename(MENU_TEAROFF)                       wxMENU_TEAROFF;
@@ -638,6 +640,7 @@
 %rename(FLEX_GROWMODE_SPECIFIED)            wxFLEX_GROWMODE_SPECIFIED;
 %rename(FLEX_GROWMODE_ALL)                  wxFLEX_GROWMODE_ALL;
 %rename(FlexGridSizer)                      wxFlexGridSizer;
+%rename(StdDialogButtonSizer)               wxStdDialogButtonSizer;
 %rename(GBPosition)                         wxGBPosition;
 %rename(GBSpan)                             wxGBSpan;
 %rename(DefaultSpan)                        wxDefaultSpan;

wxPython/src/gtk/_controls.py

@@ -5121,6 +5121,7 @@ wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK = _controls_.wxEVT_COMMAND_TREE_ITEM_MIDDLE
 wxEVT_COMMAND_TREE_END_DRAG = _controls_.wxEVT_COMMAND_TREE_END_DRAG
 wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK = _controls_.wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK
 wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP = _controls_.wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP
+wxEVT_COMMAND_TREE_ITEM_MENU = _controls_.wxEVT_COMMAND_TREE_ITEM_MENU
 EVT_TREE_BEGIN_DRAG        = wx.PyEventBinder(wxEVT_COMMAND_TREE_BEGIN_DRAG       , 1)
 EVT_TREE_BEGIN_RDRAG       = wx.PyEventBinder(wxEVT_COMMAND_TREE_BEGIN_RDRAG      , 1)
 EVT_TREE_BEGIN_LABEL_EDIT  = wx.PyEventBinder(wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT , 1)
@@ -5141,6 +5142,7 @@ EVT_TREE_ITEM_MIDDLE_CLICK = wx.PyEventBinder(wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLI
 EVT_TREE_END_DRAG          = wx.PyEventBinder(wxEVT_COMMAND_TREE_END_DRAG         , 1)
 EVT_TREE_STATE_IMAGE_CLICK = wx.PyEventBinder(wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK, 1)
 EVT_TREE_ITEM_GETTOOLTIP   = wx.PyEventBinder(wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP,   1)
+EVT_COMMAND_TREE_ITEM_MENU = wx.PyEventBinder(wxEVT_COMMAND_TREE_ITEM_MENU,         1)    
 
 class TreeEvent(_core.NotifyEvent):
     """Proxy of C++ TreeEvent class"""

wxPython/src/gtk/_core.py

@@ -288,6 +288,8 @@ PD_CAN_ABORT = _core_.PD_CAN_ABORT
 PD_ELAPSED_TIME = _core_.PD_ELAPSED_TIME
 PD_ESTIMATED_TIME = _core_.PD_ESTIMATED_TIME
 PD_REMAINING_TIME = _core_.PD_REMAINING_TIME
+PD_SMOOTH = _core_.PD_SMOOTH
+PD_CAN_SKIP = _core_.PD_CAN_SKIP
 DD_NEW_DIR_BUTTON = _core_.DD_NEW_DIR_BUTTON
 DD_DEFAULT_STYLE = _core_.DD_DEFAULT_STYLE
 MENU_TEAROFF = _core_.MENU_TEAROFF
@@ -5284,6 +5286,12 @@ def SetDefaultPyEncoding(*args, **kwargs):
 
     Sets the encoding that wxPython will use when it needs to convert a
     Python string or unicode object to or from a wxString.
+
+    The default encoding is the value of ``locale.getdefaultlocale()[1]``
+    but please be aware that the default encoding within the same locale
+    may be slightly different on different platforms.  For example, please
+    see http://www.alanwood.net/demos/charsetdiffs.html for differences
+    between the common latin/roman encodings.
     """
     return _core_.SetDefaultPyEncoding(*args, **kwargs)
 
@@ -6023,11 +6031,18 @@ class Window(EvtHandler):
 
         Sets the position and size of the window in pixels.  The sizeFlags
         parameter indicates the interpretation of the other params if they are
-        -1.  wx.SIZE_AUTO*: a -1 indicates that a class-specific default
-        shoudl be used.  wx.SIZE_USE_EXISTING: existing dimensions should be
-        used if -1 values are supplied.  wxSIZE_ALLOW_MINUS_ONE: allow
-        dimensions of -1 and less to be interpreted as real dimensions, not
-        default values.
+        equal to -1.
+
+            ========================  ======================================
+            wx.SIZE_AUTO              A -1 indicates that a class-specific
+                                      default should be used.
+            wx.SIZE_USE_EXISTING      Axisting dimensions should be used if
+                                      -1 values are supplied.
+            wxSIZE_ALLOW_MINUS_ONE    Allow dimensions of -1 and less to be
+                                      interpreted as real dimensions, not
+                                      default values.
+            ========================  ======================================
+
         """
         return _core_.Window_SetDimensions(*args, **kwargs)
 
@@ -9690,7 +9705,7 @@ class PySizer(Sizer):
 
     When `Layout` is called it first calls `CalcMin` followed by
     `RecalcSizes` so you can optimize a bit by saving the results of
-    `CalcMin` and resuing them in `RecalcSizes`.
+    `CalcMin` and reusing them in `RecalcSizes`.
 
     :see: `wx.SizerItem`, `wx.Sizer.GetChildren`
 
@@ -10098,6 +10113,70 @@ class FlexGridSizerPtr(FlexGridSizer):
         self.__class__ = FlexGridSizer
 _core_.FlexGridSizer_swigregister(FlexGridSizerPtr)
 
+class StdDialogButtonSizer(BoxSizer):
+    """
+    A special sizer that knows how to order and position standard buttons
+    in order to conform to the current platform's standards.  You simply
+    need to add each `wx.Button` to the sizer, and be sure to create the
+    buttons using the standard ID's.  Then call `Finalize` and the sizer
+    will take care of the rest.
+
+    """
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxStdDialogButtonSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def __init__(self, *args, **kwargs):
+        """__init__(self) -> StdDialogButtonSizer"""
+        newobj = _core_.new_StdDialogButtonSizer(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+    def AddButton(*args, **kwargs):
+        """
+        AddButton(self, wxButton button)
+
+        Use this to add the buttons to this sizer.  Do not use the `Add`
+        method in the base class.
+        """
+        return _core_.StdDialogButtonSizer_AddButton(*args, **kwargs)
+
+    def Finalise(*args, **kwargs):
+        """
+        Finalise(self)
+
+        This funciton needs to be called after all the buttons have been added
+        to the sizer.  It will reorder them and position them in a platform
+        specifc manner.
+        """
+        return _core_.StdDialogButtonSizer_Finalise(*args, **kwargs)
+
+    def GetAffirmativeButton(*args, **kwargs):
+        """GetAffirmativeButton(self) -> wxButton"""
+        return _core_.StdDialogButtonSizer_GetAffirmativeButton(*args, **kwargs)
+
+    def GetApplyButton(*args, **kwargs):
+        """GetApplyButton(self) -> wxButton"""
+        return _core_.StdDialogButtonSizer_GetApplyButton(*args, **kwargs)
+
+    def GetNegativeButton(*args, **kwargs):
+        """GetNegativeButton(self) -> wxButton"""
+        return _core_.StdDialogButtonSizer_GetNegativeButton(*args, **kwargs)
+
+    def GetCancelButton(*args, **kwargs):
+        """GetCancelButton(self) -> wxButton"""
+        return _core_.StdDialogButtonSizer_GetCancelButton(*args, **kwargs)
+
+    def GetHelpButton(*args, **kwargs):
+        """GetHelpButton(self) -> wxButton"""
+        return _core_.StdDialogButtonSizer_GetHelpButton(*args, **kwargs)
+
+
+class StdDialogButtonSizerPtr(StdDialogButtonSizer):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = StdDialogButtonSizer
+_core_.StdDialogButtonSizer_swigregister(StdDialogButtonSizerPtr)
+
 #---------------------------------------------------------------------------
 
 class GBPosition(object):
@@ -10899,7 +10978,13 @@ if RELEASE_VERSION != _core_.RELEASE_VERSION:
 
 #----------------------------------------------------------------------------
 
-# Set the default string conversion encoding from the locale
+# Set the default string<-->unicode conversion encoding from the
+# locale.  This encoding is used when string or unicode objects need
+# to be converted in order to pass them to wxWidgets.  Please be aware
+# that the default encoding within the same locale may be slightly
+# different on different platforms.  For example, please see
+# http://www.alanwood.net/demos/charsetdiffs.html for differences
+# between the common latin/roman encodings.
 import locale
 default = locale.getdefaultlocale()[1]
 if default:

wxPython/src/gtk/_windows.py

@@ -662,6 +662,10 @@ class Dialog(TopLevelWindow):
         """CreateButtonSizer(self, long flags) -> Sizer"""
         return _windows_.Dialog_CreateButtonSizer(*args, **kwargs)
 
+    def CreateStdDialogButtonSizer(*args, **kwargs):
+        """CreateStdDialogButtonSizer(self, long flags) -> StdDialogButtonSizer"""
+        return _windows_.Dialog_CreateStdDialogButtonSizer(*args, **kwargs)
+
     def IsModal(*args, **kwargs):
         """IsModal(self) -> bool"""
         return _windows_.Dialog_IsModal(*args, **kwargs)
@@ -3033,7 +3037,7 @@ class ProgressDialog(Frame):
         Updates the dialog, setting the progress bar to the new value and, if
         given changes the message above it. The value given should be less
         than or equal to the maximum value given to the constructor and the
-        dialog is closed if it is equal to the maximum.  Returns true unless
+        dialog is closed if it is equal to the maximum.  Returns True unless
         the Cancel button has been pressed.
 
         If false is returned, the application can either immediately destroy

wxPython/wxPython/_controls.py

@@ -433,6 +433,7 @@ wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK = wx._controls.wxEVT_COMMAND_TREE_ITEM_MIDD
 wxEVT_COMMAND_TREE_END_DRAG = wx._controls.wxEVT_COMMAND_TREE_END_DRAG
 wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK = wx._controls.wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK
 wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP = wx._controls.wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP
+wxEVT_COMMAND_TREE_ITEM_MENU = wx._controls.wxEVT_COMMAND_TREE_ITEM_MENU
 wxTreeEvent = wx._controls.TreeEvent
 wxTreeEventPtr = wx._controls.TreeEventPtr
 wxTreeCtrl = wx._controls.TreeCtrl

wxPython/wxPython/_core.py

@@ -234,6 +234,8 @@ wxPD_CAN_ABORT = wx._core.PD_CAN_ABORT
 wxPD_ELAPSED_TIME = wx._core.PD_ELAPSED_TIME
 wxPD_ESTIMATED_TIME = wx._core.PD_ESTIMATED_TIME
 wxPD_REMAINING_TIME = wx._core.PD_REMAINING_TIME
+wxPD_SMOOTH = wx._core.PD_SMOOTH
+wxPD_CAN_SKIP = wx._core.PD_CAN_SKIP
 wxDD_NEW_DIR_BUTTON = wx._core.DD_NEW_DIR_BUTTON
 wxDD_DEFAULT_STYLE = wx._core.DD_DEFAULT_STYLE
 wxMENU_TEAROFF = wx._core.MENU_TEAROFF
@@ -1046,6 +1048,8 @@ wxFLEX_GROWMODE_SPECIFIED = wx._core.FLEX_GROWMODE_SPECIFIED
 wxFLEX_GROWMODE_ALL = wx._core.FLEX_GROWMODE_ALL
 wxFlexGridSizer = wx._core.FlexGridSizer
 wxFlexGridSizerPtr = wx._core.FlexGridSizerPtr
+wxStdDialogButtonSizer = wx._core.StdDialogButtonSizer
+wxStdDialogButtonSizerPtr = wx._core.StdDialogButtonSizerPtr
 wxGBPosition = wx._core.GBPosition
 wxGBPositionPtr = wx._core.GBPositionPtr
 wxGBSpan = wx._core.GBSpan