reSWIGged

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

wxPython/contrib/gizmos/gtk/gizmos.py

@@ -357,6 +357,8 @@ class TreeListColumnInfo(_core.Object):
             bool shown=True, int alignment=TL_ALIGN_LEFT) -> TreeListColumnInfo
         """
         _gizmos.TreeListColumnInfo_swiginit(self,_gizmos.new_TreeListColumnInfo(*args, **kwargs))
+    __swig_destroy__ = _gizmos.delete_TreeListColumnInfo
+    __del__ = lambda self : None;
     def GetShown(*args, **kwargs):
         """GetShown(self) -> bool"""
         return _gizmos.TreeListColumnInfo_GetShown(*args, **kwargs)

wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp

@@ -5137,6 +5137,34 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_delete_TreeListColumnInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxTreeListColumnInfo, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_TreeListColumnInfo" "', expected argument " "1"" of type '" "wxTreeListColumnInfo *""'"); 
+  }
+  arg1 = reinterpret_cast< wxTreeListColumnInfo * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    delete arg1;
+    
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_TreeListColumnInfo_GetShown(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ;
@@ -7482,7 +7510,6 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_SetItemData(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  void *argp3 = 0 ;
   int res3 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
@@ -7505,11 +7532,10 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_SetItemData(PyObject *SWIGUNUSEDPARM(sel
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetItemData" "', expected argument " "2"" of type '" "wxTreeItemId const &""'"); 
   }
   arg2 = reinterpret_cast< wxTreeItemId * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxPyTreeItemData, 0 |  0 );
+  res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&arg3), SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "TreeListCtrl_SetItemData" "', expected argument " "3"" of type '" "wxPyTreeItemData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "TreeListCtrl_SetItemData" "', expected argument " "3"" of type '" "wxPyTreeItemData *""'");
   }
-  arg3 = reinterpret_cast< wxPyTreeItemData * >(argp3);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
     wxPyTreeListCtrl_SetItemData(arg1,(wxTreeItemId const &)*arg2,arg3);
@@ -8817,7 +8843,6 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_AddRoot(PyObject *SWIGUNUSEDPARM(self),
   int ecode3 = 0 ;
   int val4 ;
   int ecode4 = 0 ;
-  void *argp5 = 0 ;
   int res5 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
@@ -8854,11 +8879,10 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_AddRoot(PyObject *SWIGUNUSEDPARM(self),
     arg4 = static_cast< int >(val4);
   }
   if (obj4) {
-    res5 = SWIG_ConvertPtr(obj4, &argp5,SWIGTYPE_p_wxPyTreeItemData, 0 |  0 );
+    res5 = SWIG_ConvertPtr(obj4, SWIG_as_voidptrptr(&arg5), SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_DISOWN |  0 );
     if (!SWIG_IsOK(res5)) {
-      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "TreeListCtrl_AddRoot" "', expected argument " "5"" of type '" "wxPyTreeItemData *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "TreeListCtrl_AddRoot" "', expected argument " "5"" of type '" "wxPyTreeItemData *""'");
     }
-    arg5 = reinterpret_cast< wxPyTreeItemData * >(argp5);
   }
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8899,7 +8923,6 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_PrependItem(PyObject *SWIGUNUSEDPARM(sel
   int ecode4 = 0 ;
   int val5 ;
   int ecode5 = 0 ;
-  void *argp6 = 0 ;
   int res6 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
@@ -8945,11 +8968,10 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_PrependItem(PyObject *SWIGUNUSEDPARM(sel
     arg5 = static_cast< int >(val5);
   }
   if (obj5) {
-    res6 = SWIG_ConvertPtr(obj5, &argp6,SWIGTYPE_p_wxPyTreeItemData, 0 |  0 );
+    res6 = SWIG_ConvertPtr(obj5, SWIG_as_voidptrptr(&arg6), SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_DISOWN |  0 );
     if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "TreeListCtrl_PrependItem" "', expected argument " "6"" of type '" "wxPyTreeItemData *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "TreeListCtrl_PrependItem" "', expected argument " "6"" of type '" "wxPyTreeItemData *""'");
     }
-    arg6 = reinterpret_cast< wxPyTreeItemData * >(argp6);
   }
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8993,7 +9015,6 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_InsertItem(PyObject *SWIGUNUSEDPARM(self
   int ecode5 = 0 ;
   int val6 ;
   int ecode6 = 0 ;
-  void *argp7 = 0 ;
   int res7 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
@@ -9048,11 +9069,10 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_InsertItem(PyObject *SWIGUNUSEDPARM(self
     arg6 = static_cast< int >(val6);
   }
   if (obj6) {
-    res7 = SWIG_ConvertPtr(obj6, &argp7,SWIGTYPE_p_wxPyTreeItemData, 0 |  0 );
+    res7 = SWIG_ConvertPtr(obj6, SWIG_as_voidptrptr(&arg7), SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_DISOWN |  0 );
     if (!SWIG_IsOK(res7)) {
-      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "TreeListCtrl_InsertItem" "', expected argument " "7"" of type '" "wxPyTreeItemData *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "TreeListCtrl_InsertItem" "', expected argument " "7"" of type '" "wxPyTreeItemData *""'");
     }
-    arg7 = reinterpret_cast< wxPyTreeItemData * >(argp7);
   }
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9096,7 +9116,6 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_InsertItemBefore(PyObject *SWIGUNUSEDPAR
   int ecode5 = 0 ;
   int val6 ;
   int ecode6 = 0 ;
-  void *argp7 = 0 ;
   int res7 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
@@ -9148,11 +9167,10 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_InsertItemBefore(PyObject *SWIGUNUSEDPAR
     arg6 = static_cast< int >(val6);
   }
   if (obj6) {
-    res7 = SWIG_ConvertPtr(obj6, &argp7,SWIGTYPE_p_wxPyTreeItemData, 0 |  0 );
+    res7 = SWIG_ConvertPtr(obj6, SWIG_as_voidptrptr(&arg7), SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_DISOWN |  0 );
     if (!SWIG_IsOK(res7)) {
-      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "TreeListCtrl_InsertItemBefore" "', expected argument " "7"" of type '" "wxPyTreeItemData *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "TreeListCtrl_InsertItemBefore" "', expected argument " "7"" of type '" "wxPyTreeItemData *""'");
     }
-    arg7 = reinterpret_cast< wxPyTreeItemData * >(argp7);
   }
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9193,7 +9211,6 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_AppendItem(PyObject *SWIGUNUSEDPARM(self
   int ecode4 = 0 ;
   int val5 ;
   int ecode5 = 0 ;
-  void *argp6 = 0 ;
   int res6 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
@@ -9239,11 +9256,10 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_AppendItem(PyObject *SWIGUNUSEDPARM(self
     arg5 = static_cast< int >(val5);
   }
   if (obj5) {
-    res6 = SWIG_ConvertPtr(obj5, &argp6,SWIGTYPE_p_wxPyTreeItemData, 0 |  0 );
+    res6 = SWIG_ConvertPtr(obj5, SWIG_as_voidptrptr(&arg6), SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_DISOWN |  0 );
     if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "TreeListCtrl_AppendItem" "', expected argument " "6"" of type '" "wxPyTreeItemData *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "TreeListCtrl_AppendItem" "', expected argument " "6"" of type '" "wxPyTreeItemData *""'");
     }
-    arg6 = reinterpret_cast< wxPyTreeItemData * >(argp6);
   }
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10868,6 +10884,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"LEDNumberCtrl_swigregister", LEDNumberCtrl_swigregister, METH_VARARGS, NULL},
 	 { (char *)"LEDNumberCtrl_swiginit", LEDNumberCtrl_swiginit, METH_VARARGS, NULL},
 	 { (char *)"new_TreeListColumnInfo", (PyCFunction) _wrap_new_TreeListColumnInfo, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"delete_TreeListColumnInfo", (PyCFunction)_wrap_delete_TreeListColumnInfo, METH_O, NULL},
 	 { (char *)"TreeListColumnInfo_GetShown", (PyCFunction)_wrap_TreeListColumnInfo_GetShown, METH_O, NULL},
 	 { (char *)"TreeListColumnInfo_GetAlignment", (PyCFunction)_wrap_TreeListColumnInfo_GetAlignment, METH_O, NULL},
 	 { (char *)"TreeListColumnInfo_GetText", (PyCFunction)_wrap_TreeListColumnInfo_GetText, METH_O, NULL},

wxPython/src/__core_rename.i

@@ -215,6 +215,7 @@
 %rename(PD_CAN_SKIP)                        wxPD_CAN_SKIP;
 %rename(DD_NEW_DIR_BUTTON)                  wxDD_NEW_DIR_BUTTON;
 %rename(DD_DEFAULT_STYLE)                   wxDD_DEFAULT_STYLE;
+%rename(DD_CHANGE_DIR)                      wxDD_CHANGE_DIR;
 %rename(MENU_TEAROFF)                       wxMENU_TEAROFF;
 %rename(MB_DOCKABLE)                        wxMB_DOCKABLE;
 %rename(NO_FULL_REPAINT_ON_RESIZE)          wxNO_FULL_REPAINT_ON_RESIZE;

wxPython/src/gtk/_controls.py

@@ -1535,6 +1535,11 @@ class TextAttr(object):
         """Init(self)"""
         return _controls_.TextAttr_Init(*args, **kwargs)
 
+    def Merge(*args, **kwargs):
+        """Merge(TextAttr base, TextAttr overlay) -> TextAttr"""
+        return _controls_.TextAttr_Merge(*args, **kwargs)
+
+    Merge = staticmethod(Merge)
     def SetTextColour(*args, **kwargs):
         """SetTextColour(self, Colour colText)"""
         return _controls_.TextAttr_SetTextColour(*args, **kwargs)
@@ -1648,6 +1653,10 @@ TextAttr_swigregister = _controls_.TextAttr_swigregister
 TextAttr_swigregister(TextAttr)
 TextCtrlNameStr = cvar.TextCtrlNameStr
 
+def TextAttr_Merge(*args, **kwargs):
+  """TextAttr_Merge(TextAttr base, TextAttr overlay) -> TextAttr"""
+  return _controls_.TextAttr_Merge(*args, **kwargs)
+
 def TextAttr_Combine(*args, **kwargs):
   """TextAttr_Combine(TextAttr attr, TextAttr attrDef, TextCtrl text) -> TextAttr"""
   return _controls_.TextAttr_Combine(*args, **kwargs)
@@ -2377,6 +2386,14 @@ class RadioBox(_core.Control):
         """GetNextItem(self, int item, int dir, long style) -> int"""
         return _controls_.RadioBox_GetNextItem(*args, **kwargs)
 
+    def SetItemToolTip(*args, **kwargs):
+        """SetItemToolTip(self, unsigned int item, String text)"""
+        return _controls_.RadioBox_SetItemToolTip(*args, **kwargs)
+
+    def GetItemToolTip(*args, **kwargs):
+        """GetItemToolTip(self, unsigned int item) -> ToolTip"""
+        return _controls_.RadioBox_GetItemToolTip(*args, **kwargs)
+
     def GetClassDefaultAttributes(*args, **kwargs):
         """
         GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes

