reSWIGged

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

diff --git a/wxPython/src/gtk/_core.py b/wxPython/src/gtk/_core.py
index 48fa5b804527261a1bd29f6e2535f33383e747e7..a9d60cfe2a1fda2067f0087f8cfb93620b0a3d63 100644 (file)
--- a/wxPython/src/gtk/_core.py
+++ b/wxPython/src/gtk/_core.py
@@ -8800,6 +8800,14 @@ class Window(EvtHandler):
         """
         return _core_.Window_GetVirtualSizeTuple(*args, **kwargs)
 
+    def GetWindowBorderSize(*args, **kwargs):
+        """
+        GetWindowBorderSize(self) -> Size
+
+        Return the size of the left/right and top/bottom borders.
+        """
+        return _core_.Window_GetWindowBorderSize(*args, **kwargs)
+
     def GetBestVirtualSize(*args, **kwargs):
         """
         GetBestVirtualSize(self) -> Size

diff --git a/wxPython/src/gtk/_core_wrap.cpp b/wxPython/src/gtk/_core_wrap.cpp
index 938349ff2ff2dda7bf67fa577407e908aa25a277..9b3ae372037324605e57162729b994d7cb4fc3f6 100644 (file)
--- a/wxPython/src/gtk/_core_wrap.cpp
+++ b/wxPython/src/gtk/_core_wrap.cpp
@@ -35415,6 +35415,34 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_Window_GetWindowBorderSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxWindow *arg1 = (wxWindow *) 0 ;
+  wxSize result;
+  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_wxWindow, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Window_GetWindowBorderSize" "', expected argument " "1"" of type '" "wxWindow const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxWindow * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxWindow const *)arg1)->GetWindowBorderSize();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxSize(static_cast< const wxSize& >(result))), SWIGTYPE_p_wxSize, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_Window_GetBestVirtualSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxWindow *arg1 = (wxWindow *) 0 ;
@@ -57349,6 +57377,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"Window_SetVirtualSizeWH", (PyCFunction) _wrap_Window_SetVirtualSizeWH, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Window_GetVirtualSize", (PyCFunction)_wrap_Window_GetVirtualSize, METH_O, NULL},
         { (char *)"Window_GetVirtualSizeTuple", (PyCFunction)_wrap_Window_GetVirtualSizeTuple, METH_O, NULL},
