reSWIGged

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

diff --git a/wxPython/src/gtk/_controls.py b/wxPython/src/gtk/_controls.py
index 1eb8448ce718cf3d0ab058a85bfb471ee6dd2197..29a1b2d17dd3b4c554c2e00e5720301f6c8287be 100644 (file)
--- a/wxPython/src/gtk/_controls.py
+++ b/wxPython/src/gtk/_controls.py
@@ -1553,6 +1553,7 @@ TE_DONTWRAP = _controls_.TE_DONTWRAP
 TE_LINEWRAP = _controls_.TE_LINEWRAP
 TE_WORDWRAP = _controls_.TE_WORDWRAP
 TE_RICH2 = _controls_.TE_RICH2
 TE_LINEWRAP = _controls_.TE_LINEWRAP
 TE_WORDWRAP = _controls_.TE_WORDWRAP
 TE_RICH2 = _controls_.TE_RICH2

+TE_CAPITALIZE = _controls_.TE_CAPITALIZE

 TEXT_ALIGNMENT_DEFAULT = _controls_.TEXT_ALIGNMENT_DEFAULT
 TEXT_ALIGNMENT_LEFT = _controls_.TEXT_ALIGNMENT_LEFT
 TEXT_ALIGNMENT_CENTRE = _controls_.TEXT_ALIGNMENT_CENTRE
 TEXT_ALIGNMENT_DEFAULT = _controls_.TEXT_ALIGNMENT_DEFAULT
 TEXT_ALIGNMENT_LEFT = _controls_.TEXT_ALIGNMENT_LEFT
 TEXT_ALIGNMENT_CENTRE = _controls_.TEXT_ALIGNMENT_CENTRE

