wxRect2DDouble --> wxRect2D

[wxWidgets.git] / wxPython / src / mac / richtext_wrap.cpp

diff --git a/wxPython/src/mac/richtext_wrap.cpp b/wxPython/src/mac/richtext_wrap.cpp
index 830166ebd2175fba28ef3fc47075f176f07acb85..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 ;
 SWIGINTERN PyObject *_wrap_RichTextAttr_HasFont(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxRichTextAttr *arg1 = (wxRichTextAttr *) 0 ;


@@ -11906,7 +11756,7 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_RichTextEvent_GetIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_RichTextEvent_GetPosition(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   wxRichTextEvent *arg1 = (wxRichTextEvent *) 0 ;
   int result;
   PyObject *resultobj = 0;
   wxRichTextEvent *arg1 = (wxRichTextEvent *) 0 ;
   int result;


@@ -11918,12 +11768,12 @@ SWIGINTERN PyObject *_wrap_RichTextEvent_GetIndex(PyObject *SWIGUNUSEDPARM(self)
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxRichTextEvent, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxRichTextEvent, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RichTextEvent_GetIndex" "', expected argument " "1"" of type '" "wxRichTextEvent const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RichTextEvent_GetPosition" "', expected argument " "1"" of type '" "wxRichTextEvent const *""'"); 

   }
   arg1 = reinterpret_cast< wxRichTextEvent * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   }
   arg1 = reinterpret_cast< wxRichTextEvent * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (int)((wxRichTextEvent const *)arg1)->GetIndex();
+    result = (int)((wxRichTextEvent const *)arg1)->GetPosition();

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


@@ -11934,7 +11784,7 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_RichTextEvent_SetIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_RichTextEvent_SetPosition(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxRichTextEvent *arg1 = (wxRichTextEvent *) 0 ;
   int arg2 ;
   PyObject *resultobj = 0;
   wxRichTextEvent *arg1 = (wxRichTextEvent *) 0 ;
   int arg2 ;


@@ -11948,20 +11798,20 @@ SWIGINTERN PyObject *_wrap_RichTextEvent_SetIndex(PyObject *SWIGUNUSEDPARM(self)
     (char *) "self",(char *) "n", NULL 
   };
   
     (char *) "self",(char *) "n", NULL 
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RichTextEvent_SetIndex",kwnames,&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RichTextEvent_SetPosition",kwnames,&obj0,&obj1)) SWIG_fail;

   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRichTextEvent, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRichTextEvent, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RichTextEvent_SetIndex" "', expected argument " "1"" of type '" "wxRichTextEvent *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RichTextEvent_SetPosition" "', expected argument " "1"" of type '" "wxRichTextEvent *""'"); 

   }
   arg1 = reinterpret_cast< wxRichTextEvent * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
   }
   arg1 = reinterpret_cast< wxRichTextEvent * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RichTextEvent_SetIndex" "', expected argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RichTextEvent_SetPosition" "', expected argument " "2"" of type '" "int""'");

   } 
   arg2 = static_cast< int >(val2);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   } 
   arg2 = static_cast< int >(val2);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->SetIndex(arg2);
+    (arg1)->SetPosition(arg2);

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


@@ -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_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},
         { (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},


@@ -12294,8 +12139,8 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"RichTextCtrl_swigregister", RichTextCtrl_swigregister, METH_VARARGS, NULL},
         { (char *)"RichTextCtrl_swiginit", RichTextCtrl_swiginit, METH_VARARGS, NULL},
         { (char *)"new_RichTextEvent", (PyCFunction) _wrap_new_RichTextEvent, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"RichTextCtrl_swigregister", RichTextCtrl_swigregister, METH_VARARGS, NULL},
         { (char *)"RichTextCtrl_swiginit", RichTextCtrl_swiginit, METH_VARARGS, NULL},
         { (char *)"new_RichTextEvent", (PyCFunction) _wrap_new_RichTextEvent, METH_VARARGS | METH_KEYWORDS, NULL},

-        { (char *)"RichTextEvent_GetIndex", (PyCFunction)_wrap_RichTextEvent_GetIndex, METH_O, NULL},
-        { (char *)"RichTextEvent_SetIndex", (PyCFunction) _wrap_RichTextEvent_SetIndex, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"RichTextEvent_GetPosition", (PyCFunction)_wrap_RichTextEvent_GetPosition, METH_O, NULL},
+        { (char *)"RichTextEvent_SetPosition", (PyCFunction) _wrap_RichTextEvent_SetPosition, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"RichTextEvent_GetFlags", (PyCFunction)_wrap_RichTextEvent_GetFlags, METH_O, NULL},
         { (char *)"RichTextEvent_SetFlags", (PyCFunction) _wrap_RichTextEvent_SetFlags, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"RichTextEvent_swigregister", RichTextEvent_swigregister, METH_VARARGS, NULL},
         { (char *)"RichTextEvent_GetFlags", (PyCFunction)_wrap_RichTextEvent_GetFlags, METH_O, NULL},
         { (char *)"RichTextEvent_SetFlags", (PyCFunction) _wrap_RichTextEvent_SetFlags, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"RichTextEvent_swigregister", RichTextEvent_swigregister, METH_VARARGS, NULL},