+        { (char *)"Window_GetWindowBorderSize", (PyCFunction)_wrap_Window_GetWindowBorderSize, METH_O, NULL},
         { (char *)"Window_GetBestVirtualSize", (PyCFunction)_wrap_Window_GetBestVirtualSize, METH_O, NULL},
         { (char *)"Window_Show", (PyCFunction) _wrap_Window_Show, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Window_Hide", (PyCFunction)_wrap_Window_Hide, METH_O, NULL},

diff --git a/wxPython/src/gtk/aui.py b/wxPython/src/gtk/aui.py
index 2b7f3ed4c9026c8ca36b35eb1e52bbbf34258628..76b76eeb0f89423b3d9805a18f88664a57bac1cc 100644 (file)
--- a/wxPython/src/gtk/aui.py
+++ b/wxPython/src/gtk/aui.py
@@ -866,6 +866,7 @@ class AuiDockInfo(object):
     resizable = property(_aui.AuiDockInfo_resizable_get, _aui.AuiDockInfo_resizable_set)
     toolbar = property(_aui.AuiDockInfo_toolbar_get, _aui.AuiDockInfo_toolbar_set)
     fixed = property(_aui.AuiDockInfo_fixed_get, _aui.AuiDockInfo_fixed_set)
+    reserved1 = property(_aui.AuiDockInfo_reserved1_get, _aui.AuiDockInfo_reserved1_set)
     __swig_destroy__ = _aui.delete_AuiDockInfo
     __del__ = lambda self : None;
 _aui.AuiDockInfo_swigregister(AuiDockInfo)

diff --git a/wxPython/src/gtk/aui_wrap.cpp b/wxPython/src/gtk/aui_wrap.cpp
index 5ab24773dbaf31c8761fe9ee30645645f3e32301..c8ece8100a536c1967a6755bd1fde89c7beb137d 100644 (file)
--- a/wxPython/src/gtk/aui_wrap.cpp
+++ b/wxPython/src/gtk/aui_wrap.cpp
@@ -10083,6 +10083,61 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_AuiDockInfo_reserved1_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxAuiDockInfo *arg1 = (wxAuiDockInfo *) 0 ;
+  bool arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  PyObject *swig_obj[2] ;
+  
+  if (!SWIG_Python_UnpackTuple(args,"AuiDockInfo_reserved1_set",2,2,swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiDockInfo, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiDockInfo_reserved1_set" "', expected argument " "1"" of type '" "wxAuiDockInfo *""'"); 
+  }
+  arg1 = reinterpret_cast< wxAuiDockInfo * >(argp1);
+  ecode2 = SWIG_AsVal_bool(swig_obj[1], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "AuiDockInfo_reserved1_set" "', expected argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);
+  if (arg1) (arg1)->reserved1 = arg2;
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AuiDockInfo_reserved1_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxAuiDockInfo *arg1 = (wxAuiDockInfo *) 0 ;
+  bool result;
+  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_wxAuiDockInfo, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiDockInfo_reserved1_get" "', expected argument " "1"" of type '" "wxAuiDockInfo *""'"); 
+  }
+  arg1 = reinterpret_cast< wxAuiDockInfo * >(argp1);
+  result = (bool) ((arg1)->reserved1);
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_delete_AuiDockInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxAuiDockInfo *arg1 = (wxAuiDockInfo *) 0 ;
@@ -16109,6 +16164,8 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"AuiDockInfo_toolbar_get", (PyCFunction)_wrap_AuiDockInfo_toolbar_get, METH_O, NULL},
         { (char *)"AuiDockInfo_fixed_set", _wrap_AuiDockInfo_fixed_set, METH_VARARGS, NULL},
         { (char *)"AuiDockInfo_fixed_get", (PyCFunction)_wrap_AuiDockInfo_fixed_get, METH_O, NULL},
+        { (char *)"AuiDockInfo_reserved1_set", _wrap_AuiDockInfo_reserved1_set, METH_VARARGS, NULL},
+        { (char *)"AuiDockInfo_reserved1_get", (PyCFunction)_wrap_AuiDockInfo_reserved1_get, METH_O, NULL},
         { (char *)"delete_AuiDockInfo", (PyCFunction)_wrap_delete_AuiDockInfo, METH_O, NULL},
         { (char *)"AuiDockInfo_swigregister", AuiDockInfo_swigregister, METH_VARARGS, NULL},
         { (char *)"AuiDockInfo_swiginit", AuiDockInfo_swiginit, METH_VARARGS, NULL},

diff --git a/wxPython/src/gtk/richtext.py b/wxPython/src/gtk/richtext.py
index bd45131ab4980e8885864f9a342bb21516a94e9b..4bc2f0b0f73479727856172ef89a5a756e4e918f 100644 (file)
--- a/wxPython/src/gtk/richtext.py
+++ b/wxPython/src/gtk/richtext.py
@@ -487,26 +487,6 @@ class RichTextAttr(object):
         """HasRightIndent(self) -> bool"""
         return _richtext.RichTextAttr_HasRightIndent(*args, **kwargs)
 
-    def HasWeight(*args, **kwargs):
-        """HasWeight(self) -> bool"""
-        return _richtext.RichTextAttr_HasWeight(*args, **kwargs)
-
-    def HasSize(*args, **kwargs):
-        """HasSize(self) -> bool"""
-        return _richtext.RichTextAttr_HasSize(*args, **kwargs)
-
-    def HasItalic(*args, **kwargs):
-        """HasItalic(self) -> bool"""
-        return _richtext.RichTextAttr_HasItalic(*args, **kwargs)
-
-    def HasUnderlined(*args, **kwargs):
-        """HasUnderlined(self) -> bool"""
-        return _richtext.RichTextAttr_HasUnderlined(*args, **kwargs)
-
-    def HasFaceName(*args, **kwargs):
-        """HasFaceName(self) -> bool"""
-        return _richtext.RichTextAttr_HasFaceName(*args, **kwargs)
-
     def HasFont(*args, **kwargs):
         """HasFont(self) -> bool"""
         return _richtext.RichTextAttr_HasFont(*args, **kwargs)

diff --git a/wxPython/src/gtk/richtext_wrap.cpp b/wxPython/src/gtk/richtext_wrap.cpp
index 28470a020e856c01f8c1e3a98243cacf413b42bd..e83680e5b84603047cfadb086dea3acb2d351dc7 100644 (file)
--- a/wxPython/src/gtk/richtext_wrap.cpp
+++ b/wxPython/src/gtk/richtext_wrap.cpp
@@ -5363,156 +5363,6 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_RichTextAttr_HasWeight(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxRichTextAttr *arg1 = (wxRichTextAttr *) 0 ;
-  bool result;
-  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_wxRichTextAttr, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RichTextAttr_HasWeight" "', expected argument " "1"" of type '" "wxRichTextAttr const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxRichTextAttr * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxRichTextAttr const *)arg1)->HasWeight();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_RichTextAttr_HasSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxRichTextAttr *arg1 = (wxRichTextAttr *) 0 ;
-  bool result;
-  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_wxRichTextAttr, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RichTextAttr_HasSize" "', expected argument " "1"" of type '" "wxRichTextAttr const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxRichTextAttr * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxRichTextAttr const *)arg1)->HasSize();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_RichTextAttr_HasItalic(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxRichTextAttr *arg1 = (wxRichTextAttr *) 0 ;
-  bool result;
-  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_wxRichTextAttr, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RichTextAttr_HasItalic" "', expected argument " "1"" of type '" "wxRichTextAttr const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxRichTextAttr * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxRichTextAttr const *)arg1)->HasItalic();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_RichTextAttr_HasUnderlined(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxRichTextAttr *arg1 = (wxRichTextAttr *) 0 ;
-  bool result;
-  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_wxRichTextAttr, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RichTextAttr_HasUnderlined" "', expected argument " "1"" of type '" "wxRichTextAttr const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxRichTextAttr * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxRichTextAttr const *)arg1)->HasUnderlined();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_RichTextAttr_HasFaceName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxRichTextAttr *arg1 = (wxRichTextAttr *) 0 ;
-  bool result;
-  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_wxRichTextAttr, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RichTextAttr_HasFaceName" "', expected argument " "1"" of type '" "wxRichTextAttr const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxRichTextAttr * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxRichTextAttr const *)arg1)->HasFaceName();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_RichTextAttr_HasFont(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxRichTextAttr *arg1 = (wxRichTextAttr *) 0 ;
@@ -12122,11 +11972,6 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"RichTextAttr_HasTabs", (PyCFunction)_wrap_RichTextAttr_HasTabs, METH_O, NULL},
         { (char *)"RichTextAttr_HasLeftIndent", (PyCFunction)_wrap_RichTextAttr_HasLeftIndent, METH_O, NULL},
         { (char *)"RichTextAttr_HasRightIndent", (PyCFunction)_wrap_RichTextAttr_HasRightIndent, METH_O, NULL},