diff --git a/wxPython/src/gtk/_controls_wrap.cpp b/wxPython/src/gtk/_controls_wrap.cpp
index 09c218fd27a57ece19acef58718b14df2881ffea..6deb554e6c13ab5d620cbcd441c5602114fd848e 100644 (file)
--- a/wxPython/src/gtk/_controls_wrap.cpp
+++ b/wxPython/src/gtk/_controls_wrap.cpp
@@ -37457,6 +37457,9 @@ SWIGEXPORT(void) SWIG_init(void) {
     {
         PyDict_SetItemString(d,"TE_RICH2", SWIG_From_int((int)(wxTE_RICH2))); 
     }
     {
         PyDict_SetItemString(d,"TE_RICH2", SWIG_From_int((int)(wxTE_RICH2))); 
     }

+    {
+        PyDict_SetItemString(d,"TE_CAPITALIZE", SWIG_From_int((int)(wxTE_CAPITALIZE))); 
+    }

     {
         PyDict_SetItemString(d,"TEXT_ALIGNMENT_DEFAULT", SWIG_From_int((int)(wxTEXT_ALIGNMENT_DEFAULT))); 
     }
     {
         PyDict_SetItemString(d,"TEXT_ALIGNMENT_DEFAULT", SWIG_From_int((int)(wxTEXT_ALIGNMENT_DEFAULT))); 
     }

diff --git a/wxPython/src/gtk/_core.py b/wxPython/src/gtk/_core.py
index 8daf2864dbb78fb60821d08c9be193f5a0fbe849..f50bb232c849f826e01df8b0adcbd5fe6c2127b0 100644 (file)
--- a/wxPython/src/gtk/_core.py
+++ b/wxPython/src/gtk/_core.py
@@ -504,6 +504,27 @@ WXK_NUMPAD_DIVIDE = _core_.WXK_NUMPAD_DIVIDE
 WXK_WINDOWS_LEFT = _core_.WXK_WINDOWS_LEFT
 WXK_WINDOWS_RIGHT = _core_.WXK_WINDOWS_RIGHT
 WXK_WINDOWS_MENU = _core_.WXK_WINDOWS_MENU
 WXK_WINDOWS_LEFT = _core_.WXK_WINDOWS_LEFT
 WXK_WINDOWS_RIGHT = _core_.WXK_WINDOWS_RIGHT
 WXK_WINDOWS_MENU = _core_.WXK_WINDOWS_MENU

+WXK_COMMAND = _core_.WXK_COMMAND
+WXK_SPECIAL1 = _core_.WXK_SPECIAL1
+WXK_SPECIAL2 = _core_.WXK_SPECIAL2
+WXK_SPECIAL3 = _core_.WXK_SPECIAL3
+WXK_SPECIAL4 = _core_.WXK_SPECIAL4
+WXK_SPECIAL5 = _core_.WXK_SPECIAL5
+WXK_SPECIAL6 = _core_.WXK_SPECIAL6
+WXK_SPECIAL7 = _core_.WXK_SPECIAL7
+WXK_SPECIAL8 = _core_.WXK_SPECIAL8
+WXK_SPECIAL9 = _core_.WXK_SPECIAL9
+WXK_SPECIAL10 = _core_.WXK_SPECIAL10
+WXK_SPECIAL11 = _core_.WXK_SPECIAL11
+WXK_SPECIAL12 = _core_.WXK_SPECIAL12
+WXK_SPECIAL13 = _core_.WXK_SPECIAL13
+WXK_SPECIAL14 = _core_.WXK_SPECIAL14
+WXK_SPECIAL15 = _core_.WXK_SPECIAL15
+WXK_SPECIAL16 = _core_.WXK_SPECIAL16
+WXK_SPECIAL17 = _core_.WXK_SPECIAL17
+WXK_SPECIAL18 = _core_.WXK_SPECIAL18
+WXK_SPECIAL19 = _core_.WXK_SPECIAL19
+WXK_SPECIAL20 = _core_.WXK_SPECIAL20

 PAPER_NONE = _core_.PAPER_NONE
 PAPER_LETTER = _core_.PAPER_LETTER
 PAPER_LEGAL = _core_.PAPER_LEGAL
 PAPER_NONE = _core_.PAPER_NONE
 PAPER_LETTER = _core_.PAPER_LETTER
 PAPER_LEGAL = _core_.PAPER_LEGAL


@@ -3093,6 +3114,7 @@ wxEVT_IDLE = _core_.wxEVT_IDLE
 wxEVT_UPDATE_UI = _core_.wxEVT_UPDATE_UI
 wxEVT_SIZING = _core_.wxEVT_SIZING
 wxEVT_MOVING = _core_.wxEVT_MOVING
 wxEVT_UPDATE_UI = _core_.wxEVT_UPDATE_UI
 wxEVT_SIZING = _core_.wxEVT_SIZING
 wxEVT_MOVING = _core_.wxEVT_MOVING

+wxEVT_HIBERNATE = _core_.wxEVT_HIBERNATE

 wxEVT_COMMAND_LEFT_CLICK = _core_.wxEVT_COMMAND_LEFT_CLICK
 wxEVT_COMMAND_LEFT_DCLICK = _core_.wxEVT_COMMAND_LEFT_DCLICK
 wxEVT_COMMAND_RIGHT_CLICK = _core_.wxEVT_COMMAND_RIGHT_CLICK
 wxEVT_COMMAND_LEFT_CLICK = _core_.wxEVT_COMMAND_LEFT_CLICK
 wxEVT_COMMAND_LEFT_DCLICK = _core_.wxEVT_COMMAND_LEFT_DCLICK
 wxEVT_COMMAND_RIGHT_CLICK = _core_.wxEVT_COMMAND_RIGHT_CLICK


@@ -3126,6 +3148,7 @@ EVT_KILL_FOCUS = wx.PyEventBinder( wxEVT_KILL_FOCUS )
 EVT_CHILD_FOCUS = wx.PyEventBinder( wxEVT_CHILD_FOCUS )
 EVT_ACTIVATE = wx.PyEventBinder( wxEVT_ACTIVATE )
 EVT_ACTIVATE_APP = wx.PyEventBinder( wxEVT_ACTIVATE_APP )
 EVT_CHILD_FOCUS = wx.PyEventBinder( wxEVT_CHILD_FOCUS )
 EVT_ACTIVATE = wx.PyEventBinder( wxEVT_ACTIVATE )
 EVT_ACTIVATE_APP = wx.PyEventBinder( wxEVT_ACTIVATE_APP )

+EVT_HIBERNATE = wx.PyEventBinder( wxEVT_HIBERNATE )     

 EVT_END_SESSION = wx.PyEventBinder( wxEVT_END_SESSION )
 EVT_QUERY_END_SESSION = wx.PyEventBinder( wxEVT_QUERY_END_SESSION )
 EVT_DROP_FILES = wx.PyEventBinder( wxEVT_DROP_FILES )
 EVT_END_SESSION = wx.PyEventBinder( wxEVT_END_SESSION )
 EVT_QUERY_END_SESSION = wx.PyEventBinder( wxEVT_QUERY_END_SESSION )
 EVT_DROP_FILES = wx.PyEventBinder( wxEVT_DROP_FILES )


@@ -9867,7 +9890,7 @@ class Sizer(Object):
 
     def Hide(self, item, recursive=False):
         """
 
     def Hide(self, item, recursive=False):
         """

-        A convenience method for Show(item, False, recursive).
+        A convenience method for `Show`(item, False, recursive).

         """
         return self.Show(item, False, recursive)
 
         """
         return self.Show(item, False, recursive)
 


@@ -11216,14 +11239,17 @@ if RELEASE_VERSION != _core_.RELEASE_VERSION:
 # http://www.alanwood.net/demos/charsetdiffs.html for differences
 # between the common latin/roman encodings.
 import locale
 # http://www.alanwood.net/demos/charsetdiffs.html for differences
 # between the common latin/roman encodings.
 import locale

+import codecs

 try:
     default = locale.getdefaultlocale()[1]
 try:
     default = locale.getdefaultlocale()[1]

-except ValueError:
-    default = "iso8859-1"
+    codecs.lookup(default)
+except (ValueError, LookupError):
+    default = _sys.getdefaultencoding()

 if default:
     wx.SetDefaultPyEncoding(default)
 del default
 del locale
 if default:
     wx.SetDefaultPyEncoding(default)
 del default
 del locale

+del codecs

 
 #----------------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------------
 

diff --git a/wxPython/src/gtk/_core_wrap.cpp b/wxPython/src/gtk/_core_wrap.cpp
index c27c6631f1a4fcffa855bf45e0515fe6fca4638c..8585264fbec93a363a6ea245bcf825dd63d5bf6b 100644 (file)
--- a/wxPython/src/gtk/_core_wrap.cpp
+++ b/wxPython/src/gtk/_core_wrap.cpp
@@ -38613,7 +38613,8 @@ static PyObject *_wrap_SizerItem_SetRatioWH(PyObject *, PyObject *args, PyObject
 static PyObject *_wrap_SizerItem_SetRatioSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
 static PyObject *_wrap_SizerItem_SetRatioSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;

-    wxSize arg2 ;
+    wxSize *arg2 = 0 ;
+    wxSize temp2 ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {


@@ -38624,18 +38625,12 @@ static PyObject *_wrap_SizerItem_SetRatioSize(PyObject *, PyObject *args, PyObje
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {

-        wxSize * argp;
-        SWIG_Python_ConvertPtr(obj1, (void **)&argp, SWIGTYPE_p_wxSize, SWIG_POINTER_EXCEPTION);
-        if (SWIG_arg_fail(2)) SWIG_fail;
-        if (argp == NULL) {
-            SWIG_null_ref("wxSize");
-        }
-        if (SWIG_arg_fail(2)) SWIG_fail;
-        arg2 = *argp;
+        arg2 = &temp2;
+        if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        (arg1)->SetRatio(arg2);
+        (arg1)->SetRatio((wxSize const &)*arg2);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;


@@ -48783,6 +48778,69 @@ SWIGEXPORT(void) SWIG_init(void) {
     {
         PyDict_SetItemString(d,"WXK_WINDOWS_MENU", SWIG_From_int((int)(WXK_WINDOWS_MENU))); 
     }
     {
         PyDict_SetItemString(d,"WXK_WINDOWS_MENU", SWIG_From_int((int)(WXK_WINDOWS_MENU))); 
     }

+    {
+        PyDict_SetItemString(d,"WXK_COMMAND", SWIG_From_int((int)(WXK_COMMAND))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL1", SWIG_From_int((int)(WXK_SPECIAL1))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL2", SWIG_From_int((int)(WXK_SPECIAL2))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL3", SWIG_From_int((int)(WXK_SPECIAL3))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL4", SWIG_From_int((int)(WXK_SPECIAL4))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL5", SWIG_From_int((int)(WXK_SPECIAL5))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL6", SWIG_From_int((int)(WXK_SPECIAL6))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL7", SWIG_From_int((int)(WXK_SPECIAL7))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL8", SWIG_From_int((int)(WXK_SPECIAL8))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL9", SWIG_From_int((int)(WXK_SPECIAL9))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL10", SWIG_From_int((int)(WXK_SPECIAL10))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL11", SWIG_From_int((int)(WXK_SPECIAL11))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL12", SWIG_From_int((int)(WXK_SPECIAL12))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL13", SWIG_From_int((int)(WXK_SPECIAL13))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL14", SWIG_From_int((int)(WXK_SPECIAL14))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL15", SWIG_From_int((int)(WXK_SPECIAL15))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL16", SWIG_From_int((int)(WXK_SPECIAL16))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL17", SWIG_From_int((int)(WXK_SPECIAL17))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL18", SWIG_From_int((int)(WXK_SPECIAL18))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL19", SWIG_From_int((int)(WXK_SPECIAL19))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL20", SWIG_From_int((int)(WXK_SPECIAL20))); 
+    }

     {
         PyDict_SetItemString(d,"PAPER_NONE", SWIG_From_int((int)(wxPAPER_NONE))); 
     }
     {
         PyDict_SetItemString(d,"PAPER_NONE", SWIG_From_int((int)(wxPAPER_NONE))); 
     }


@@ -49429,6 +49487,7 @@ SWIGEXPORT(void) SWIG_init(void) {
     PyDict_SetItemString(d, "wxEVT_UPDATE_UI", PyInt_FromLong(wxEVT_UPDATE_UI));
     PyDict_SetItemString(d, "wxEVT_SIZING", PyInt_FromLong(wxEVT_SIZING));
     PyDict_SetItemString(d, "wxEVT_MOVING", PyInt_FromLong(wxEVT_MOVING));
     PyDict_SetItemString(d, "wxEVT_UPDATE_UI", PyInt_FromLong(wxEVT_UPDATE_UI));
     PyDict_SetItemString(d, "wxEVT_SIZING", PyInt_FromLong(wxEVT_SIZING));
     PyDict_SetItemString(d, "wxEVT_MOVING", PyInt_FromLong(wxEVT_MOVING));

+    PyDict_SetItemString(d, "wxEVT_HIBERNATE", PyInt_FromLong(wxEVT_HIBERNATE));

     PyDict_SetItemString(d, "wxEVT_COMMAND_LEFT_CLICK", PyInt_FromLong(wxEVT_COMMAND_LEFT_CLICK));
     PyDict_SetItemString(d, "wxEVT_COMMAND_LEFT_DCLICK", PyInt_FromLong(wxEVT_COMMAND_LEFT_DCLICK));
     PyDict_SetItemString(d, "wxEVT_COMMAND_RIGHT_CLICK", PyInt_FromLong(wxEVT_COMMAND_RIGHT_CLICK));
     PyDict_SetItemString(d, "wxEVT_COMMAND_LEFT_CLICK", PyInt_FromLong(wxEVT_COMMAND_LEFT_CLICK));
     PyDict_SetItemString(d, "wxEVT_COMMAND_LEFT_DCLICK", PyInt_FromLong(wxEVT_COMMAND_LEFT_DCLICK));
     PyDict_SetItemString(d, "wxEVT_COMMAND_RIGHT_CLICK", PyInt_FromLong(wxEVT_COMMAND_RIGHT_CLICK));

diff --git a/wxPython/src/gtk/_windows.py b/wxPython/src/gtk/_windows.py
index 7f31a6179e473daf24614fcd8563762057d90b26..9fa6a3ed6fdc66c4d6ac44f002a7b25bf7ac6f15 100644 (file)
--- a/wxPython/src/gtk/_windows.py
+++ b/wxPython/src/gtk/_windows.py
@@ -1137,7 +1137,7 @@ class SplitterWindow(_core.Window):
         """
         SetSashSize(self, int width)
 
         """
         SetSashSize(self, int width)
 

-        Sets the sash size.  Currently a NOP.
+        Sets the sash size.

         """
         return _windows_.SplitterWindow_SetSashSize(*args, **kwargs)
 
         """
         return _windows_.SplitterWindow_SetSashSize(*args, **kwargs)
 

diff --git a/wxPython/src/mac/_controls.py b/wxPython/src/mac/_controls.py
index 533ca561d9b1c55cec670dfb7d77aef5017a4cf1..c341a2a055842fd8906963cc87db86778f58dab9 100644 (file)
--- a/wxPython/src/mac/_controls.py
+++ b/wxPython/src/mac/_controls.py
@@ -1540,6 +1540,7 @@ TE_DONTWRAP = _controls_.TE_DONTWRAP
 TE_LINEWRAP = _controls_.TE_LINEWRAP
 TE_WORDWRAP = _controls_.TE_WORDWRAP
 TE_RICH2 = _controls_.TE_RICH2
 TE_LINEWRAP = _controls_.TE_LINEWRAP
 TE_WORDWRAP = _controls_.TE_WORDWRAP
 TE_RICH2 = _controls_.TE_RICH2

+TE_CAPITALIZE = _controls_.TE_CAPITALIZE

 TEXT_ALIGNMENT_DEFAULT = _controls_.TEXT_ALIGNMENT_DEFAULT
 TEXT_ALIGNMENT_LEFT = _controls_.TEXT_ALIGNMENT_LEFT
 TEXT_ALIGNMENT_CENTRE = _controls_.TEXT_ALIGNMENT_CENTRE
 TEXT_ALIGNMENT_DEFAULT = _controls_.TEXT_ALIGNMENT_DEFAULT
 TEXT_ALIGNMENT_LEFT = _controls_.TEXT_ALIGNMENT_LEFT
 TEXT_ALIGNMENT_CENTRE = _controls_.TEXT_ALIGNMENT_CENTRE

diff --git a/wxPython/src/mac/_controls_wrap.cpp b/wxPython/src/mac/_controls_wrap.cpp
index adca4bb0934a12d2ea1f28240051cd89fa967f52..647825ca3d96ce286fb495efe04407ba8b156787 100644 (file)
--- a/wxPython/src/mac/_controls_wrap.cpp
+++ b/wxPython/src/mac/_controls_wrap.cpp
@@ -37387,6 +37387,9 @@ SWIGEXPORT(void) SWIG_init(void) {
     {
         PyDict_SetItemString(d,"TE_RICH2", SWIG_From_int((int)(wxTE_RICH2))); 
     }
     {
         PyDict_SetItemString(d,"TE_RICH2", SWIG_From_int((int)(wxTE_RICH2))); 
     }

+    {
+        PyDict_SetItemString(d,"TE_CAPITALIZE", SWIG_From_int((int)(wxTE_CAPITALIZE))); 
+    }

     {
         PyDict_SetItemString(d,"TEXT_ALIGNMENT_DEFAULT", SWIG_From_int((int)(wxTEXT_ALIGNMENT_DEFAULT))); 
     }
     {
         PyDict_SetItemString(d,"TEXT_ALIGNMENT_DEFAULT", SWIG_From_int((int)(wxTEXT_ALIGNMENT_DEFAULT))); 
     }

diff --git a/wxPython/src/mac/_core.py b/wxPython/src/mac/_core.py
index 8daf2864dbb78fb60821d08c9be193f5a0fbe849..f50bb232c849f826e01df8b0adcbd5fe6c2127b0 100644 (file)
--- a/wxPython/src/mac/_core.py
+++ b/wxPython/src/mac/_core.py
@@ -504,6 +504,27 @@ WXK_NUMPAD_DIVIDE = _core_.WXK_NUMPAD_DIVIDE
 WXK_WINDOWS_LEFT = _core_.WXK_WINDOWS_LEFT
 WXK_WINDOWS_RIGHT = _core_.WXK_WINDOWS_RIGHT
 WXK_WINDOWS_MENU = _core_.WXK_WINDOWS_MENU
 WXK_WINDOWS_LEFT = _core_.WXK_WINDOWS_LEFT
 WXK_WINDOWS_RIGHT = _core_.WXK_WINDOWS_RIGHT
 WXK_WINDOWS_MENU = _core_.WXK_WINDOWS_MENU

+WXK_COMMAND = _core_.WXK_COMMAND
+WXK_SPECIAL1 = _core_.WXK_SPECIAL1
+WXK_SPECIAL2 = _core_.WXK_SPECIAL2
+WXK_SPECIAL3 = _core_.WXK_SPECIAL3
+WXK_SPECIAL4 = _core_.WXK_SPECIAL4
+WXK_SPECIAL5 = _core_.WXK_SPECIAL5
+WXK_SPECIAL6 = _core_.WXK_SPECIAL6
+WXK_SPECIAL7 = _core_.WXK_SPECIAL7
+WXK_SPECIAL8 = _core_.WXK_SPECIAL8
+WXK_SPECIAL9 = _core_.WXK_SPECIAL9
+WXK_SPECIAL10 = _core_.WXK_SPECIAL10
+WXK_SPECIAL11 = _core_.WXK_SPECIAL11
+WXK_SPECIAL12 = _core_.WXK_SPECIAL12
+WXK_SPECIAL13 = _core_.WXK_SPECIAL13
+WXK_SPECIAL14 = _core_.WXK_SPECIAL14
+WXK_SPECIAL15 = _core_.WXK_SPECIAL15
+WXK_SPECIAL16 = _core_.WXK_SPECIAL16
+WXK_SPECIAL17 = _core_.WXK_SPECIAL17
+WXK_SPECIAL18 = _core_.WXK_SPECIAL18
+WXK_SPECIAL19 = _core_.WXK_SPECIAL19
+WXK_SPECIAL20 = _core_.WXK_SPECIAL20

 PAPER_NONE = _core_.PAPER_NONE
 PAPER_LETTER = _core_.PAPER_LETTER
 PAPER_LEGAL = _core_.PAPER_LEGAL
 PAPER_NONE = _core_.PAPER_NONE
 PAPER_LETTER = _core_.PAPER_LETTER
 PAPER_LEGAL = _core_.PAPER_LEGAL


@@ -3093,6 +3114,7 @@ wxEVT_IDLE = _core_.wxEVT_IDLE
 wxEVT_UPDATE_UI = _core_.wxEVT_UPDATE_UI
 wxEVT_SIZING = _core_.wxEVT_SIZING
 wxEVT_MOVING = _core_.wxEVT_MOVING
 wxEVT_UPDATE_UI = _core_.wxEVT_UPDATE_UI
 wxEVT_SIZING = _core_.wxEVT_SIZING
 wxEVT_MOVING = _core_.wxEVT_MOVING

+wxEVT_HIBERNATE = _core_.wxEVT_HIBERNATE

 wxEVT_COMMAND_LEFT_CLICK = _core_.wxEVT_COMMAND_LEFT_CLICK
 wxEVT_COMMAND_LEFT_DCLICK = _core_.wxEVT_COMMAND_LEFT_DCLICK
 wxEVT_COMMAND_RIGHT_CLICK = _core_.wxEVT_COMMAND_RIGHT_CLICK
 wxEVT_COMMAND_LEFT_CLICK = _core_.wxEVT_COMMAND_LEFT_CLICK
 wxEVT_COMMAND_LEFT_DCLICK = _core_.wxEVT_COMMAND_LEFT_DCLICK
 wxEVT_COMMAND_RIGHT_CLICK = _core_.wxEVT_COMMAND_RIGHT_CLICK


@@ -3126,6 +3148,7 @@ EVT_KILL_FOCUS = wx.PyEventBinder( wxEVT_KILL_FOCUS )
 EVT_CHILD_FOCUS = wx.PyEventBinder( wxEVT_CHILD_FOCUS )
 EVT_ACTIVATE = wx.PyEventBinder( wxEVT_ACTIVATE )
 EVT_ACTIVATE_APP = wx.PyEventBinder( wxEVT_ACTIVATE_APP )
 EVT_CHILD_FOCUS = wx.PyEventBinder( wxEVT_CHILD_FOCUS )
 EVT_ACTIVATE = wx.PyEventBinder( wxEVT_ACTIVATE )
 EVT_ACTIVATE_APP = wx.PyEventBinder( wxEVT_ACTIVATE_APP )

+EVT_HIBERNATE = wx.PyEventBinder( wxEVT_HIBERNATE )     

 EVT_END_SESSION = wx.PyEventBinder( wxEVT_END_SESSION )
 EVT_QUERY_END_SESSION = wx.PyEventBinder( wxEVT_QUERY_END_SESSION )
 EVT_DROP_FILES = wx.PyEventBinder( wxEVT_DROP_FILES )
 EVT_END_SESSION = wx.PyEventBinder( wxEVT_END_SESSION )
 EVT_QUERY_END_SESSION = wx.PyEventBinder( wxEVT_QUERY_END_SESSION )
 EVT_DROP_FILES = wx.PyEventBinder( wxEVT_DROP_FILES )


@@ -9867,7 +9890,7 @@ class Sizer(Object):
 
     def Hide(self, item, recursive=False):
         """
 
     def Hide(self, item, recursive=False):
         """

-        A convenience method for Show(item, False, recursive).
+        A convenience method for `Show`(item, False, recursive).

         """
         return self.Show(item, False, recursive)
 
         """
         return self.Show(item, False, recursive)
 


@@ -11216,14 +11239,17 @@ if RELEASE_VERSION != _core_.RELEASE_VERSION:
 # http://www.alanwood.net/demos/charsetdiffs.html for differences
 # between the common latin/roman encodings.
 import locale
 # http://www.alanwood.net/demos/charsetdiffs.html for differences
 # between the common latin/roman encodings.
 import locale

+import codecs

 try:
     default = locale.getdefaultlocale()[1]
 try:
     default = locale.getdefaultlocale()[1]

-except ValueError:
-    default = "iso8859-1"
+    codecs.lookup(default)
+except (ValueError, LookupError):
+    default = _sys.getdefaultencoding()

 if default:
     wx.SetDefaultPyEncoding(default)
 del default
 del locale
 if default:
     wx.SetDefaultPyEncoding(default)
 del default
 del locale

+del codecs

 
 #----------------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------------
 

diff --git a/wxPython/src/mac/_core_wrap.cpp b/wxPython/src/mac/_core_wrap.cpp
index c27c6631f1a4fcffa855bf45e0515fe6fca4638c..8585264fbec93a363a6ea245bcf825dd63d5bf6b 100644 (file)
--- a/wxPython/src/mac/_core_wrap.cpp
+++ b/wxPython/src/mac/_core_wrap.cpp
@@ -38613,7 +38613,8 @@ static PyObject *_wrap_SizerItem_SetRatioWH(PyObject *, PyObject *args, PyObject
 static PyObject *_wrap_SizerItem_SetRatioSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
 static PyObject *_wrap_SizerItem_SetRatioSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;

-    wxSize arg2 ;
+    wxSize *arg2 = 0 ;
+    wxSize temp2 ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {


@@ -38624,18 +38625,12 @@ static PyObject *_wrap_SizerItem_SetRatioSize(PyObject *, PyObject *args, PyObje
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {

-        wxSize * argp;
-        SWIG_Python_ConvertPtr(obj1, (void **)&argp, SWIGTYPE_p_wxSize, SWIG_POINTER_EXCEPTION);
-        if (SWIG_arg_fail(2)) SWIG_fail;
-        if (argp == NULL) {
-            SWIG_null_ref("wxSize");
-        }
-        if (SWIG_arg_fail(2)) SWIG_fail;
-        arg2 = *argp;
+        arg2 = &temp2;
+        if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        (arg1)->SetRatio(arg2);
+        (arg1)->SetRatio((wxSize const &)*arg2);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;


@@ -48783,6 +48778,69 @@ SWIGEXPORT(void) SWIG_init(void) {
     {
         PyDict_SetItemString(d,"WXK_WINDOWS_MENU", SWIG_From_int((int)(WXK_WINDOWS_MENU))); 
     }
     {
         PyDict_SetItemString(d,"WXK_WINDOWS_MENU", SWIG_From_int((int)(WXK_WINDOWS_MENU))); 
     }

+    {
+        PyDict_SetItemString(d,"WXK_COMMAND", SWIG_From_int((int)(WXK_COMMAND))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL1", SWIG_From_int((int)(WXK_SPECIAL1))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL2", SWIG_From_int((int)(WXK_SPECIAL2))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL3", SWIG_From_int((int)(WXK_SPECIAL3))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL4", SWIG_From_int((int)(WXK_SPECIAL4))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL5", SWIG_From_int((int)(WXK_SPECIAL5))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL6", SWIG_From_int((int)(WXK_SPECIAL6))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL7", SWIG_From_int((int)(WXK_SPECIAL7))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL8", SWIG_From_int((int)(WXK_SPECIAL8))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL9", SWIG_From_int((int)(WXK_SPECIAL9))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL10", SWIG_From_int((int)(WXK_SPECIAL10))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL11", SWIG_From_int((int)(WXK_SPECIAL11))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL12", SWIG_From_int((int)(WXK_SPECIAL12))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL13", SWIG_From_int((int)(WXK_SPECIAL13))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL14", SWIG_From_int((int)(WXK_SPECIAL14))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL15", SWIG_From_int((int)(WXK_SPECIAL15))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL16", SWIG_From_int((int)(WXK_SPECIAL16))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL17", SWIG_From_int((int)(WXK_SPECIAL17))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL18", SWIG_From_int((int)(WXK_SPECIAL18))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL19", SWIG_From_int((int)(WXK_SPECIAL19))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL20", SWIG_From_int((int)(WXK_SPECIAL20))); 
+    }

     {
         PyDict_SetItemString(d,"PAPER_NONE", SWIG_From_int((int)(wxPAPER_NONE))); 
     }
     {
         PyDict_SetItemString(d,"PAPER_NONE", SWIG_From_int((int)(wxPAPER_NONE))); 
     }


@@ -49429,6 +49487,7 @@ SWIGEXPORT(void) SWIG_init(void) {
     PyDict_SetItemString(d, "wxEVT_UPDATE_UI", PyInt_FromLong(wxEVT_UPDATE_UI));
     PyDict_SetItemString(d, "wxEVT_SIZING", PyInt_FromLong(wxEVT_SIZING));
     PyDict_SetItemString(d, "wxEVT_MOVING", PyInt_FromLong(wxEVT_MOVING));
     PyDict_SetItemString(d, "wxEVT_UPDATE_UI", PyInt_FromLong(wxEVT_UPDATE_UI));
     PyDict_SetItemString(d, "wxEVT_SIZING", PyInt_FromLong(wxEVT_SIZING));
     PyDict_SetItemString(d, "wxEVT_MOVING", PyInt_FromLong(wxEVT_MOVING));

+    PyDict_SetItemString(d, "wxEVT_HIBERNATE", PyInt_FromLong(wxEVT_HIBERNATE));

     PyDict_SetItemString(d, "wxEVT_COMMAND_LEFT_CLICK", PyInt_FromLong(wxEVT_COMMAND_LEFT_CLICK));
     PyDict_SetItemString(d, "wxEVT_COMMAND_LEFT_DCLICK", PyInt_FromLong(wxEVT_COMMAND_LEFT_DCLICK));
     PyDict_SetItemString(d, "wxEVT_COMMAND_RIGHT_CLICK", PyInt_FromLong(wxEVT_COMMAND_RIGHT_CLICK));
     PyDict_SetItemString(d, "wxEVT_COMMAND_LEFT_CLICK", PyInt_FromLong(wxEVT_COMMAND_LEFT_CLICK));
     PyDict_SetItemString(d, "wxEVT_COMMAND_LEFT_DCLICK", PyInt_FromLong(wxEVT_COMMAND_LEFT_DCLICK));
     PyDict_SetItemString(d, "wxEVT_COMMAND_RIGHT_CLICK", PyInt_FromLong(wxEVT_COMMAND_RIGHT_CLICK));

diff --git a/wxPython/src/mac/_windows.py b/wxPython/src/mac/_windows.py
index 047be80112957eac5365e413a8fc156ff27a1e5d..97a0ebdf5f5cf583e5c6508bf8a23b05f5dc67a9 100644 (file)
--- a/wxPython/src/mac/_windows.py
+++ b/wxPython/src/mac/_windows.py
@@ -1142,7 +1142,7 @@ class SplitterWindow(_core.Window):
         """
         SetSashSize(self, int width)
 
         """
         SetSashSize(self, int width)
 

-        Sets the sash size.  Currently a NOP.
+        Sets the sash size.

         """
         return _windows_.SplitterWindow_SetSashSize(*args, **kwargs)
 
         """
         return _windows_.SplitterWindow_SetSashSize(*args, **kwargs)
 

diff --git a/wxPython/src/msw/_controls.py b/wxPython/src/msw/_controls.py
index 9609347c74bee1e7a4e839aae5ba0622bc421730..49093178c1cc1c2dc1ef9ea5f0d0619910d05e50 100644 (file)
--- a/wxPython/src/msw/_controls.py
+++ b/wxPython/src/msw/_controls.py
@@ -1553,6 +1553,7 @@ TE_DONTWRAP = _controls_.TE_DONTWRAP
 TE_LINEWRAP = _controls_.TE_LINEWRAP
 TE_WORDWRAP = _controls_.TE_WORDWRAP
 TE_RICH2 = _controls_.TE_RICH2
 TE_LINEWRAP = _controls_.TE_LINEWRAP
 TE_WORDWRAP = _controls_.TE_WORDWRAP
 TE_RICH2 = _controls_.TE_RICH2

+TE_CAPITALIZE = _controls_.TE_CAPITALIZE

 TEXT_ALIGNMENT_DEFAULT = _controls_.TEXT_ALIGNMENT_DEFAULT
 TEXT_ALIGNMENT_LEFT = _controls_.TEXT_ALIGNMENT_LEFT
 TEXT_ALIGNMENT_CENTRE = _controls_.TEXT_ALIGNMENT_CENTRE
 TEXT_ALIGNMENT_DEFAULT = _controls_.TEXT_ALIGNMENT_DEFAULT
 TEXT_ALIGNMENT_LEFT = _controls_.TEXT_ALIGNMENT_LEFT
 TEXT_ALIGNMENT_CENTRE = _controls_.TEXT_ALIGNMENT_CENTRE

diff --git a/wxPython/src/msw/_controls_wrap.cpp b/wxPython/src/msw/_controls_wrap.cpp
index 2f68be5a12587ee8ae24b6126371d945fc6eda39..ecfd57a3b434ab4897149b9e9bfa56967bd1306e 100644 (file)
--- a/wxPython/src/msw/_controls_wrap.cpp
+++ b/wxPython/src/msw/_controls_wrap.cpp
@@ -37678,6 +37678,9 @@ SWIGEXPORT(void) SWIG_init(void) {
     {
         PyDict_SetItemString(d,"TE_RICH2", SWIG_From_int((int)(wxTE_RICH2))); 
     }
     {
         PyDict_SetItemString(d,"TE_RICH2", SWIG_From_int((int)(wxTE_RICH2))); 
     }

+    {
+        PyDict_SetItemString(d,"TE_CAPITALIZE", SWIG_From_int((int)(wxTE_CAPITALIZE))); 
+    }

     {
         PyDict_SetItemString(d,"TEXT_ALIGNMENT_DEFAULT", SWIG_From_int((int)(wxTEXT_ALIGNMENT_DEFAULT))); 
     }
     {
         PyDict_SetItemString(d,"TEXT_ALIGNMENT_DEFAULT", SWIG_From_int((int)(wxTEXT_ALIGNMENT_DEFAULT))); 
     }

diff --git a/wxPython/src/msw/_core.py b/wxPython/src/msw/_core.py
index 663d58586d95465b658b7ff3ec5221dacebe40a0..5629f82dbede3b7bdbb8193535b2b15f450a7318 100644 (file)
--- a/wxPython/src/msw/_core.py
+++ b/wxPython/src/msw/_core.py
@@ -504,6 +504,27 @@ WXK_NUMPAD_DIVIDE = _core_.WXK_NUMPAD_DIVIDE
 WXK_WINDOWS_LEFT = _core_.WXK_WINDOWS_LEFT
 WXK_WINDOWS_RIGHT = _core_.WXK_WINDOWS_RIGHT
 WXK_WINDOWS_MENU = _core_.WXK_WINDOWS_MENU
 WXK_WINDOWS_LEFT = _core_.WXK_WINDOWS_LEFT
 WXK_WINDOWS_RIGHT = _core_.WXK_WINDOWS_RIGHT
 WXK_WINDOWS_MENU = _core_.WXK_WINDOWS_MENU

+WXK_COMMAND = _core_.WXK_COMMAND
+WXK_SPECIAL1 = _core_.WXK_SPECIAL1
+WXK_SPECIAL2 = _core_.WXK_SPECIAL2
+WXK_SPECIAL3 = _core_.WXK_SPECIAL3
+WXK_SPECIAL4 = _core_.WXK_SPECIAL4
+WXK_SPECIAL5 = _core_.WXK_SPECIAL5
+WXK_SPECIAL6 = _core_.WXK_SPECIAL6
+WXK_SPECIAL7 = _core_.WXK_SPECIAL7
+WXK_SPECIAL8 = _core_.WXK_SPECIAL8
+WXK_SPECIAL9 = _core_.WXK_SPECIAL9
+WXK_SPECIAL10 = _core_.WXK_SPECIAL10
+WXK_SPECIAL11 = _core_.WXK_SPECIAL11
+WXK_SPECIAL12 = _core_.WXK_SPECIAL12
+WXK_SPECIAL13 = _core_.WXK_SPECIAL13
+WXK_SPECIAL14 = _core_.WXK_SPECIAL14
+WXK_SPECIAL15 = _core_.WXK_SPECIAL15
+WXK_SPECIAL16 = _core_.WXK_SPECIAL16
+WXK_SPECIAL17 = _core_.WXK_SPECIAL17
+WXK_SPECIAL18 = _core_.WXK_SPECIAL18
+WXK_SPECIAL19 = _core_.WXK_SPECIAL19
+WXK_SPECIAL20 = _core_.WXK_SPECIAL20

 PAPER_NONE = _core_.PAPER_NONE
 PAPER_LETTER = _core_.PAPER_LETTER
 PAPER_LEGAL = _core_.PAPER_LEGAL
 PAPER_NONE = _core_.PAPER_NONE
 PAPER_LETTER = _core_.PAPER_LETTER
 PAPER_LEGAL = _core_.PAPER_LEGAL


@@ -3093,6 +3114,7 @@ wxEVT_IDLE = _core_.wxEVT_IDLE
 wxEVT_UPDATE_UI = _core_.wxEVT_UPDATE_UI
 wxEVT_SIZING = _core_.wxEVT_SIZING
 wxEVT_MOVING = _core_.wxEVT_MOVING
 wxEVT_UPDATE_UI = _core_.wxEVT_UPDATE_UI
 wxEVT_SIZING = _core_.wxEVT_SIZING
 wxEVT_MOVING = _core_.wxEVT_MOVING

+wxEVT_HIBERNATE = _core_.wxEVT_HIBERNATE

 wxEVT_COMMAND_LEFT_CLICK = _core_.wxEVT_COMMAND_LEFT_CLICK
 wxEVT_COMMAND_LEFT_DCLICK = _core_.wxEVT_COMMAND_LEFT_DCLICK
 wxEVT_COMMAND_RIGHT_CLICK = _core_.wxEVT_COMMAND_RIGHT_CLICK
 wxEVT_COMMAND_LEFT_CLICK = _core_.wxEVT_COMMAND_LEFT_CLICK
 wxEVT_COMMAND_LEFT_DCLICK = _core_.wxEVT_COMMAND_LEFT_DCLICK
 wxEVT_COMMAND_RIGHT_CLICK = _core_.wxEVT_COMMAND_RIGHT_CLICK


@@ -3126,6 +3148,7 @@ EVT_KILL_FOCUS = wx.PyEventBinder( wxEVT_KILL_FOCUS )
 EVT_CHILD_FOCUS = wx.PyEventBinder( wxEVT_CHILD_FOCUS )
 EVT_ACTIVATE = wx.PyEventBinder( wxEVT_ACTIVATE )
 EVT_ACTIVATE_APP = wx.PyEventBinder( wxEVT_ACTIVATE_APP )
 EVT_CHILD_FOCUS = wx.PyEventBinder( wxEVT_CHILD_FOCUS )
 EVT_ACTIVATE = wx.PyEventBinder( wxEVT_ACTIVATE )
 EVT_ACTIVATE_APP = wx.PyEventBinder( wxEVT_ACTIVATE_APP )

+EVT_HIBERNATE = wx.PyEventBinder( wxEVT_HIBERNATE )     

 EVT_END_SESSION = wx.PyEventBinder( wxEVT_END_SESSION )
 EVT_QUERY_END_SESSION = wx.PyEventBinder( wxEVT_QUERY_END_SESSION )
 EVT_DROP_FILES = wx.PyEventBinder( wxEVT_DROP_FILES )
 EVT_END_SESSION = wx.PyEventBinder( wxEVT_END_SESSION )
 EVT_QUERY_END_SESSION = wx.PyEventBinder( wxEVT_QUERY_END_SESSION )
 EVT_DROP_FILES = wx.PyEventBinder( wxEVT_DROP_FILES )


@@ -9880,7 +9903,7 @@ class Sizer(Object):
 
     def Hide(self, item, recursive=False):
         """
 
     def Hide(self, item, recursive=False):
         """

-        A convenience method for Show(item, False, recursive).
+        A convenience method for `Show`(item, False, recursive).

         """
         return self.Show(item, False, recursive)
 
         """
         return self.Show(item, False, recursive)
 


@@ -11229,14 +11252,17 @@ if RELEASE_VERSION != _core_.RELEASE_VERSION:
 # http://www.alanwood.net/demos/charsetdiffs.html for differences
 # between the common latin/roman encodings.
 import locale
 # http://www.alanwood.net/demos/charsetdiffs.html for differences
 # between the common latin/roman encodings.
 import locale

+import codecs

 try:
     default = locale.getdefaultlocale()[1]
 try:
     default = locale.getdefaultlocale()[1]

-except ValueError:
-    default = "iso8859-1"
+    codecs.lookup(default)
+except (ValueError, LookupError):
+    default = _sys.getdefaultencoding()

 if default:
     wx.SetDefaultPyEncoding(default)
 del default
 del locale
 if default:
     wx.SetDefaultPyEncoding(default)
 del default
 del locale

+del codecs

 
 #----------------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------------
 

diff --git a/wxPython/src/msw/_core_wrap.cpp b/wxPython/src/msw/_core_wrap.cpp
index 4c4a15f706e4042b6ae46d4f52232fdda1020dd4..7344b710d57ce9baaaf1ee3c854d7042432f9ed0 100644 (file)
--- a/wxPython/src/msw/_core_wrap.cpp
+++ b/wxPython/src/msw/_core_wrap.cpp
@@ -38663,7 +38663,8 @@ static PyObject *_wrap_SizerItem_SetRatioWH(PyObject *, PyObject *args, PyObject
 static PyObject *_wrap_SizerItem_SetRatioSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
 static PyObject *_wrap_SizerItem_SetRatioSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;

-    wxSize arg2 ;
+    wxSize *arg2 = 0 ;
+    wxSize temp2 ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {


@@ -38674,18 +38675,12 @@ static PyObject *_wrap_SizerItem_SetRatioSize(PyObject *, PyObject *args, PyObje
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
     {

-        wxSize * argp;
-        SWIG_Python_ConvertPtr(obj1, (void **)&argp, SWIGTYPE_p_wxSize, SWIG_POINTER_EXCEPTION);
-        if (SWIG_arg_fail(2)) SWIG_fail;
-        if (argp == NULL) {
-            SWIG_null_ref("wxSize");
-        }
-        if (SWIG_arg_fail(2)) SWIG_fail;
-        arg2 = *argp;
+        arg2 = &temp2;
+        if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;

     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();

-        (arg1)->SetRatio(arg2);
+        (arg1)->SetRatio((wxSize const &)*arg2);

         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;


@@ -48835,6 +48830,69 @@ SWIGEXPORT(void) SWIG_init(void) {
     {
         PyDict_SetItemString(d,"WXK_WINDOWS_MENU", SWIG_From_int((int)(WXK_WINDOWS_MENU))); 
     }
     {
         PyDict_SetItemString(d,"WXK_WINDOWS_MENU", SWIG_From_int((int)(WXK_WINDOWS_MENU))); 
     }

+    {
+        PyDict_SetItemString(d,"WXK_COMMAND", SWIG_From_int((int)(WXK_COMMAND))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL1", SWIG_From_int((int)(WXK_SPECIAL1))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL2", SWIG_From_int((int)(WXK_SPECIAL2))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL3", SWIG_From_int((int)(WXK_SPECIAL3))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL4", SWIG_From_int((int)(WXK_SPECIAL4))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL5", SWIG_From_int((int)(WXK_SPECIAL5))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL6", SWIG_From_int((int)(WXK_SPECIAL6))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL7", SWIG_From_int((int)(WXK_SPECIAL7))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL8", SWIG_From_int((int)(WXK_SPECIAL8))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL9", SWIG_From_int((int)(WXK_SPECIAL9))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL10", SWIG_From_int((int)(WXK_SPECIAL10))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL11", SWIG_From_int((int)(WXK_SPECIAL11))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL12", SWIG_From_int((int)(WXK_SPECIAL12))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL13", SWIG_From_int((int)(WXK_SPECIAL13))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL14", SWIG_From_int((int)(WXK_SPECIAL14))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL15", SWIG_From_int((int)(WXK_SPECIAL15))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL16", SWIG_From_int((int)(WXK_SPECIAL16))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL17", SWIG_From_int((int)(WXK_SPECIAL17))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL18", SWIG_From_int((int)(WXK_SPECIAL18))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL19", SWIG_From_int((int)(WXK_SPECIAL19))); 
+    }
+    {
+        PyDict_SetItemString(d,"WXK_SPECIAL20", SWIG_From_int((int)(WXK_SPECIAL20))); 
+    }

     {
         PyDict_SetItemString(d,"PAPER_NONE", SWIG_From_int((int)(wxPAPER_NONE))); 
     }
     {
         PyDict_SetItemString(d,"PAPER_NONE", SWIG_From_int((int)(wxPAPER_NONE))); 
     }


@@ -49481,6 +49539,7 @@ SWIGEXPORT(void) SWIG_init(void) {
     PyDict_SetItemString(d, "wxEVT_UPDATE_UI", PyInt_FromLong(wxEVT_UPDATE_UI));
     PyDict_SetItemString(d, "wxEVT_SIZING", PyInt_FromLong(wxEVT_SIZING));
     PyDict_SetItemString(d, "wxEVT_MOVING", PyInt_FromLong(wxEVT_MOVING));
     PyDict_SetItemString(d, "wxEVT_UPDATE_UI", PyInt_FromLong(wxEVT_UPDATE_UI));
     PyDict_SetItemString(d, "wxEVT_SIZING", PyInt_FromLong(wxEVT_SIZING));
     PyDict_SetItemString(d, "wxEVT_MOVING", PyInt_FromLong(wxEVT_MOVING));

+    PyDict_SetItemString(d, "wxEVT_HIBERNATE", PyInt_FromLong(wxEVT_HIBERNATE));

     PyDict_SetItemString(d, "wxEVT_COMMAND_LEFT_CLICK", PyInt_FromLong(wxEVT_COMMAND_LEFT_CLICK));
     PyDict_SetItemString(d, "wxEVT_COMMAND_LEFT_DCLICK", PyInt_FromLong(wxEVT_COMMAND_LEFT_DCLICK));
     PyDict_SetItemString(d, "wxEVT_COMMAND_RIGHT_CLICK", PyInt_FromLong(wxEVT_COMMAND_RIGHT_CLICK));
     PyDict_SetItemString(d, "wxEVT_COMMAND_LEFT_CLICK", PyInt_FromLong(wxEVT_COMMAND_LEFT_CLICK));
     PyDict_SetItemString(d, "wxEVT_COMMAND_LEFT_DCLICK", PyInt_FromLong(wxEVT_COMMAND_LEFT_DCLICK));
     PyDict_SetItemString(d, "wxEVT_COMMAND_RIGHT_CLICK", PyInt_FromLong(wxEVT_COMMAND_RIGHT_CLICK));

diff --git a/wxPython/src/msw/_windows.py b/wxPython/src/msw/_windows.py
index 211c94cf7bb133c8ac9bfe948342229c52bbd36b..b914fb525baaf2e3ef801674112ff57ffef37d9a 100644 (file)
--- a/wxPython/src/msw/_windows.py
+++ b/wxPython/src/msw/_windows.py
@@ -1142,7 +1142,7 @@ class SplitterWindow(_core.Window):
         """
         SetSashSize(self, int width)
 
         """
         SetSashSize(self, int width)
 

-        Sets the sash size.  Currently a NOP.
+        Sets the sash size.

         """
         return _windows_.SplitterWindow_SetSashSize(*args, **kwargs)
 
         """
         return _windows_.SplitterWindow_SetSashSize(*args, **kwargs)
 

diff --git a/wxPython/wxPython/_controls.py b/wxPython/wxPython/_controls.py
index afae57d2b3074d2fde0c70c003af6d9c9d290a57..e13d7eed2dcbd71860b5ddc825ce7192bc8f6728 100644 (file)
--- a/wxPython/wxPython/_controls.py
+++ b/wxPython/wxPython/_controls.py
@@ -112,6 +112,7 @@ wxTE_DONTWRAP = wx._controls.TE_DONTWRAP
 wxTE_LINEWRAP = wx._controls.TE_LINEWRAP
 wxTE_WORDWRAP = wx._controls.TE_WORDWRAP
 wxTE_RICH2 = wx._controls.TE_RICH2
 wxTE_LINEWRAP = wx._controls.TE_LINEWRAP
 wxTE_WORDWRAP = wx._controls.TE_WORDWRAP
 wxTE_RICH2 = wx._controls.TE_RICH2

+wxTE_CAPITALIZE = wx._controls.TE_CAPITALIZE

 wxTEXT_ALIGNMENT_DEFAULT = wx._controls.TEXT_ALIGNMENT_DEFAULT
 wxTEXT_ALIGNMENT_LEFT = wx._controls.TEXT_ALIGNMENT_LEFT
 wxTEXT_ALIGNMENT_CENTRE = wx._controls.TEXT_ALIGNMENT_CENTRE
 wxTEXT_ALIGNMENT_DEFAULT = wx._controls.TEXT_ALIGNMENT_DEFAULT
 wxTEXT_ALIGNMENT_LEFT = wx._controls.TEXT_ALIGNMENT_LEFT
 wxTEXT_ALIGNMENT_CENTRE = wx._controls.TEXT_ALIGNMENT_CENTRE

diff --git a/wxPython/wxPython/_core.py b/wxPython/wxPython/_core.py
index b978c59d94260b450fe53c56bad5f3f06d64756c..6c6b496ecf633d7841215c5bbbcd9bfb33981d70 100644 (file)
--- a/wxPython/wxPython/_core.py
+++ b/wxPython/wxPython/_core.py
@@ -450,6 +450,27 @@ WXK_NUMPAD_DIVIDE = wx._core.WXK_NUMPAD_DIVIDE
 WXK_WINDOWS_LEFT = wx._core.WXK_WINDOWS_LEFT
 WXK_WINDOWS_RIGHT = wx._core.WXK_WINDOWS_RIGHT
 WXK_WINDOWS_MENU = wx._core.WXK_WINDOWS_MENU
 WXK_WINDOWS_LEFT = wx._core.WXK_WINDOWS_LEFT
 WXK_WINDOWS_RIGHT = wx._core.WXK_WINDOWS_RIGHT
 WXK_WINDOWS_MENU = wx._core.WXK_WINDOWS_MENU

+WXK_COMMAND = wx._core.WXK_COMMAND
+WXK_SPECIAL1 = wx._core.WXK_SPECIAL1
+WXK_SPECIAL2 = wx._core.WXK_SPECIAL2
+WXK_SPECIAL3 = wx._core.WXK_SPECIAL3
+WXK_SPECIAL4 = wx._core.WXK_SPECIAL4
+WXK_SPECIAL5 = wx._core.WXK_SPECIAL5
+WXK_SPECIAL6 = wx._core.WXK_SPECIAL6
+WXK_SPECIAL7 = wx._core.WXK_SPECIAL7
+WXK_SPECIAL8 = wx._core.WXK_SPECIAL8
+WXK_SPECIAL9 = wx._core.WXK_SPECIAL9
+WXK_SPECIAL10 = wx._core.WXK_SPECIAL10
+WXK_SPECIAL11 = wx._core.WXK_SPECIAL11
+WXK_SPECIAL12 = wx._core.WXK_SPECIAL12
+WXK_SPECIAL13 = wx._core.WXK_SPECIAL13
+WXK_SPECIAL14 = wx._core.WXK_SPECIAL14
+WXK_SPECIAL15 = wx._core.WXK_SPECIAL15
+WXK_SPECIAL16 = wx._core.WXK_SPECIAL16
+WXK_SPECIAL17 = wx._core.WXK_SPECIAL17
+WXK_SPECIAL18 = wx._core.WXK_SPECIAL18
+WXK_SPECIAL19 = wx._core.WXK_SPECIAL19
+WXK_SPECIAL20 = wx._core.WXK_SPECIAL20

 wxPAPER_NONE = wx._core.PAPER_NONE
 wxPAPER_LETTER = wx._core.PAPER_LETTER
 wxPAPER_LEGAL = wx._core.PAPER_LEGAL
 wxPAPER_NONE = wx._core.PAPER_NONE
 wxPAPER_LETTER = wx._core.PAPER_LETTER
 wxPAPER_LEGAL = wx._core.PAPER_LEGAL


@@ -842,6 +863,7 @@ wxEVT_IDLE = wx._core.wxEVT_IDLE
 wxEVT_UPDATE_UI = wx._core.wxEVT_UPDATE_UI
 wxEVT_SIZING = wx._core.wxEVT_SIZING
 wxEVT_MOVING = wx._core.wxEVT_MOVING
 wxEVT_UPDATE_UI = wx._core.wxEVT_UPDATE_UI
 wxEVT_SIZING = wx._core.wxEVT_SIZING
 wxEVT_MOVING = wx._core.wxEVT_MOVING

+wxEVT_HIBERNATE = wx._core.wxEVT_HIBERNATE

 wxEVT_COMMAND_LEFT_CLICK = wx._core.wxEVT_COMMAND_LEFT_CLICK
 wxEVT_COMMAND_LEFT_DCLICK = wx._core.wxEVT_COMMAND_LEFT_DCLICK
 wxEVT_COMMAND_RIGHT_CLICK = wx._core.wxEVT_COMMAND_RIGHT_CLICK
 wxEVT_COMMAND_LEFT_CLICK = wx._core.wxEVT_COMMAND_LEFT_CLICK
 wxEVT_COMMAND_LEFT_DCLICK = wx._core.wxEVT_COMMAND_LEFT_DCLICK
 wxEVT_COMMAND_RIGHT_CLICK = wx._core.wxEVT_COMMAND_RIGHT_CLICK