wxPython/src/gtk/_controls_wrap.cpp

@@ -10543,6 +10543,51 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_TextAttr_Merge(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxTextAttr *arg1 = 0 ;
+  wxTextAttr *arg2 = 0 ;
+  wxTextAttr result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "base",(char *) "overlay", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextAttr_Merge",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxTextAttr,  0  | 0);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TextAttr_Merge" "', expected argument " "1"" of type '" "wxTextAttr const &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TextAttr_Merge" "', expected argument " "1"" of type '" "wxTextAttr const &""'"); 
+  }
+  arg1 = reinterpret_cast< wxTextAttr * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTextAttr,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TextAttr_Merge" "', expected argument " "2"" of type '" "wxTextAttr const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TextAttr_Merge" "', expected argument " "2"" of type '" "wxTextAttr const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxTextAttr * >(argp2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = wxTextAttr::Merge((wxTextAttr const &)*arg1,(wxTextAttr const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxTextAttr(static_cast< const wxTextAttr& >(result))), SWIGTYPE_p_wxTextAttr, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_TextAttr_SetTextColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxTextAttr *arg1 = (wxTextAttr *) 0 ;
@@ -16767,6 +16812,101 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_RadioBox_SetItemToolTip(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxRadioBox *arg1 = (wxRadioBox *) 0 ;
+  unsigned int arg2 ;
+  wxString *arg3 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  bool temp3 = false ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "item",(char *) "text", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:RadioBox_SetItemToolTip",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRadioBox, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RadioBox_SetItemToolTip" "', expected argument " "1"" of type '" "wxRadioBox *""'"); 
+  }
+  arg1 = reinterpret_cast< wxRadioBox * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RadioBox_SetItemToolTip" "', expected argument " "2"" of type '" "unsigned int""'");
+  } 
+  arg2 = static_cast< unsigned int >(val2);
+  {
+    arg3 = wxString_in_helper(obj2);
+    if (arg3 == NULL) SWIG_fail;
+    temp3 = true;
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetItemToolTip(arg2,(wxString const &)*arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  {
+    if (temp3)
+    delete arg3;
+  }
+  return resultobj;
+fail:
+  {
+    if (temp3)
+    delete arg3;
+  }
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_RadioBox_GetItemToolTip(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxRadioBox *arg1 = (wxRadioBox *) 0 ;
+  unsigned int arg2 ;
+  wxToolTip *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "item", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RadioBox_GetItemToolTip",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRadioBox, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RadioBox_GetItemToolTip" "', expected argument " "1"" of type '" "wxRadioBox const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxRadioBox * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RadioBox_GetItemToolTip" "', expected argument " "2"" of type '" "unsigned int""'");
+  } 
+  arg2 = static_cast< unsigned int >(val2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxToolTip *)((wxRadioBox const *)arg1)->GetItemToolTip(arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = wxPyMake_wxObject(result, (bool)0); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_RadioBox_GetClassDefaultAttributes(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxWindowVariant arg1 = (wxWindowVariant) wxWINDOW_VARIANT_NORMAL ;
@@ -40861,6 +41001,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"new_TextAttr", (PyCFunction) _wrap_new_TextAttr, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"delete_TextAttr", (PyCFunction)_wrap_delete_TextAttr, METH_O, NULL},
 	 { (char *)"TextAttr_Init", (PyCFunction)_wrap_TextAttr_Init, METH_O, NULL},
+	 { (char *)"TextAttr_Merge", (PyCFunction) _wrap_TextAttr_Merge, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"TextAttr_SetTextColour", (PyCFunction) _wrap_TextAttr_SetTextColour, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"TextAttr_SetBackgroundColour", (PyCFunction) _wrap_TextAttr_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"TextAttr_SetFont", (PyCFunction) _wrap_TextAttr_SetFont, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -41015,6 +41156,8 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"RadioBox_GetColumnCount", (PyCFunction)_wrap_RadioBox_GetColumnCount, METH_O, NULL},
 	 { (char *)"RadioBox_GetRowCount", (PyCFunction)_wrap_RadioBox_GetRowCount, METH_O, NULL},
 	 { (char *)"RadioBox_GetNextItem", (PyCFunction) _wrap_RadioBox_GetNextItem, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"RadioBox_SetItemToolTip", (PyCFunction) _wrap_RadioBox_SetItemToolTip, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"RadioBox_GetItemToolTip", (PyCFunction) _wrap_RadioBox_GetItemToolTip, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"RadioBox_GetClassDefaultAttributes", (PyCFunction) _wrap_RadioBox_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"RadioBox_swigregister", RadioBox_swigregister, METH_VARARGS, NULL},
 	 { (char *)"RadioBox_swiginit", RadioBox_swiginit, METH_VARARGS, NULL},

wxPython/src/gtk/_core.py

@@ -292,6 +292,7 @@ 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
+DD_CHANGE_DIR = _core_.DD_CHANGE_DIR
 MENU_TEAROFF = _core_.MENU_TEAROFF
 MB_DOCKABLE = _core_.MB_DOCKABLE
 NO_FULL_REPAINT_ON_RESIZE = _core_.NO_FULL_REPAINT_ON_RESIZE
@@ -4028,7 +4029,7 @@ class CommandEvent(Event):
 
     def GetInt(*args, **kwargs):
         """
-        GetInt(self) -> long
+        GetInt(self) -> int
 
         Returns the integer identifier corresponding to a listbox, choice or
         radiobox selection (only if the event was a selection, not a
@@ -7137,6 +7138,15 @@ your Mac."""
         self._BootstrapApp()
 
 
+    def OnPreInit(self):
+        """
+        Things that must be done after _BootstrapApp has done its
+        thing, but would be nice if they were already done by the time
+        that OnInit is called.
+        """
+        wx.StockGDI._initStockObjects()
+        
+
     def __del__(self, destroy=wx.PyApp.__del__):
         self.RestoreStdio()  # Just in case the MainLoop was overridden
         destroy(self)
@@ -10674,10 +10684,13 @@ ControlWithItems_swigregister(ControlWithItems)
 class SizerItem(Object):
     """
     The wx.SizerItem class is used to track the position, size and other
-    attributes of each item managed by a `wx.Sizer`. In normal usage user
-    code should never need to deal directly with a wx.SizerItem, but
-    custom classes derived from `wx.PySizer` will probably need to use the
-    collection of wx.SizerItems held by wx.Sizer when calculating layout.
+    attributes of each item managed by a `wx.Sizer`. It is not usually
+    necessary to use this class because the sizer elements can also be
+    identified by their positions or window or sizer references but
+    sometimes it may be more convenient to use wx.SizerItem directly.
+    Also, custom classes derived from `wx.PySizer` will probably need to
+    use the collection of wx.SizerItems held by wx.Sizer when calculating
+    layout.
 
     :see: `wx.Sizer`, `wx.GBSizerItem`
     """

wxPython/src/gtk/_core_wrap.cpp

@@ -2689,6 +2689,7 @@ namespace swig {
 
 #include "wx/wxPython/wxPython_int.h"
 #include "wx/wxPython/pyclasses.h"
+#include "wx/wxPython/twoitem.h"
 
 
 #ifndef wxPyUSE_EXPORT
@@ -19088,7 +19089,7 @@ fail:
 SWIGINTERN PyObject *_wrap_CommandEvent_GetInt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxCommandEvent *arg1 = (wxCommandEvent *) 0 ;
-  long result;
+  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
@@ -19102,11 +19103,11 @@ SWIGINTERN PyObject *_wrap_CommandEvent_GetInt(PyObject *SWIGUNUSEDPARM(self), P
   arg1 = reinterpret_cast< wxCommandEvent * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (long)((wxCommandEvent const *)arg1)->GetInt();
+    result = (int)((wxCommandEvent const *)arg1)->GetInt();
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
-  resultobj = SWIG_From_long(static_cast< long >(result));
+  resultobj = SWIG_From_int(static_cast< int >(result));
   return resultobj;
 fail:
   return NULL;
@@ -55678,6 +55679,7 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "PD_CAN_SKIP",SWIG_From_int(static_cast< int >(wxPD_CAN_SKIP)));
   SWIG_Python_SetConstant(d, "DD_NEW_DIR_BUTTON",SWIG_From_int(static_cast< int >(wxDD_NEW_DIR_BUTTON)));
   SWIG_Python_SetConstant(d, "DD_DEFAULT_STYLE",SWIG_From_int(static_cast< int >(wxDD_DEFAULT_STYLE)));
+  SWIG_Python_SetConstant(d, "DD_CHANGE_DIR",SWIG_From_int(static_cast< int >(wxDD_CHANGE_DIR)));
   SWIG_Python_SetConstant(d, "MENU_TEAROFF",SWIG_From_int(static_cast< int >(wxMENU_TEAROFF)));
   SWIG_Python_SetConstant(d, "MB_DOCKABLE",SWIG_From_int(static_cast< int >(wxMB_DOCKABLE)));
   SWIG_Python_SetConstant(d, "NO_FULL_REPAINT_ON_RESIZE",SWIG_From_int(static_cast< int >(wxNO_FULL_REPAINT_ON_RESIZE)));

wxPython/src/gtk/_gdi.py

@@ -73,6 +73,9 @@ GDIObject_swigregister(GDIObject)
 
 #---------------------------------------------------------------------------
 
+C2S_NAME = _gdi_.C2S_NAME
+C2S_CSS_SYNTAX = _gdi_.C2S_CSS_SYNTAX
+C2S_HTML_SYNTAX = _gdi_.C2S_HTML_SYNTAX
 class Colour(_core.Object):
     """
     A colour is an object representing a combination of Red, Green, and
@@ -168,6 +171,20 @@ class Colour(_core.Object):
         """
         return _gdi_.Colour_SetFromName(*args, **kwargs)
 
+    def GetAsString(*args, **kwargs):
+        """
+        GetAsString(self, long flags=wxC2S_NAME|wxC2S_CSS_SYNTAX) -> String
+
+        Return the colour as a string.  Acceptable flags are:
+
+                    =================== ==================================
+                    wx.C2S_NAME          return colour name, when possible
+                    wx.C2S_CSS_SYNTAX    return colour in rgb(r,g,b) syntax
+                    wx.C2S_HTML_SYNTAX   return colour in #rrggbb syntax     
+                    =================== ==================================
+        """
+        return _gdi_.Colour_GetAsString(*args, **kwargs)
+
     def GetPixel(*args, **kwargs):
         """
         GetPixel(self) -> long
@@ -4303,7 +4320,7 @@ class ImageList(_core.Object):
         return _gdi_.ImageList_GetIcon(*args, **kwargs)
 
     def Replace(*args, **kwargs):
-        """Replace(self, int index, Bitmap bitmap) -> bool"""
+        """Replace(self, int index, Bitmap bitmap, Bitmap mask=NullBitmap) -> bool"""
         return _gdi_.ImageList_Replace(*args, **kwargs)
 
     def Draw(*args, **kwargs):
@@ -4412,6 +4429,49 @@ class StockGDI(object):
         """GetFont(self, int item) -> Font"""
         return _gdi_.StockGDI_GetFont(*args, **kwargs)
 
+    def _initStockObjects():
+        import wx
+        wx.ITALIC_FONT  = StockGDI.instance().GetFont(StockGDI.FONT_ITALIC)
+        wx.NORMAL_FONT  = StockGDI.instance().GetFont(StockGDI.FONT_NORMAL)
+        wx.SMALL_FONT   = StockGDI.instance().GetFont(StockGDI.FONT_SMALL)
+        wx.SWISS_FONT   = StockGDI.instance().GetFont(StockGDI.FONT_SWISS)
+                                              
+        wx.BLACK_DASHED_PEN  = StockGDI.GetPen(StockGDI.PEN_BLACKDASHED)
+        wx.BLACK_PEN         = StockGDI.GetPen(StockGDI.PEN_BLACK)
+        wx.CYAN_PEN          = StockGDI.GetPen(StockGDI.PEN_CYAN)
+        wx.GREEN_PEN         = StockGDI.GetPen(StockGDI.PEN_GREEN)
+        wx.GREY_PEN          = StockGDI.GetPen(StockGDI.PEN_GREY)
+        wx.LIGHT_GREY_PEN    = StockGDI.GetPen(StockGDI.PEN_LIGHTGREY)
+        wx.MEDIUM_GREY_PEN   = StockGDI.GetPen(StockGDI.PEN_MEDIUMGREY)
+        wx.RED_PEN           = StockGDI.GetPen(StockGDI.PEN_RED)
+        wx.TRANSPARENT_PEN   = StockGDI.GetPen(StockGDI.PEN_TRANSPARENT)
+        wx.WHITE_PEN         = StockGDI.GetPen(StockGDI.PEN_WHITE)
+
+        wx.BLACK_BRUSH        = StockGDI.GetBrush(StockGDI.BRUSH_BLACK)
+        wx.BLUE_BRUSH         = StockGDI.GetBrush(StockGDI.BRUSH_BLUE)
+        wx.CYAN_BRUSH         = StockGDI.GetBrush(StockGDI.BRUSH_CYAN)
+        wx.GREEN_BRUSH        = StockGDI.GetBrush(StockGDI.BRUSH_GREEN)
+        wx.GREY_BRUSH         = StockGDI.GetBrush(StockGDI.BRUSH_GREY)
+        wx.LIGHT_GREY_BRUSH   = StockGDI.GetBrush(StockGDI.BRUSH_LIGHTGREY)
+        wx.MEDIUM_GREY_BRUSH  = StockGDI.GetBrush(StockGDI.BRUSH_MEDIUMGREY)
+        wx.RED_BRUSH          = StockGDI.GetBrush(StockGDI.BRUSH_RED)
+        wx.TRANSPARENT_BRUSH  = StockGDI.GetBrush(StockGDI.BRUSH_TRANSPARENT)
+        wx.WHITE_BRUSH        = StockGDI.GetBrush(StockGDI.BRUSH_WHITE)
+
+        wx.BLACK       = StockGDI.GetColour(StockGDI.COLOUR_BLACK)
+        wx.BLUE        = StockGDI.GetColour(StockGDI.COLOUR_BLUE)
+        wx.CYAN        = StockGDI.GetColour(StockGDI.COLOUR_CYAN)
+        wx.GREEN       = StockGDI.GetColour(StockGDI.COLOUR_GREEN)
+        wx.LIGHT_GREY  = StockGDI.GetColour(StockGDI.COLOUR_LIGHTGREY)
+        wx.RED         = StockGDI.GetColour(StockGDI.COLOUR_RED)
+        wx.WHITE       = StockGDI.GetColour(StockGDI.COLOUR_WHITE)
+
+        wx.CROSS_CURSOR      = StockGDI.GetCursor(StockGDI.CURSOR_CROSS)
+        wx.HOURGLASS_CURSOR  = StockGDI.GetCursor(StockGDI.CURSOR_HOURGLASS)
+        wx.STANDARD_CURSOR   = StockGDI.GetCursor(StockGDI.CURSOR_STANDARD)
+        
+    _initStockObjects = staticmethod(_initStockObjects)
+
 StockGDI_swigregister = _gdi_.StockGDI_swigregister
 StockGDI_swigregister(StockGDI)
 
@@ -4439,75 +4499,6 @@ def StockGDI_GetPen(*args, **kwargs):
   """StockGDI_GetPen(int item) -> Pen"""
   return _gdi_.StockGDI_GetPen(*args, **kwargs)
 
-# This function makes a class used to do delayed initialization of some
-# stock wx objects.  When they are used the first time then an init function
-# is called to make the real instance, which is then used to replace the
-# original instance and class seen by the programmer.
-def _wxPyMakeDelayedInitWrapper(initFunc):
-    class _wxPyStockObjectWrapper(object):
-        def __init__(self, *args):
-            self._args = args
-        def __getattr__(self, name):
-            obj = initFunc(*self._args)
-            self.__class__ = obj.__class__
-            self.__dict__ = obj.__dict__
-            return getattr(self, name)
-        def __str__(self):
-            return self.__getattr__("__str__")()
-        def __repr__(self):
-            return self.__getattr__("__repr__")()
-    return _wxPyStockObjectWrapper
-    
-def _wxPyFontInit(id):
-    return StockGDI.instance().GetFont(id)
-                                              
-_wxPyStockPen    = _wxPyMakeDelayedInitWrapper(StockGDI.GetPen)
-_wxPyStockBrush  = _wxPyMakeDelayedInitWrapper(StockGDI.GetBrush)
-_wxPyStockCursor = _wxPyMakeDelayedInitWrapper(StockGDI.GetCursor)
-_wxPyStockColour = _wxPyMakeDelayedInitWrapper(StockGDI.GetColour)                    
-_wxPyStockFont   = _wxPyMakeDelayedInitWrapper(_wxPyFontInit)
-
-
-ITALIC_FONT  = _wxPyStockCursor(StockGDI.FONT_ITALIC)
-NORMAL_FONT  = _wxPyStockCursor(StockGDI.FONT_NORMAL)
-SMALL_FONT   = _wxPyStockCursor(StockGDI.FONT_SMALL)
-SWISS_FONT   = _wxPyStockCursor(StockGDI.FONT_SWISS)
-                                              
-BLACK_DASHED_PEN  = _wxPyStockPen(StockGDI.PEN_BLACKDASHED)
-BLACK_PEN         = _wxPyStockPen(StockGDI.PEN_BLACK)
-CYAN_PEN          = _wxPyStockPen(StockGDI.PEN_CYAN)
-GREEN_PEN         = _wxPyStockPen(StockGDI.PEN_GREEN)
-GREY_PEN          = _wxPyStockPen(StockGDI.PEN_GREY)
-LIGHT_GREY_PEN    = _wxPyStockPen(StockGDI.PEN_LIGHTGREY)
-MEDIUM_GREY_PEN   = _wxPyStockPen(StockGDI.PEN_MEDIUMGREY)
-RED_PEN           = _wxPyStockPen(StockGDI.PEN_RED)
-TRANSPARENT_PEN   = _wxPyStockPen(StockGDI.PEN_TRANSPARENT)
-WHITE_PEN         = _wxPyStockPen(StockGDI.PEN_WHITE)
-
-BLACK_BRUSH        = _wxPyStockBrush(StockGDI.BRUSH_BLACK)
-BLUE_BRUSH         = _wxPyStockBrush(StockGDI.BRUSH_BLUE)
-CYAN_BRUSH         = _wxPyStockBrush(StockGDI.BRUSH_CYAN)
-GREEN_BRUSH        = _wxPyStockBrush(StockGDI.BRUSH_GREEN)
-GREY_BRUSH         = _wxPyStockBrush(StockGDI.BRUSH_GREY)
-LIGHT_GREY_BRUSH   = _wxPyStockBrush(StockGDI.BRUSH_LIGHTGREY)
-MEDIUM_GREY_BRUSH  = _wxPyStockBrush(StockGDI.BRUSH_MEDIUMGREY)
-RED_BRUSH          = _wxPyStockBrush(StockGDI.BRUSH_RED)
-TRANSPARENT_BRUSH  = _wxPyStockBrush(StockGDI.BRUSH_TRANSPARENT)
-WHITE_BRUSH        = _wxPyStockBrush(StockGDI.BRUSH_WHITE)
-
-BLACK       = _wxPyStockColour(StockGDI.COLOUR_BLACK)
-BLUE        = _wxPyStockColour(StockGDI.COLOUR_BLUE)
-CYAN        = _wxPyStockColour(StockGDI.COLOUR_CYAN)
-GREEN       = _wxPyStockColour(StockGDI.COLOUR_GREEN)
-LIGHT_GREY  = _wxPyStockColour(StockGDI.COLOUR_LIGHTGREY)
-RED         = _wxPyStockColour(StockGDI.COLOUR_RED)
-WHITE       = _wxPyStockColour(StockGDI.COLOUR_WHITE)
-    
-CROSS_CURSOR      = _wxPyStockCursor(StockGDI.CURSOR_CROSS)
-HOURGLASS_CURSOR  = _wxPyStockCursor(StockGDI.CURSOR_HOURGLASS)
-STANDARD_CURSOR   = _wxPyStockCursor(StockGDI.CURSOR_STANDARD)
-    
-
 class GDIObjListBase(object):
     """Proxy of C++ GDIObjListBase class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
@@ -4649,6 +4640,25 @@ def _wxPyInitTheBrushList(*args):
 def _wxPyInitTheColourDatabase(*args):
   """_wxPyInitTheColourDatabase() -> ColourDatabase"""
   return _gdi_._wxPyInitTheColourDatabase(*args)
+# This function makes a class used to do delayed initialization of some
+# stock wx objects.  When they are used the first time then an init function
+# is called to make the real instance, which is then used to replace the
+# original instance and class seen by the programmer.
+def _wxPyMakeDelayedInitWrapper(initFunc):
+    class _wxPyStockObjectWrapper(object):
+        def __init__(self, *args):
+            self._args = args
+        def __getattr__(self, name):
+            obj = initFunc(*self._args)
+            self.__class__ = obj.__class__
+            self.__dict__ = obj.__dict__
+            return getattr(self, name)
+        def __str__(self):
+            return self.__getattr__("__str__")()
+        def __repr__(self):
+            return self.__getattr__("__repr__")()
+    return _wxPyStockObjectWrapper
+    
 wxTheFontList       = _wxPyMakeDelayedInitWrapper(_wxPyInitTheFontList)()
 wxThePenList        = _wxPyMakeDelayedInitWrapper(_wxPyInitThePenList)()
 wxTheBrushList      = _wxPyMakeDelayedInitWrapper(_wxPyInitTheBrushList)()
@@ -4890,14 +4900,42 @@ class RendererNative(object):
         """
         return _gdi_.RendererNative_DrawDropArrow(*args, **kwargs)
 
-    def DrawCheckButton(*args, **kwargs):
+    def DrawCheckBox(*args, **kwargs):
         """
-        DrawCheckButton(self, Window win, DC dc, Rect rect, int flags=0)
+        DrawCheckBox(self, Window win, DC dc, Rect rect, int flags=0)
 
         Draw a check button.  Flags may use wx.CONTROL_CHECKED,
         wx.CONTROL_UNDETERMINED and wx.CONTROL_CURRENT.
         """
-        return _gdi_.RendererNative_DrawCheckButton(*args, **kwargs)
+        return _gdi_.RendererNative_DrawCheckBox(*args, **kwargs)
+
+    def DrawPushButton(*args, **kwargs):
+        """
+        DrawPushButton(self, Window win, DC dc, Rect rect, int flags=0)
+
+        Draw a blank button.  Flags may be wx.CONTROL_PRESSED, wx.CONTROL_CURRENT and
+        wx.CONTROL_ISDEFAULT
+        """
+        return _gdi_.RendererNative_DrawPushButton(*args, **kwargs)
+
+    def DrawItemSelectionRect(*args, **kwargs):
+        """
+        DrawItemSelectionRect(self, Window win, DC dc, Rect rect, int flags=0)
+
+        Draw rectangle indicating that an item in e.g. a list control has been
+        selected or focused
+
+        The flags parameter may be:
+
+            ====================  ============================================
+            wx.CONTROL_SELECTED   item is selected, e.g. draw background
+            wx.CONTROL_CURRENT    item is the current item, e.g. dotted border
+            wx.CONTROL_FOCUSED    the whole control has focus, e.g. blue
+                                  background vs. grey otherwise
+            ====================  ============================================
+
+        """
+        return _gdi_.RendererNative_DrawItemSelectionRect(*args, **kwargs)
 
     def GetSplitterParams(*args, **kwargs):
         """

wxPython/src/gtk/_gdi_wrap.cpp

@@ -2701,6 +2701,16 @@ namespace swig {
 
  static const wxString wxPyEmptyString(wxEmptyString); 
 
+  #define SWIG_From_long   PyInt_FromLong 
+
+
+SWIGINTERNINLINE PyObject *
+SWIG_From_int  (int value)
+{    
+  return SWIG_From_long  (value);
+}
+
+
 #include <limits.h>
 #ifndef LLONG_MIN
 # define LLONG_MIN	LONG_LONG_MIN
@@ -2753,9 +2763,6 @@ SWIG_AsVal_unsigned_SS_char (PyObject * obj, unsigned char *val)
 }
 
 
-  #define SWIG_From_long   PyInt_FromLong 
-
-
 SWIGINTERNINLINE PyObject* 
 SWIG_From_unsigned_SS_long  (unsigned long value)
 {
@@ -2822,13 +2829,6 @@ SWIG_AsVal_int (PyObject * obj, int *val)
   return res;
 }
 
-
-SWIGINTERNINLINE PyObject *
-SWIG_From_int  (int value)
-{    
-  return SWIG_From_long  (value);
-}
-
 SWIGINTERN PyObject *wxPen_GetDashes(wxPen *self){
             wxDash* dashes;
             int count = self->GetDashes(&dashes);
@@ -3754,6 +3754,53 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_Colour_GetAsString(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxColour *arg1 = (wxColour *) 0 ;
+  long arg2 = (long) wxC2S_NAME|wxC2S_CSS_SYNTAX ;
+  wxString result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  long val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "flags", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Colour_GetAsString",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxColour, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Colour_GetAsString" "', expected argument " "1"" of type '" "wxColour const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxColour * >(argp1);
+  if (obj1) {
+    ecode2 = SWIG_AsVal_long(obj1, &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Colour_GetAsString" "', expected argument " "2"" of type '" "long""'");
+    } 
+    arg2 = static_cast< long >(val2);
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxColour const *)arg1)->GetAsString(arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+#if wxUSE_UNICODE
+    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
+#else
+    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
+#endif
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_Colour_GetPixel(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxColour *arg1 = (wxColour *) 0 ;
@@ -21591,6 +21638,8 @@ SWIGINTERN PyObject *_wrap_ImageList_Replace(PyObject *SWIGUNUSEDPARM(self), PyO
   wxImageList *arg1 = (wxImageList *) 0 ;
   int arg2 ;
   wxBitmap *arg3 = 0 ;
+  wxBitmap const &arg4_defvalue = wxNullBitmap ;
+  wxBitmap *arg4 = (wxBitmap *) &arg4_defvalue ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -21598,14 +21647,17 @@ SWIGINTERN PyObject *_wrap_ImageList_Replace(PyObject *SWIGUNUSEDPARM(self), PyO
   int ecode2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
   char *  kwnames[] = {
-    (char *) "self",(char *) "index",(char *) "bitmap", NULL 
+    (char *) "self",(char *) "index",(char *) "bitmap",(char *) "mask", NULL 
   };
   
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ImageList_Replace",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:ImageList_Replace",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxImageList, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ImageList_Replace" "', expected argument " "1"" of type '" "wxImageList *""'"); 
@@ -21624,9 +21676,19 @@ SWIGINTERN PyObject *_wrap_ImageList_Replace(PyObject *SWIGUNUSEDPARM(self), PyO
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ImageList_Replace" "', expected argument " "3"" of type '" "wxBitmap const &""'"); 
   }
   arg3 = reinterpret_cast< wxBitmap * >(argp3);
+  if (obj3) {
+    res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_wxBitmap,  0  | 0);
+    if (!SWIG_IsOK(res4)) {
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ImageList_Replace" "', expected argument " "4"" of type '" "wxBitmap const &""'"); 
+    }
+    if (!argp4) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ImageList_Replace" "', expected argument " "4"" of type '" "wxBitmap const &""'"); 
+    }
+    arg4 = reinterpret_cast< wxBitmap * >(argp4);
+  }
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)(arg1)->Replace(arg2,(wxBitmap const &)*arg3);
+    result = (bool)(arg1)->Replace(arg2,(wxBitmap const &)*arg3,(wxBitmap const &)*arg4);
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
@@ -24401,7 +24463,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_RendererNative_DrawCheckButton(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_RendererNative_DrawCheckBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxRendererNative *arg1 = (wxRendererNative *) 0 ;
   wxWindow *arg2 = (wxWindow *) 0 ;
@@ -24426,23 +24488,23 @@ SWIGINTERN PyObject *_wrap_RendererNative_DrawCheckButton(PyObject *SWIGUNUSEDPA
     (char *) "self",(char *) "win",(char *) "dc",(char *) "rect",(char *) "flags", NULL 
   };
   
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:RendererNative_DrawCheckButton",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:RendererNative_DrawCheckBox",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRendererNative, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RendererNative_DrawCheckButton" "', expected argument " "1"" of type '" "wxRendererNative *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RendererNative_DrawCheckBox" "', expected argument " "1"" of type '" "wxRendererNative *""'"); 
   }
   arg1 = reinterpret_cast< wxRendererNative * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "RendererNative_DrawCheckButton" "', expected argument " "2"" of type '" "wxWindow *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "RendererNative_DrawCheckBox" "', expected argument " "2"" of type '" "wxWindow *""'"); 
   }
   arg2 = reinterpret_cast< wxWindow * >(argp2);
   res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxDC,  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "RendererNative_DrawCheckButton" "', expected argument " "3"" of type '" "wxDC &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "RendererNative_DrawCheckBox" "', expected argument " "3"" of type '" "wxDC &""'"); 
   }
   if (!argp3) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "RendererNative_DrawCheckButton" "', expected argument " "3"" of type '" "wxDC &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "RendererNative_DrawCheckBox" "', expected argument " "3"" of type '" "wxDC &""'"); 
   }
   arg3 = reinterpret_cast< wxDC * >(argp3);
   {
@@ -24452,13 +24514,149 @@ SWIGINTERN PyObject *_wrap_RendererNative_DrawCheckButton(PyObject *SWIGUNUSEDPA
   if (obj4) {
     ecode5 = SWIG_AsVal_int(obj4, &val5);
     if (!SWIG_IsOK(ecode5)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "RendererNative_DrawCheckButton" "', expected argument " "5"" of type '" "int""'");
+      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "RendererNative_DrawCheckBox" "', expected argument " "5"" of type '" "int""'");
     } 
     arg5 = static_cast< int >(val5);
   }
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
-    (arg1)->DrawCheckButton(arg2,*arg3,(wxRect const &)*arg4,arg5);
+    (arg1)->DrawCheckBox(arg2,*arg3,(wxRect const &)*arg4,arg5);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_RendererNative_DrawPushButton(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxRendererNative *arg1 = (wxRendererNative *) 0 ;
+  wxWindow *arg2 = (wxWindow *) 0 ;
+  wxDC *arg3 = 0 ;
+  wxRect *arg4 = 0 ;
+  int arg5 = (int) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  wxRect temp4 ;
+  int val5 ;
+  int ecode5 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "win",(char *) "dc",(char *) "rect",(char *) "flags", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:RendererNative_DrawPushButton",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRendererNative, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RendererNative_DrawPushButton" "', expected argument " "1"" of type '" "wxRendererNative *""'"); 
+  }
+  arg1 = reinterpret_cast< wxRendererNative * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "RendererNative_DrawPushButton" "', expected argument " "2"" of type '" "wxWindow *""'"); 
+  }
+  arg2 = reinterpret_cast< wxWindow * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxDC,  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "RendererNative_DrawPushButton" "', expected argument " "3"" of type '" "wxDC &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "RendererNative_DrawPushButton" "', expected argument " "3"" of type '" "wxDC &""'"); 
+  }
+  arg3 = reinterpret_cast< wxDC * >(argp3);
+  {
+    arg4 = &temp4;
+    if ( ! wxRect_helper(obj3, &arg4)) SWIG_fail;
+  }
+  if (obj4) {
+    ecode5 = SWIG_AsVal_int(obj4, &val5);
+    if (!SWIG_IsOK(ecode5)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "RendererNative_DrawPushButton" "', expected argument " "5"" of type '" "int""'");
+    } 
+    arg5 = static_cast< int >(val5);
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->DrawPushButton(arg2,*arg3,(wxRect const &)*arg4,arg5);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_RendererNative_DrawItemSelectionRect(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxRendererNative *arg1 = (wxRendererNative *) 0 ;
+  wxWindow *arg2 = (wxWindow *) 0 ;
+  wxDC *arg3 = 0 ;
+  wxRect *arg4 = 0 ;
+  int arg5 = (int) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  wxRect temp4 ;
+  int val5 ;
+  int ecode5 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "win",(char *) "dc",(char *) "rect",(char *) "flags", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:RendererNative_DrawItemSelectionRect",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRendererNative, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RendererNative_DrawItemSelectionRect" "', expected argument " "1"" of type '" "wxRendererNative *""'"); 
+  }
+  arg1 = reinterpret_cast< wxRendererNative * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "RendererNative_DrawItemSelectionRect" "', expected argument " "2"" of type '" "wxWindow *""'"); 
+  }
+  arg2 = reinterpret_cast< wxWindow * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxDC,  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "RendererNative_DrawItemSelectionRect" "', expected argument " "3"" of type '" "wxDC &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "RendererNative_DrawItemSelectionRect" "', expected argument " "3"" of type '" "wxDC &""'"); 
+  }
+  arg3 = reinterpret_cast< wxDC * >(argp3);
+  {
+    arg4 = &temp4;
+    if ( ! wxRect_helper(obj3, &arg4)) SWIG_fail;
+  }
+  if (obj4) {
+    ecode5 = SWIG_AsVal_int(obj4, &val5);
+    if (!SWIG_IsOK(ecode5)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "RendererNative_DrawItemSelectionRect" "', expected argument " "5"" of type '" "int""'");
+    } 
+    arg5 = static_cast< int >(val5);
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->DrawItemSelectionRect(arg2,*arg3,(wxRect const &)*arg4,arg5);
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
@@ -24653,6 +24851,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"Colour_Set", (PyCFunction) _wrap_Colour_Set, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"Colour_SetRGB", (PyCFunction) _wrap_Colour_SetRGB, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"Colour_SetFromName", (PyCFunction) _wrap_Colour_SetFromName, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"Colour_GetAsString", (PyCFunction) _wrap_Colour_GetAsString, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"Colour_GetPixel", (PyCFunction)_wrap_Colour_GetPixel, METH_O, NULL},
 	 { (char *)"Colour___eq__", (PyCFunction) _wrap_Colour___eq__, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"Colour___ne__", (PyCFunction) _wrap_Colour___ne__, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -25235,7 +25434,9 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"RendererNative_DrawSplitterSash", (PyCFunction) _wrap_RendererNative_DrawSplitterSash, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"RendererNative_DrawComboBoxDropButton", (PyCFunction) _wrap_RendererNative_DrawComboBoxDropButton, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"RendererNative_DrawDropArrow", (PyCFunction) _wrap_RendererNative_DrawDropArrow, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"RendererNative_DrawCheckButton", (PyCFunction) _wrap_RendererNative_DrawCheckButton, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"RendererNative_DrawCheckBox", (PyCFunction) _wrap_RendererNative_DrawCheckBox, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"RendererNative_DrawPushButton", (PyCFunction) _wrap_RendererNative_DrawPushButton, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"RendererNative_DrawItemSelectionRect", (PyCFunction) _wrap_RendererNative_DrawItemSelectionRect, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"RendererNative_GetSplitterParams", (PyCFunction) _wrap_RendererNative_GetSplitterParams, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"RendererNative_Get", (PyCFunction)_wrap_RendererNative_Get, METH_NOARGS, NULL},
 	 { (char *)"RendererNative_GetGeneric", (PyCFunction)_wrap_RendererNative_GetGeneric, METH_NOARGS, NULL},