-        { (char *)"RichTextAttr_HasWeight", (PyCFunction)_wrap_RichTextAttr_HasWeight, METH_O, NULL},
-        { (char *)"RichTextAttr_HasSize", (PyCFunction)_wrap_RichTextAttr_HasSize, METH_O, NULL},
-        { (char *)"RichTextAttr_HasItalic", (PyCFunction)_wrap_RichTextAttr_HasItalic, METH_O, NULL},
-        { (char *)"RichTextAttr_HasUnderlined", (PyCFunction)_wrap_RichTextAttr_HasUnderlined, METH_O, NULL},
-        { (char *)"RichTextAttr_HasFaceName", (PyCFunction)_wrap_RichTextAttr_HasFaceName, METH_O, NULL},
         { (char *)"RichTextAttr_HasFont", (PyCFunction)_wrap_RichTextAttr_HasFont, METH_O, NULL},
         { (char *)"RichTextAttr_HasParagraphSpacingAfter", (PyCFunction)_wrap_RichTextAttr_HasParagraphSpacingAfter, METH_O, NULL},
         { (char *)"RichTextAttr_HasParagraphSpacingBefore", (PyCFunction)_wrap_RichTextAttr_HasParagraphSpacingBefore, METH_O, NULL},

diff --git a/wxPython/src/mac/_core.py b/wxPython/src/mac/_core.py
index 48fa5b804527261a1bd29f6e2535f33383e747e7..a9d60cfe2a1fda2067f0087f8cfb93620b0a3d63 100644 (file)
--- a/wxPython/src/mac/_core.py
+++ b/wxPython/src/mac/_core.py
@@ -8800,6 +8800,14 @@ class Window(EvtHandler):
         """
         return _core_.Window_GetVirtualSizeTuple(*args, **kwargs)
 
+    def GetWindowBorderSize(*args, **kwargs):
+        """
+        GetWindowBorderSize(self) -> Size
+
+        Return the size of the left/right and top/bottom borders.
+        """
+        return _core_.Window_GetWindowBorderSize(*args, **kwargs)
+
     def GetBestVirtualSize(*args, **kwargs):
         """
         GetBestVirtualSize(self) -> Size