@@ -14500,8 +14345,6 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "TEXT_ATTR_CHARACTER",SWIG_From_int(static_cast< int >(wxTEXT_ATTR_CHARACTER)));
   SWIG_Python_SetConstant(d, "TEXT_ATTR_PARAGRAPH",SWIG_From_int(static_cast< int >(wxTEXT_ATTR_PARAGRAPH)));
   SWIG_Python_SetConstant(d, "TEXT_ATTR_ALL",SWIG_From_int(static_cast< int >(wxTEXT_ATTR_ALL)));
   SWIG_Python_SetConstant(d, "TEXT_ATTR_CHARACTER",SWIG_From_int(static_cast< int >(wxTEXT_ATTR_CHARACTER)));
   SWIG_Python_SetConstant(d, "TEXT_ATTR_PARAGRAPH",SWIG_From_int(static_cast< int >(wxTEXT_ATTR_PARAGRAPH)));
   SWIG_Python_SetConstant(d, "TEXT_ATTR_ALL",SWIG_From_int(static_cast< int >(wxTEXT_ATTR_ALL)));

-  PyDict_SetItemString(d, "wxEVT_COMMAND_RICHTEXT_ITEM_SELECTED", PyInt_FromLong(wxEVT_COMMAND_RICHTEXT_ITEM_SELECTED));
-  PyDict_SetItemString(d, "wxEVT_COMMAND_RICHTEXT_ITEM_DESELECTED", PyInt_FromLong(wxEVT_COMMAND_RICHTEXT_ITEM_DESELECTED));

   PyDict_SetItemString(d, "wxEVT_COMMAND_RICHTEXT_LEFT_CLICK", PyInt_FromLong(wxEVT_COMMAND_RICHTEXT_LEFT_CLICK));
   PyDict_SetItemString(d, "wxEVT_COMMAND_RICHTEXT_RIGHT_CLICK", PyInt_FromLong(wxEVT_COMMAND_RICHTEXT_RIGHT_CLICK));
   PyDict_SetItemString(d, "wxEVT_COMMAND_RICHTEXT_MIDDLE_CLICK", PyInt_FromLong(wxEVT_COMMAND_RICHTEXT_MIDDLE_CLICK));
   PyDict_SetItemString(d, "wxEVT_COMMAND_RICHTEXT_LEFT_CLICK", PyInt_FromLong(wxEVT_COMMAND_RICHTEXT_LEFT_CLICK));
   PyDict_SetItemString(d, "wxEVT_COMMAND_RICHTEXT_RIGHT_CLICK", PyInt_FromLong(wxEVT_COMMAND_RICHTEXT_RIGHT_CLICK));
   PyDict_SetItemString(d, "wxEVT_COMMAND_RICHTEXT_MIDDLE_CLICK", PyInt_FromLong(wxEVT_COMMAND_RICHTEXT_MIDDLE_CLICK));


@@ -14511,6 +14354,8 @@ SWIGEXPORT void SWIG_init(void) {
   PyDict_SetItemString(d, "wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGED", PyInt_FromLong(wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGED));
   PyDict_SetItemString(d, "wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACING", PyInt_FromLong(wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACING));
   PyDict_SetItemString(d, "wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACED", PyInt_FromLong(wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACED));
   PyDict_SetItemString(d, "wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGED", PyInt_FromLong(wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGED));
   PyDict_SetItemString(d, "wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACING", PyInt_FromLong(wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACING));
   PyDict_SetItemString(d, "wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACED", PyInt_FromLong(wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACED));

+  PyDict_SetItemString(d, "wxEVT_COMMAND_RICHTEXT_CHARACTER", PyInt_FromLong(wxEVT_COMMAND_RICHTEXT_CHARACTER));
+  PyDict_SetItemString(d, "wxEVT_COMMAND_RICHTEXT_DELETE", PyInt_FromLong(wxEVT_COMMAND_RICHTEXT_DELETE));

   
   wxRichTextModuleInit();
   
   
   wxRichTextModuleInit();