@@ -26702,6 +26903,9 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_InstallConstants(d,swig_const_table);
   
   
+  SWIG_Python_SetConstant(d, "C2S_NAME",SWIG_From_int(static_cast< int >(wxC2S_NAME)));
+  SWIG_Python_SetConstant(d, "C2S_CSS_SYNTAX",SWIG_From_int(static_cast< int >(wxC2S_CSS_SYNTAX)));
+  SWIG_Python_SetConstant(d, "C2S_HTML_SYNTAX",SWIG_From_int(static_cast< int >(wxC2S_HTML_SYNTAX)));
   SWIG_Python_SetConstant(d, "OutRegion",SWIG_From_int(static_cast< int >(wxOutRegion)));
   SWIG_Python_SetConstant(d, "PartRegion",SWIG_From_int(static_cast< int >(wxPartRegion)));
   SWIG_Python_SetConstant(d, "InRegion",SWIG_From_int(static_cast< int >(wxInRegion)));

wxPython/src/gtk/_misc.py

@@ -908,6 +908,7 @@ class BusyInfo(_core.Object):
         _misc_.BusyInfo_swiginit(self,_misc_.new_BusyInfo(*args, **kwargs))
     __swig_destroy__ = _misc_.delete_BusyInfo
     __del__ = lambda self : None;