diff --git a/wxPython/src/mac/_core_wrap.cpp b/wxPython/src/mac/_core_wrap.cpp
index 2da13f47c2aaa480ecb554f3d0fd8f81a316ee1d..31fb92c888ce3b4ab6d7733b6a800a6b14352676 100644 (file)
--- a/wxPython/src/mac/_core_wrap.cpp
+++ b/wxPython/src/mac/_core_wrap.cpp
@@ -35414,6 +35414,34 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_Window_GetWindowBorderSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxWindow *arg1 = (wxWindow *) 0 ;
+  wxSize result;
+  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_wxWindow, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Window_GetWindowBorderSize" "', expected argument " "1"" of type '" "wxWindow const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxWindow * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxWindow const *)arg1)->GetWindowBorderSize();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxSize(static_cast< const wxSize& >(result))), SWIGTYPE_p_wxSize, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_Window_GetBestVirtualSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxWindow *arg1 = (wxWindow *) 0 ;
@@ -57348,6 +57376,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"Window_SetVirtualSizeWH", (PyCFunction) _wrap_Window_SetVirtualSizeWH, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Window_GetVirtualSize", (PyCFunction)_wrap_Window_GetVirtualSize, METH_O, NULL},
         { (char *)"Window_GetVirtualSizeTuple", (PyCFunction)_wrap_Window_GetVirtualSizeTuple, METH_O, NULL},