+    def Destroy(self): pass 
 BusyInfo_swigregister = _misc_.BusyInfo_swigregister
 BusyInfo_swigregister(BusyInfo)
 

wxPython/src/gtk/_windows.py

@@ -356,6 +356,10 @@ class TopLevelWindow(_core.Window):
         """IsMaximized(self) -> bool"""
         return _windows_.TopLevelWindow_IsMaximized(*args, **kwargs)
 
+    def IsAlwaysMaximized(*args, **kwargs):
+        """IsAlwaysMaximized(self) -> bool"""
+        return _windows_.TopLevelWindow_IsAlwaysMaximized(*args, **kwargs)
+
     def IsIconized(*args, **kwargs):
         """IsIconized(self) -> bool"""
         return _windows_.TopLevelWindow_IsIconized(*args, **kwargs)
@@ -2181,6 +2185,15 @@ class DirDialog(Dialog):
         _windows_.DirDialog_swiginit(self,_windows_.new_DirDialog(*args, **kwargs))
         self._setOORInfo(self)
 
+    def Create(*args, **kwargs):
+        """
+        Create(self, Window parent, String title=wxDirSelectorPromptStr, 
+            String defaultPath=wxEmptyString, long style=DD_DEFAULT_STYLE, 
+            Point pos=DefaultPosition, 
+            Size sz=DefaultSize, String name=DirDialogNameStr) -> bool
+        """
+        return _windows_.DirDialog_Create(*args, **kwargs)
+
     def GetPath(*args, **kwargs):
         """
         GetPath(self) -> String
@@ -2197,14 +2210,6 @@ class DirDialog(Dialog):
         """
         return _windows_.DirDialog_GetMessage(*args, **kwargs)
 
-    def GetStyle(*args, **kwargs):
-        """
-        GetStyle(self) -> long
-
-        Returns the dialog style.
-        """
-        return _windows_.DirDialog_GetStyle(*args, **kwargs)
-
     def SetMessage(*args, **kwargs):
         """
         SetMessage(self, String message)
@@ -2224,6 +2229,16 @@ class DirDialog(Dialog):
 DirDialog_swigregister = _windows_.DirDialog_swigregister
 DirDialog_swigregister(DirDialog)
 
+def PreDirDialog(*args, **kwargs):
+    """
+    PreDirDialog() -> DirDialog
+
+    wx.DirDialog allows the user to select a directory by browising the
+    file system.
+    """
+    val = _windows_.new_PreDirDialog(*args, **kwargs)
+    return val
+
 class FileDialog(Dialog):
     """
     wx.FileDialog allows the user to select one or more files from the
@@ -2743,17 +2758,20 @@ class ProgressDialog(Frame):
 
     def Update(*args, **kwargs):
         """
-        Update(self, int value, String newmsg=EmptyString) -> bool
+        Update(self, int value, String newmsg) --> (continue, skip)
 
         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
-        the Cancel button has been pressed.
+        dialog is closed if it is equal to the maximum.  Returns a tuple of
+        boolean values, ``(continue, skip)`` where ``continue`` is ``True``
+        unless the Cancel button has been pressed, and ``skip`` is ``False``
+        unless the Skip button (if any) has been pressed.
+
+        If the ``continue`` return value is ``false``, the application can either
+        immediately destroy the dialog or ask the user for confirmation, and if the
+        abort is not confirmed the dialog may be resumed with `Resume` function.
 
-        If false is returned, the application can either immediately destroy
-        the dialog or ask the user for the confirmation and if the abort is
-        not confirmed the dialog may be resumed with Resume function.
         """
         return _windows_.ProgressDialog_Update(*args, **kwargs)
 