+        { (char *)"Window_GetWindowBorderSize", (PyCFunction)_wrap_Window_GetWindowBorderSize, METH_O, NULL},
         { (char *)"Window_GetBestVirtualSize", (PyCFunction)_wrap_Window_GetBestVirtualSize, METH_O, NULL},
         { (char *)"Window_Show", (PyCFunction) _wrap_Window_Show, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Window_Hide", (PyCFunction)_wrap_Window_Hide, METH_O, NULL},

diff --git a/wxPython/src/mac/aui.py b/wxPython/src/mac/aui.py
index 2b7f3ed4c9026c8ca36b35eb1e52bbbf34258628..76b76eeb0f89423b3d9805a18f88664a57bac1cc 100644 (file)
--- a/wxPython/src/mac/aui.py
+++ b/wxPython/src/mac/aui.py
@@ -866,6 +866,7 @@ class AuiDockInfo(object):
     resizable = property(_aui.AuiDockInfo_resizable_get, _aui.AuiDockInfo_resizable_set)
     toolbar = property(_aui.AuiDockInfo_toolbar_get, _aui.AuiDockInfo_toolbar_set)
     fixed = property(_aui.AuiDockInfo_fixed_get, _aui.AuiDockInfo_fixed_set)
+    reserved1 = property(_aui.AuiDockInfo_reserved1_get, _aui.AuiDockInfo_reserved1_set)
     __swig_destroy__ = _aui.delete_AuiDockInfo
     __del__ = lambda self : None;
 _aui.AuiDockInfo_swigregister(AuiDockInfo)

diff --git a/wxPython/src/mac/aui_wrap.cpp b/wxPython/src/mac/aui_wrap.cpp
index cd4c2180779fca6f5a2a84e2b30acbcf2c53d252..15380a60a3be600c52a73263f28aa8bfdcef05e6 100644 (file)
--- a/wxPython/src/mac/aui_wrap.cpp
+++ b/wxPython/src/mac/aui_wrap.cpp
@@ -10083,6 +10083,61 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_AuiDockInfo_reserved1_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxAuiDockInfo *arg1 = (wxAuiDockInfo *) 0 ;
+  bool arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  PyObject *swig_obj[2] ;
+  
+  if (!SWIG_Python_UnpackTuple(args,"AuiDockInfo_reserved1_set",2,2,swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiDockInfo, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiDockInfo_reserved1_set" "', expected argument " "1"" of type '" "wxAuiDockInfo *""'"); 
+  }
+  arg1 = reinterpret_cast< wxAuiDockInfo * >(argp1);
+  ecode2 = SWIG_AsVal_bool(swig_obj[1], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "AuiDockInfo_reserved1_set" "', expected argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);
+  if (arg1) (arg1)->reserved1 = arg2;
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AuiDockInfo_reserved1_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxAuiDockInfo *arg1 = (wxAuiDockInfo *) 0 ;
+  bool result;
+  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_wxAuiDockInfo, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiDockInfo_reserved1_get" "', expected argument " "1"" of type '" "wxAuiDockInfo *""'"); 
+  }
+  arg1 = reinterpret_cast< wxAuiDockInfo * >(argp1);
+  result = (bool) ((arg1)->reserved1);
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_delete_AuiDockInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxAuiDockInfo *arg1 = (wxAuiDockInfo *) 0 ;
@@ -16109,6 +16164,8 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"AuiDockInfo_toolbar_get", (PyCFunction)_wrap_AuiDockInfo_toolbar_get, METH_O, NULL},
         { (char *)"AuiDockInfo_fixed_set", _wrap_AuiDockInfo_fixed_set, METH_VARARGS, NULL},
         { (char *)"AuiDockInfo_fixed_get", (PyCFunction)_wrap_AuiDockInfo_fixed_get, METH_O, NULL},
+        { (char *)"AuiDockInfo_reserved1_set", _wrap_AuiDockInfo_reserved1_set, METH_VARARGS, NULL},
+        { (char *)"AuiDockInfo_reserved1_get", (PyCFunction)_wrap_AuiDockInfo_reserved1_get, METH_O, NULL},
         { (char *)"delete_AuiDockInfo", (PyCFunction)_wrap_delete_AuiDockInfo, METH_O, NULL},
         { (char *)"AuiDockInfo_swigregister", AuiDockInfo_swigregister, METH_VARARGS, NULL},
         { (char *)"AuiDockInfo_swiginit", AuiDockInfo_swiginit, METH_VARARGS, NULL},

diff --git a/wxPython/src/mac/richtext.py b/wxPython/src/mac/richtext.py
index bd45131ab4980e8885864f9a342bb21516a94e9b..4bc2f0b0f73479727856172ef89a5a756e4e918f 100644 (file)
--- a/wxPython/src/mac/richtext.py
+++ b/wxPython/src/mac/richtext.py
@@ -487,26 +487,6 @@ class RichTextAttr(object):
         """HasRightIndent(self) -> bool"""
         return _richtext.RichTextAttr_HasRightIndent(*args, **kwargs)
 
-    def HasWeight(*args, **kwargs):
-        """HasWeight(self) -> bool"""
-        return _richtext.RichTextAttr_HasWeight(*args, **kwargs)
-
-    def HasSize(*args, **kwargs):
-        """HasSize(self) -> bool"""
-        return _richtext.RichTextAttr_HasSize(*args, **kwargs)
-
-    def HasItalic(*args, **kwargs):
-        """HasItalic(self) -> bool"""
-        return _richtext.RichTextAttr_HasItalic(*args, **kwargs)
-
-    def HasUnderlined(*args, **kwargs):
-        """HasUnderlined(self) -> bool"""
-        return _richtext.RichTextAttr_HasUnderlined(*args, **kwargs)
-
-    def HasFaceName(*args, **kwargs):
-        """HasFaceName(self) -> bool"""
-        return _richtext.RichTextAttr_HasFaceName(*args, **kwargs)
-
     def HasFont(*args, **kwargs):
         """HasFont(self) -> bool"""
         return _richtext.RichTextAttr_HasFont(*args, **kwargs)

diff --git a/wxPython/src/mac/richtext_wrap.cpp b/wxPython/src/mac/richtext_wrap.cpp
index 765b0f320bc2aa02697c3819d7a64453955ef45c..808f49217fe3718ab316ca872a729136a95f3376 100644 (file)
--- a/wxPython/src/mac/richtext_wrap.cpp
+++ b/wxPython/src/mac/richtext_wrap.cpp
@@ -5363,156 +5363,6 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_RichTextAttr_HasWeight(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxRichTextAttr *arg1 = (wxRichTextAttr *) 0 ;
-  bool result;
-  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_wxRichTextAttr, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RichTextAttr_HasWeight" "', expected argument " "1"" of type '" "wxRichTextAttr const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxRichTextAttr * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxRichTextAttr const *)arg1)->HasWeight();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_RichTextAttr_HasSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxRichTextAttr *arg1 = (wxRichTextAttr *) 0 ;
-  bool result;
-  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_wxRichTextAttr, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RichTextAttr_HasSize" "', expected argument " "1"" of type '" "wxRichTextAttr const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxRichTextAttr * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxRichTextAttr const *)arg1)->HasSize();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_RichTextAttr_HasItalic(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxRichTextAttr *arg1 = (wxRichTextAttr *) 0 ;
-  bool result;
-  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_wxRichTextAttr, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RichTextAttr_HasItalic" "', expected argument " "1"" of type '" "wxRichTextAttr const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxRichTextAttr * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxRichTextAttr const *)arg1)->HasItalic();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_RichTextAttr_HasUnderlined(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxRichTextAttr *arg1 = (wxRichTextAttr *) 0 ;
-  bool result;
-  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_wxRichTextAttr, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RichTextAttr_HasUnderlined" "', expected argument " "1"" of type '" "wxRichTextAttr const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxRichTextAttr * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxRichTextAttr const *)arg1)->HasUnderlined();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_RichTextAttr_HasFaceName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxRichTextAttr *arg1 = (wxRichTextAttr *) 0 ;
-  bool result;
-  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_wxRichTextAttr, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RichTextAttr_HasFaceName" "', expected argument " "1"" of type '" "wxRichTextAttr const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxRichTextAttr * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxRichTextAttr const *)arg1)->HasFaceName();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_RichTextAttr_HasFont(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxRichTextAttr *arg1 = (wxRichTextAttr *) 0 ;
@@ -12122,11 +11972,6 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"RichTextAttr_HasTabs", (PyCFunction)_wrap_RichTextAttr_HasTabs, METH_O, NULL},
         { (char *)"RichTextAttr_HasLeftIndent", (PyCFunction)_wrap_RichTextAttr_HasLeftIndent, METH_O, NULL},
         { (char *)"RichTextAttr_HasRightIndent", (PyCFunction)_wrap_RichTextAttr_HasRightIndent, METH_O, NULL},