wxPython/src/gtk/xrc.py

@@ -173,7 +173,7 @@ class XmlResource(_core.Object):
         return _xrc.XmlResource_AttachUnknownControl(*args, **kwargs)
 
     def GetXRCID(*args, **kwargs):
-        """GetXRCID(String str_id) -> int"""
+        """GetXRCID(wxChar str_id, int value_if_not_found=ID_NONE) -> int"""
         return _xrc.XmlResource_GetXRCID(*args, **kwargs)
 
     GetXRCID = staticmethod(GetXRCID)
@@ -225,7 +225,7 @@ def XmlResource_AddSubclassFactory(*args, **kwargs):
   return _xrc.XmlResource_AddSubclassFactory(*args, **kwargs)
 
 def XmlResource_GetXRCID(*args, **kwargs):
-  """XmlResource_GetXRCID(String str_id) -> int"""
+  """XmlResource_GetXRCID(wxChar str_id, int value_if_not_found=ID_NONE) -> int"""
   return _xrc.XmlResource_GetXRCID(*args, **kwargs)
 
 def XmlResource_Get(*args):
@@ -236,8 +236,8 @@ def XmlResource_Set(*args, **kwargs):
   """XmlResource_Set(XmlResource res) -> XmlResource"""
   return _xrc.XmlResource_Set(*args, **kwargs)
 
-def XRCID(str_id):
-    return XmlResource_GetXRCID(str_id)
+def XRCID(str_id, value_if_not_found = wx.ID_NONE):
+    return XmlResource_GetXRCID(str_id, value_if_not_found)
 
 def XRCCTRL(window, str_id, *ignoreargs):
     return window.FindWindowById(XRCID(str_id))

wxPython/src/gtk/xrc_wrap.cpp

@@ -2473,97 +2473,98 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags)
 #define SWIGTYPE_p_wxBitmap swig_types[11]
 #define SWIGTYPE_p_wxBoxSizer swig_types[12]
 #define SWIGTYPE_p_wxCURHandler swig_types[13]
-#define SWIGTYPE_p_wxChildFocusEvent swig_types[14]
-#define SWIGTYPE_p_wxCloseEvent swig_types[15]
-#define SWIGTYPE_p_wxColour swig_types[16]
-#define SWIGTYPE_p_wxCommandEvent swig_types[17]
-#define SWIGTYPE_p_wxContextMenuEvent swig_types[18]
-#define SWIGTYPE_p_wxControl swig_types[19]
-#define SWIGTYPE_p_wxControlWithItems swig_types[20]
-#define SWIGTYPE_p_wxDateEvent swig_types[21]
-#define SWIGTYPE_p_wxDialog swig_types[22]
-#define SWIGTYPE_p_wxDisplayChangedEvent swig_types[23]
-#define SWIGTYPE_p_wxDropFilesEvent swig_types[24]
-#define SWIGTYPE_p_wxDuplexMode swig_types[25]
-#define SWIGTYPE_p_wxEraseEvent swig_types[26]
-#define SWIGTYPE_p_wxEvent swig_types[27]
-#define SWIGTYPE_p_wxEvtHandler swig_types[28]
-#define SWIGTYPE_p_wxFSFile swig_types[29]
-#define SWIGTYPE_p_wxFileSystem swig_types[30]
-#define SWIGTYPE_p_wxFlexGridSizer swig_types[31]
-#define SWIGTYPE_p_wxFocusEvent swig_types[32]
-#define SWIGTYPE_p_wxFont swig_types[33]
-#define SWIGTYPE_p_wxFrame swig_types[34]
-#define SWIGTYPE_p_wxGBSizerItem swig_types[35]
-#define SWIGTYPE_p_wxGIFHandler swig_types[36]
-#define SWIGTYPE_p_wxGridBagSizer swig_types[37]
-#define SWIGTYPE_p_wxGridSizer swig_types[38]
-#define SWIGTYPE_p_wxICOHandler swig_types[39]
-#define SWIGTYPE_p_wxIcon swig_types[40]
-#define SWIGTYPE_p_wxIconizeEvent swig_types[41]
-#define SWIGTYPE_p_wxIdleEvent swig_types[42]
-#define SWIGTYPE_p_wxImage swig_types[43]
-#define SWIGTYPE_p_wxImageHandler swig_types[44]
-#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[45]
-#define SWIGTYPE_p_wxInitDialogEvent swig_types[46]
-#define SWIGTYPE_p_wxInputStream swig_types[47]
-#define SWIGTYPE_p_wxJPEGHandler swig_types[48]
-#define SWIGTYPE_p_wxKeyEvent swig_types[49]
-#define SWIGTYPE_p_wxLayoutConstraints swig_types[50]
-#define SWIGTYPE_p_wxMaximizeEvent swig_types[51]
-#define SWIGTYPE_p_wxMenu swig_types[52]
-#define SWIGTYPE_p_wxMenuBar swig_types[53]
-#define SWIGTYPE_p_wxMenuEvent swig_types[54]
-#define SWIGTYPE_p_wxMenuItem swig_types[55]
-#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[56]
-#define SWIGTYPE_p_wxMouseEvent swig_types[57]
-#define SWIGTYPE_p_wxMoveEvent swig_types[58]
-#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[59]
-#define SWIGTYPE_p_wxNcPaintEvent swig_types[60]
-#define SWIGTYPE_p_wxNotifyEvent swig_types[61]
-#define SWIGTYPE_p_wxObject swig_types[62]
-#define SWIGTYPE_p_wxOutputStream swig_types[63]
-#define SWIGTYPE_p_wxPCXHandler swig_types[64]
-#define SWIGTYPE_p_wxPNGHandler swig_types[65]
-#define SWIGTYPE_p_wxPNMHandler swig_types[66]
-#define SWIGTYPE_p_wxPaintEvent swig_types[67]
-#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[68]
-#define SWIGTYPE_p_wxPanel swig_types[69]
-#define SWIGTYPE_p_wxPaperSize swig_types[70]
-#define SWIGTYPE_p_wxPoint swig_types[71]
-#define SWIGTYPE_p_wxPyApp swig_types[72]
-#define SWIGTYPE_p_wxPyCommandEvent swig_types[73]
-#define SWIGTYPE_p_wxPyEvent swig_types[74]
-#define SWIGTYPE_p_wxPyImageHandler swig_types[75]
-#define SWIGTYPE_p_wxPySizer swig_types[76]
-#define SWIGTYPE_p_wxPyValidator swig_types[77]
-#define SWIGTYPE_p_wxPyXmlResourceHandler swig_types[78]
-#define SWIGTYPE_p_wxPyXmlSubclassFactory swig_types[79]
-#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[80]
-#define SWIGTYPE_p_wxScrollEvent swig_types[81]
-#define SWIGTYPE_p_wxScrollWinEvent swig_types[82]
-#define SWIGTYPE_p_wxSetCursorEvent swig_types[83]
-#define SWIGTYPE_p_wxShowEvent swig_types[84]
-#define SWIGTYPE_p_wxSize swig_types[85]
-#define SWIGTYPE_p_wxSizeEvent swig_types[86]
-#define SWIGTYPE_p_wxSizer swig_types[87]
-#define SWIGTYPE_p_wxSizerItem swig_types[88]
-#define SWIGTYPE_p_wxStaticBoxSizer swig_types[89]
-#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[90]
-#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[91]
-#define SWIGTYPE_p_wxTIFFHandler swig_types[92]
-#define SWIGTYPE_p_wxUpdateUIEvent swig_types[93]
-#define SWIGTYPE_p_wxValidator swig_types[94]
-#define SWIGTYPE_p_wxWindow swig_types[95]
-#define SWIGTYPE_p_wxWindowCreateEvent swig_types[96]
-#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[97]
-#define SWIGTYPE_p_wxXPMHandler swig_types[98]
-#define SWIGTYPE_p_wxXmlDocument swig_types[99]
-#define SWIGTYPE_p_wxXmlNode swig_types[100]
-#define SWIGTYPE_p_wxXmlProperty swig_types[101]
-#define SWIGTYPE_p_wxXmlResource swig_types[102]
-static swig_type_info *swig_types[104];
-static swig_module_info swig_module = {swig_types, 103, 0, 0, 0, 0};
+#define SWIGTYPE_p_wxChar swig_types[14]
+#define SWIGTYPE_p_wxChildFocusEvent swig_types[15]
+#define SWIGTYPE_p_wxCloseEvent swig_types[16]
+#define SWIGTYPE_p_wxColour swig_types[17]
+#define SWIGTYPE_p_wxCommandEvent swig_types[18]
+#define SWIGTYPE_p_wxContextMenuEvent swig_types[19]
+#define SWIGTYPE_p_wxControl swig_types[20]
+#define SWIGTYPE_p_wxControlWithItems swig_types[21]
+#define SWIGTYPE_p_wxDateEvent swig_types[22]
+#define SWIGTYPE_p_wxDialog swig_types[23]
+#define SWIGTYPE_p_wxDisplayChangedEvent swig_types[24]
+#define SWIGTYPE_p_wxDropFilesEvent swig_types[25]
+#define SWIGTYPE_p_wxDuplexMode swig_types[26]
+#define SWIGTYPE_p_wxEraseEvent swig_types[27]
+#define SWIGTYPE_p_wxEvent swig_types[28]
+#define SWIGTYPE_p_wxEvtHandler swig_types[29]
+#define SWIGTYPE_p_wxFSFile swig_types[30]
+#define SWIGTYPE_p_wxFileSystem swig_types[31]
+#define SWIGTYPE_p_wxFlexGridSizer swig_types[32]
+#define SWIGTYPE_p_wxFocusEvent swig_types[33]
+#define SWIGTYPE_p_wxFont swig_types[34]
+#define SWIGTYPE_p_wxFrame swig_types[35]
+#define SWIGTYPE_p_wxGBSizerItem swig_types[36]
+#define SWIGTYPE_p_wxGIFHandler swig_types[37]
+#define SWIGTYPE_p_wxGridBagSizer swig_types[38]
+#define SWIGTYPE_p_wxGridSizer swig_types[39]
+#define SWIGTYPE_p_wxICOHandler swig_types[40]
+#define SWIGTYPE_p_wxIcon swig_types[41]
+#define SWIGTYPE_p_wxIconizeEvent swig_types[42]
+#define SWIGTYPE_p_wxIdleEvent swig_types[43]
+#define SWIGTYPE_p_wxImage swig_types[44]
+#define SWIGTYPE_p_wxImageHandler swig_types[45]
+#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[46]
+#define SWIGTYPE_p_wxInitDialogEvent swig_types[47]
+#define SWIGTYPE_p_wxInputStream swig_types[48]
+#define SWIGTYPE_p_wxJPEGHandler swig_types[49]
+#define SWIGTYPE_p_wxKeyEvent swig_types[50]
+#define SWIGTYPE_p_wxLayoutConstraints swig_types[51]
+#define SWIGTYPE_p_wxMaximizeEvent swig_types[52]
+#define SWIGTYPE_p_wxMenu swig_types[53]
+#define SWIGTYPE_p_wxMenuBar swig_types[54]
+#define SWIGTYPE_p_wxMenuEvent swig_types[55]
+#define SWIGTYPE_p_wxMenuItem swig_types[56]
+#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[57]
+#define SWIGTYPE_p_wxMouseEvent swig_types[58]
+#define SWIGTYPE_p_wxMoveEvent swig_types[59]
+#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[60]
+#define SWIGTYPE_p_wxNcPaintEvent swig_types[61]
+#define SWIGTYPE_p_wxNotifyEvent swig_types[62]
+#define SWIGTYPE_p_wxObject swig_types[63]
+#define SWIGTYPE_p_wxOutputStream swig_types[64]
+#define SWIGTYPE_p_wxPCXHandler swig_types[65]
+#define SWIGTYPE_p_wxPNGHandler swig_types[66]
+#define SWIGTYPE_p_wxPNMHandler swig_types[67]
+#define SWIGTYPE_p_wxPaintEvent swig_types[68]
+#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[69]
+#define SWIGTYPE_p_wxPanel swig_types[70]
+#define SWIGTYPE_p_wxPaperSize swig_types[71]
+#define SWIGTYPE_p_wxPoint swig_types[72]
+#define SWIGTYPE_p_wxPyApp swig_types[73]
+#define SWIGTYPE_p_wxPyCommandEvent swig_types[74]
+#define SWIGTYPE_p_wxPyEvent swig_types[75]
+#define SWIGTYPE_p_wxPyImageHandler swig_types[76]
+#define SWIGTYPE_p_wxPySizer swig_types[77]
+#define SWIGTYPE_p_wxPyValidator swig_types[78]
+#define SWIGTYPE_p_wxPyXmlResourceHandler swig_types[79]
+#define SWIGTYPE_p_wxPyXmlSubclassFactory swig_types[80]
+#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[81]
+#define SWIGTYPE_p_wxScrollEvent swig_types[82]
+#define SWIGTYPE_p_wxScrollWinEvent swig_types[83]
+#define SWIGTYPE_p_wxSetCursorEvent swig_types[84]
+#define SWIGTYPE_p_wxShowEvent swig_types[85]
+#define SWIGTYPE_p_wxSize swig_types[86]
+#define SWIGTYPE_p_wxSizeEvent swig_types[87]
+#define SWIGTYPE_p_wxSizer swig_types[88]
+#define SWIGTYPE_p_wxSizerItem swig_types[89]
+#define SWIGTYPE_p_wxStaticBoxSizer swig_types[90]
+#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[91]
+#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[92]
+#define SWIGTYPE_p_wxTIFFHandler swig_types[93]
+#define SWIGTYPE_p_wxUpdateUIEvent swig_types[94]
+#define SWIGTYPE_p_wxValidator swig_types[95]
+#define SWIGTYPE_p_wxWindow swig_types[96]
+#define SWIGTYPE_p_wxWindowCreateEvent swig_types[97]
+#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[98]
+#define SWIGTYPE_p_wxXPMHandler swig_types[99]
+#define SWIGTYPE_p_wxXmlDocument swig_types[100]
+#define SWIGTYPE_p_wxXmlNode swig_types[101]
+#define SWIGTYPE_p_wxXmlProperty swig_types[102]
+#define SWIGTYPE_p_wxXmlResource swig_types[103]
+static swig_type_info *swig_types[105];
+static swig_module_info swig_module = {swig_types, 104, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -4343,37 +4344,41 @@ fail:
 
 SWIGINTERN PyObject *_wrap_XmlResource_GetXRCID(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
-  wxString *arg1 = 0 ;
+  wxChar *arg1 = (wxChar *) 0 ;
+  int arg2 = (int) wxID_NONE ;
   int result;
-  bool temp1 = false ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
   char *  kwnames[] = {
-    (char *) "str_id", NULL 
+    (char *) "str_id",(char *) "value_if_not_found", NULL 
   };
   
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:XmlResource_GetXRCID",kwnames,&obj0)) SWIG_fail;
-  {
-    arg1 = wxString_in_helper(obj0);
-    if (arg1 == NULL) SWIG_fail;
-    temp1 = true;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:XmlResource_GetXRCID",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxChar, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmlResource_GetXRCID" "', expected argument " "1"" of type '" "wxChar const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxChar * >(argp1);
+  if (obj1) {
+    ecode2 = SWIG_AsVal_int(obj1, &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "XmlResource_GetXRCID" "', expected argument " "2"" of type '" "int""'");
+    } 
+    arg2 = static_cast< int >(val2);
   }
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (int)wxXmlResource::GetXRCID((wxString const &)*arg1);
+    result = (int)wxXmlResource::GetXRCID((wxChar const *)arg1,arg2);
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_From_int(static_cast< int >(result));
-  {
-    if (temp1)
-    delete arg1;
-  }
   return resultobj;
 fail:
-  {
-    if (temp1)
-    delete arg1;
-  }
   return NULL;
 }
 
@@ -8466,6 +8471,15 @@ static PyMethodDef SwigMethods[] = {
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
+static void *_p_wxControlTo_p_wxWindow(void *x) {
+    return (void *)((wxWindow *)  ((wxControl *) x));
+}
+static void *_p_wxControlWithItemsTo_p_wxWindow(void *x) {
+    return (void *)((wxWindow *) (wxControl *) ((wxControlWithItems *) x));
+}
+static void *_p_wxMenuBarTo_p_wxWindow(void *x) {
+    return (void *)((wxWindow *)  ((wxMenuBar *) x));
+}
 static void *_p_wxLayoutConstraintsTo_p_wxObject(void *x) {
     return (void *)((wxObject *)  ((wxLayoutConstraints *) x));
 }
@@ -8703,15 +8717,6 @@ static void *_p_wxPyValidatorTo_p_wxObject(void *x) {
 static void *_p_wxValidatorTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvtHandler *) ((wxValidator *) x));
 }