-        { (char *)"RichTextAttr_HasWeight", (PyCFunction)_wrap_RichTextAttr_HasWeight, METH_O, NULL},
-        { (char *)"RichTextAttr_HasSize", (PyCFunction)_wrap_RichTextAttr_HasSize, METH_O, NULL},
-        { (char *)"RichTextAttr_HasItalic", (PyCFunction)_wrap_RichTextAttr_HasItalic, METH_O, NULL},
-        { (char *)"RichTextAttr_HasUnderlined", (PyCFunction)_wrap_RichTextAttr_HasUnderlined, METH_O, NULL},
-        { (char *)"RichTextAttr_HasFaceName", (PyCFunction)_wrap_RichTextAttr_HasFaceName, METH_O, NULL},
         { (char *)"RichTextAttr_HasFont", (PyCFunction)_wrap_RichTextAttr_HasFont, METH_O, NULL},
         { (char *)"RichTextAttr_HasParagraphSpacingAfter", (PyCFunction)_wrap_RichTextAttr_HasParagraphSpacingAfter, METH_O, NULL},
         { (char *)"RichTextAttr_HasParagraphSpacingBefore", (PyCFunction)_wrap_RichTextAttr_HasParagraphSpacingBefore, METH_O, NULL},

diff --git a/wxPython/src/msw/_core.py b/wxPython/src/msw/_core.py
index 365a9af8f6c51c04930f948f955429c807134199..0d64933d7c7eefff2a02ba83ffc156dd88e238a3 100644 (file)
--- a/wxPython/src/msw/_core.py
+++ b/wxPython/src/msw/_core.py
@@ -8800,6 +8800,14 @@ class Window(EvtHandler):
         """
         return _core_.Window_GetVirtualSizeTuple(*args, **kwargs)
 
+    def GetWindowBorderSize(*args, **kwargs):
+        """
+        GetWindowBorderSize(self) -> Size
+
+        Return the size of the left/right and top/bottom borders.
+        """
+        return _core_.Window_GetWindowBorderSize(*args, **kwargs)
+
     def GetBestVirtualSize(*args, **kwargs):
         """
         GetBestVirtualSize(self) -> Size

diff --git a/wxPython/src/msw/_core_wrap.cpp b/wxPython/src/msw/_core_wrap.cpp
index 575b236c67d3993f3e55ecfcbe17e086c5a4e09f..9feb750fa6e2f84184b711b3b1f75a90ec526527 100644 (file)
--- a/wxPython/src/msw/_core_wrap.cpp
+++ b/wxPython/src/msw/_core_wrap.cpp
@@ -35399,6 +35399,34 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_Window_GetWindowBorderSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxWindow *arg1 = (wxWindow *) 0 ;
+  wxSize result;
+  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_wxWindow, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Window_GetWindowBorderSize" "', expected argument " "1"" of type '" "wxWindow const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxWindow * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxWindow const *)arg1)->GetWindowBorderSize();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxSize(static_cast< const wxSize& >(result))), SWIGTYPE_p_wxSize, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_Window_GetBestVirtualSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxWindow *arg1 = (wxWindow *) 0 ;
@@ -57374,6 +57402,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"Window_SetVirtualSizeWH", (PyCFunction) _wrap_Window_SetVirtualSizeWH, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Window_GetVirtualSize", (PyCFunction)_wrap_Window_GetVirtualSize, METH_O, NULL},
         { (char *)"Window_GetVirtualSizeTuple", (PyCFunction)_wrap_Window_GetVirtualSizeTuple, METH_O, NULL},