-static void *_p_wxControlTo_p_wxWindow(void *x) {
-    return (void *)((wxWindow *)  ((wxControl *) x));
-}
-static void *_p_wxControlWithItemsTo_p_wxWindow(void *x) {
-    return (void *)((wxWindow *) (wxControl *) ((wxControlWithItems *) x));
-}
-static void *_p_wxMenuBarTo_p_wxWindow(void *x) {
-    return (void *)((wxWindow *)  ((wxMenuBar *) x));
-}
 static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_form_ops_t = {"_p_form_ops_t", "enum form_ops_t *|form_ops_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_int = {"_p_int", "int *|wxEventType *", 0, 0, (void*)0, 0};
@@ -8720,6 +8725,7 @@ static swig_type_info _swigt__p_unsigned_int = {"_p_unsigned_int", "unsigned int
 static swig_type_info _swigt__p_unsigned_long = {"_p_unsigned_long", "unsigned long *|wxUIntPtr *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxArtClient = {"_p_wxArtClient", "wxArtClient *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxBitmap = {"_p_wxBitmap", "wxBitmap *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_wxChar = {"_p_wxChar", "wxChar *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxColour = {"_p_wxColour", "wxColour *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxDialog = {"_p_wxDialog", "wxDialog *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxDuplexMode = {"_p_wxDuplexMode", "enum wxDuplexMode *|wxDuplexMode *", 0, 0, (void*)0, 0};
@@ -8831,6 +8837,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_wxBitmap,
   &_swigt__p_wxBoxSizer,
   &_swigt__p_wxCURHandler,
+  &_swigt__p_wxChar,
   &_swigt__p_wxChildFocusEvent,
   &_swigt__p_wxCloseEvent,
   &_swigt__p_wxColour,
@@ -8930,6 +8937,7 @@ static swig_cast_info _swigc__p_unsigned_int[] = {  {&_swigt__p_unsigned_int, 0,
 static swig_cast_info _swigc__p_unsigned_long[] = {  {&_swigt__p_unsigned_long, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxArtClient[] = {  {&_swigt__p_wxArtClient, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxBitmap[] = {  {&_swigt__p_wxBitmap, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_wxChar[] = {  {&_swigt__p_wxChar, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxColour[] = {  {&_swigt__p_wxColour, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxDialog[] = {  {&_swigt__p_wxDialog, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxDuplexMode[] = {  {&_swigt__p_wxDuplexMode, 0, 0, 0},{0, 0, 0, 0}};
@@ -9041,6 +9049,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_wxBitmap,
   _swigc__p_wxBoxSizer,
   _swigc__p_wxCURHandler,
+  _swigc__p_wxChar,
   _swigc__p_wxChildFocusEvent,
   _swigc__p_wxCloseEvent,
   _swigc__p_wxColour,

wxPython/wxPython/_controls.py

@@ -127,6 +127,7 @@ wxTE_HT_BEYOND = wx._controls.TE_HT_BEYOND
 wxOutOfRangeTextCoord = wx._controls.OutOfRangeTextCoord
 wxInvalidTextCoord = wx._controls.InvalidTextCoord
 wxTextAttr = wx._controls.TextAttr
+wxTextAttr_Merge = wx._controls.TextAttr_Merge
 wxTextAttr_Combine = wx._controls.TextAttr_Combine
 wxTextCtrl = wx._controls.TextCtrl
 wxPreTextCtrl = wx._controls.PreTextCtrl

wxPython/wxPython/_core.py

@@ -231,6 +231,7 @@ 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
+wxDD_CHANGE_DIR = wx._core.DD_CHANGE_DIR
 wxMENU_TEAROFF = wx._core.MENU_TEAROFF
 wxMB_DOCKABLE = wx._core.MB_DOCKABLE
 wxNO_FULL_REPAINT_ON_RESIZE = wx._core.NO_FULL_REPAINT_ON_RESIZE

wxPython/wxPython/_gdi.py

@@ -20,6 +20,9 @@ del sys, _wx
 
 # Now assign all the reverse-renamed names:
 wxGDIObject = wx._gdi.GDIObject
+wxC2S_NAME = wx._gdi.C2S_NAME
+wxC2S_CSS_SYNTAX = wx._gdi.C2S_CSS_SYNTAX
+wxC2S_HTML_SYNTAX = wx._gdi.C2S_HTML_SYNTAX
 wxColour = wx._gdi.Colour
 wxNamedColour = wx._gdi.NamedColour
 wxColourRGB = wx._gdi.ColourRGB

wxPython/wxPython/_windows.py

@@ -186,6 +186,7 @@ wxColourData = wx._windows.ColourData
 wxColourDialog = wx._windows.ColourDialog
 wxGetColourFromUser = wx._windows.GetColourFromUser
 wxDirDialog = wx._windows.DirDialog
+wxPreDirDialog = wx._windows.PreDirDialog
 wxFileDialog = wx._windows.FileDialog
 wxCHOICEDLG_STYLE = wx._windows.CHOICEDLG_STYLE
 wxMultiChoiceDialog = wx._windows.MultiChoiceDialog