+        { (char *)"Window_GetWindowBorderSize", (PyCFunction)_wrap_Window_GetWindowBorderSize, METH_O, NULL},
         { (char *)"Window_GetBestVirtualSize", (PyCFunction)_wrap_Window_GetBestVirtualSize, METH_O, NULL},
         { (char *)"Window_Show", (PyCFunction) _wrap_Window_Show, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Window_Hide", (PyCFunction)_wrap_Window_Hide, METH_O, NULL},

diff --git a/wxPython/src/msw/aui.py b/wxPython/src/msw/aui.py
index 2b7f3ed4c9026c8ca36b35eb1e52bbbf34258628..76b76eeb0f89423b3d9805a18f88664a57bac1cc 100644 (file)
--- a/wxPython/src/msw/aui.py
+++ b/wxPython/src/msw/aui.py
@@ -866,6 +866,7 @@ class AuiDockInfo(object):
     resizable = property(_aui.AuiDockInfo_resizable_get, _aui.AuiDockInfo_resizable_set)
     toolbar = property(_aui.AuiDockInfo_toolbar_get, _aui.AuiDockInfo_toolbar_set)
     fixed = property(_aui.AuiDockInfo_fixed_get, _aui.AuiDockInfo_fixed_set)
+    reserved1 = property(_aui.AuiDockInfo_reserved1_get, _aui.AuiDockInfo_reserved1_set)
     __swig_destroy__ = _aui.delete_AuiDockInfo
     __del__ = lambda self : None;
 _aui.AuiDockInfo_swigregister(AuiDockInfo)

diff --git a/wxPython/src/msw/aui_wrap.cpp b/wxPython/src/msw/aui_wrap.cpp
index 5ab24773dbaf31c8761fe9ee30645645f3e32301..c8ece8100a536c1967a6755bd1fde89c7beb137d 100644 (file)
--- a/wxPython/src/msw/aui_wrap.cpp
+++ b/wxPython/src/msw/aui_wrap.cpp
@@ -10083,6 +10083,61 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_AuiDockInfo_reserved1_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxAuiDockInfo *arg1 = (wxAuiDockInfo *) 0 ;
+  bool arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  PyObject *swig_obj[2] ;
+  
+  if (!SWIG_Python_UnpackTuple(args,"AuiDockInfo_reserved1_set",2,2,swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiDockInfo, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiDockInfo_reserved1_set" "', expected argument " "1"" of type '" "wxAuiDockInfo *""'"); 
+  }
+  arg1 = reinterpret_cast< wxAuiDockInfo * >(argp1);
+  ecode2 = SWIG_AsVal_bool(swig_obj[1], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "AuiDockInfo_reserved1_set" "', expected argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);
+  if (arg1) (arg1)->reserved1 = arg2;
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AuiDockInfo_reserved1_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxAuiDockInfo *arg1 = (wxAuiDockInfo *) 0 ;
+  bool result;
+  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_wxAuiDockInfo, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiDockInfo_reserved1_get" "', expected argument " "1"" of type '" "wxAuiDockInfo *""'"); 
+  }
+  arg1 = reinterpret_cast< wxAuiDockInfo * >(argp1);
+  result = (bool) ((arg1)->reserved1);
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_delete_AuiDockInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxAuiDockInfo *arg1 = (wxAuiDockInfo *) 0 ;
@@ -16109,6 +16164,8 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"AuiDockInfo_toolbar_get", (PyCFunction)_wrap_AuiDockInfo_toolbar_get, METH_O, NULL},
         { (char *)"AuiDockInfo_fixed_set", _wrap_AuiDockInfo_fixed_set, METH_VARARGS, NULL},
         { (char *)"AuiDockInfo_fixed_get", (PyCFunction)_wrap_AuiDockInfo_fixed_get, METH_O, NULL},
+        { (char *)"AuiDockInfo_reserved1_set", _wrap_AuiDockInfo_reserved1_set, METH_VARARGS, NULL},
+        { (char *)"AuiDockInfo_reserved1_get", (PyCFunction)_wrap_AuiDockInfo_reserved1_get, METH_O, NULL},
         { (char *)"delete_AuiDockInfo", (PyCFunction)_wrap_delete_AuiDockInfo, METH_O, NULL},
         { (char *)"AuiDockInfo_swigregister", AuiDockInfo_swigregister, METH_VARARGS, NULL},
         { (char *)"AuiDockInfo_swiginit", AuiDockInfo_swiginit, METH_VARARGS, NULL},

diff --git a/wxPython/src/msw/richtext.py b/wxPython/src/msw/richtext.py
index bd45131ab4980e8885864f9a342bb21516a94e9b..4bc2f0b0f73479727856172ef89a5a756e4e918f 100644 (file)
--- a/wxPython/src/msw/richtext.py
+++ b/wxPython/src/msw/richtext.py
@@ -487,26 +487,6 @@ class RichTextAttr(object):
         """HasRightIndent(self) -> bool"""
         return _richtext.RichTextAttr_HasRightIndent(*args, **kwargs)
 
-    def HasWeight(*args, **kwargs):
-        """HasWeight(self) -> bool"""
-        return _richtext.RichTextAttr_HasWeight(*args, **kwargs)
-
-    def HasSize(*args, **kwargs):
-        """HasSize(self) -> bool"""
-        return _richtext.RichTextAttr_HasSize(*args, **kwargs)
-
-    def HasItalic(*args, **kwargs):
-        """HasItalic(self) -> bool"""
-        return _richtext.RichTextAttr_HasItalic(*args, **kwargs)
-
-    def HasUnderlined(*args, **kwargs):
-        """HasUnderlined(self) -> bool"""
-        return _richtext.RichTextAttr_HasUnderlined(*args, **kwargs)
-
-    def HasFaceName(*args, **kwargs):
-        """HasFaceName(self) -> bool"""
-        return _richtext.RichTextAttr_HasFaceName(*args, **kwargs)
-
     def HasFont(*args, **kwargs):
         """HasFont(self) -> bool"""
         return _richtext.RichTextAttr_HasFont(*args, **kwargs)

diff --git a/wxPython/src/msw/richtext_wrap.cpp b/wxPython/src/msw/richtext_wrap.cpp
index 28470a020e856c01f8c1e3a98243cacf413b42bd..e83680e5b84603047cfadb086dea3acb2d351dc7 100644 (file)
--- a/wxPython/src/msw/richtext_wrap.cpp
+++ b/wxPython/src/msw/richtext_wrap.cpp
@@ -5363,156 +5363,6 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_RichTextAttr_HasWeight(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxRichTextAttr *arg1 = (wxRichTextAttr *) 0 ;
-  bool result;
-  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_wxRichTextAttr, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RichTextAttr_HasWeight" "', expected argument " "1"" of type '" "wxRichTextAttr const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxRichTextAttr * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxRichTextAttr const *)arg1)->HasWeight();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_RichTextAttr_HasSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxRichTextAttr *arg1 = (wxRichTextAttr *) 0 ;
-  bool result;
-  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_wxRichTextAttr, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RichTextAttr_HasSize" "', expected argument " "1"" of type '" "wxRichTextAttr const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxRichTextAttr * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxRichTextAttr const *)arg1)->HasSize();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_RichTextAttr_HasItalic(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxRichTextAttr *arg1 = (wxRichTextAttr *) 0 ;
-  bool result;
-  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_wxRichTextAttr, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RichTextAttr_HasItalic" "', expected argument " "1"" of type '" "wxRichTextAttr const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxRichTextAttr * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxRichTextAttr const *)arg1)->HasItalic();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_RichTextAttr_HasUnderlined(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxRichTextAttr *arg1 = (wxRichTextAttr *) 0 ;
-  bool result;
-  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_wxRichTextAttr, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RichTextAttr_HasUnderlined" "', expected argument " "1"" of type '" "wxRichTextAttr const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxRichTextAttr * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxRichTextAttr const *)arg1)->HasUnderlined();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_RichTextAttr_HasFaceName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxRichTextAttr *arg1 = (wxRichTextAttr *) 0 ;
-  bool result;
-  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_wxRichTextAttr, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RichTextAttr_HasFaceName" "', expected argument " "1"" of type '" "wxRichTextAttr const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxRichTextAttr * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxRichTextAttr const *)arg1)->HasFaceName();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_RichTextAttr_HasFont(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxRichTextAttr *arg1 = (wxRichTextAttr *) 0 ;
@@ -12122,11 +11972,6 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"RichTextAttr_HasTabs", (PyCFunction)_wrap_RichTextAttr_HasTabs, METH_O, NULL},
         { (char *)"RichTextAttr_HasLeftIndent", (PyCFunction)_wrap_RichTextAttr_HasLeftIndent, METH_O, NULL},
         { (char *)"RichTextAttr_HasRightIndent", (PyCFunction)_wrap_RichTextAttr_HasRightIndent, METH_O, NULL},
-        { (char *)"RichTextAttr_HasWeight", (PyCFunction)_wrap_RichTextAttr_HasWeight, METH_O, NULL},
-        { (char *)"RichTextAttr_HasSize", (PyCFunction)_wrap_RichTextAttr_HasSize, METH_O, NULL},
-        { (char *)"RichTextAttr_HasItalic", (PyCFunction)_wrap_RichTextAttr_HasItalic, METH_O, NULL},
-        { (char *)"RichTextAttr_HasUnderlined", (PyCFunction)_wrap_RichTextAttr_HasUnderlined, METH_O, NULL},
-        { (char *)"RichTextAttr_HasFaceName", (PyCFunction)_wrap_RichTextAttr_HasFaceName, METH_O, NULL},
         { (char *)"RichTextAttr_HasFont", (PyCFunction)_wrap_RichTextAttr_HasFont, METH_O, NULL},
         { (char *)"RichTextAttr_HasParagraphSpacingAfter", (PyCFunction)_wrap_RichTextAttr_HasParagraphSpacingAfter, METH_O, NULL},
         { (char *)"RichTextAttr_HasParagraphSpacingBefore", (PyCFunction)_wrap_RichTextAttr_HasParagraphSpacingBefore, METH_O, NULL},