]> git.saurik.com Git - wxWidgets.git/commitdiff
reSWIGged
authorRobin Dunn <robin@alldunn.com>
Wed, 24 Sep 2003 20:22:51 +0000 (20:22 +0000)
committerRobin Dunn <robin@alldunn.com>
Wed, 24 Sep 2003 20:22:51 +0000 (20:22 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

14 files changed:
wxPython/contrib/stc/gtk/stc_.cpp
wxPython/contrib/stc/gtk/stc_.py
wxPython/src/gtk/controls.cpp
wxPython/src/gtk/controls.py
wxPython/src/gtk/controls2.cpp
wxPython/src/gtk/controls2.py
wxPython/src/gtk/fonts.cpp
wxPython/src/gtk/fonts.py
wxPython/src/gtk/gdi.cpp
wxPython/src/gtk/gdi.py
wxPython/src/gtk/misc2.cpp
wxPython/src/gtk/windows2.cpp
wxPython/src/gtk/wx.cpp
wxPython/src/gtk/wx.py

index 73566980eea360211b727f6da23b27c45d442b7b..eb57360677b4f7ae3cbf627593c155675f86a9fe 100644 (file)
@@ -9010,8 +9010,8 @@ static PyObject *_wrap_wxStyledTextCtrl_GetMouseDownCaptures(PyObject *self, PyO
     return _resultobj;
 }
 
-#define wxStyledTextCtrl_SetCursor(_swigobj,_swigarg0)  (_swigobj->SetCursor(_swigarg0))
-static PyObject *_wrap_wxStyledTextCtrl_SetCursor(PyObject *self, PyObject *args, PyObject *kwargs) {
+#define wxStyledTextCtrl_SetSTCCursor(_swigobj,_swigarg0)  (_swigobj->SetSTCCursor(_swigarg0))
+static PyObject *_wrap_wxStyledTextCtrl_SetSTCCursor(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxStyledTextCtrl * _arg0;
     int  _arg1;
@@ -9019,18 +9019,18 @@ static PyObject *_wrap_wxStyledTextCtrl_SetCursor(PyObject *self, PyObject *args
     char *_kwnames[] = { "self","cursorType", NULL };
 
     self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxStyledTextCtrl_SetCursor",_kwnames,&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxStyledTextCtrl_SetSTCCursor",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextCtrl_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_SetCursor. Expected _wxStyledTextCtrl_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_SetSTCCursor. Expected _wxStyledTextCtrl_p.");
         return NULL;
         }
     }
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
-    wxStyledTextCtrl_SetCursor(_arg0,_arg1);
+    wxStyledTextCtrl_SetSTCCursor(_arg0,_arg1);
 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
@@ -9039,8 +9039,8 @@ static PyObject *_wrap_wxStyledTextCtrl_SetCursor(PyObject *self, PyObject *args
     return _resultobj;
 }
 
-#define wxStyledTextCtrl_GetCursor(_swigobj)  (_swigobj->GetCursor())
-static PyObject *_wrap_wxStyledTextCtrl_GetCursor(PyObject *self, PyObject *args, PyObject *kwargs) {
+#define wxStyledTextCtrl_GetSTCCursor(_swigobj)  (_swigobj->GetSTCCursor())
+static PyObject *_wrap_wxStyledTextCtrl_GetSTCCursor(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxStyledTextCtrl * _arg0;
@@ -9048,18 +9048,18 @@ static PyObject *_wrap_wxStyledTextCtrl_GetCursor(PyObject *self, PyObject *args
     char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxStyledTextCtrl_GetCursor",_kwnames,&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxStyledTextCtrl_GetSTCCursor",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextCtrl_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_GetCursor. Expected _wxStyledTextCtrl_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_GetSTCCursor. Expected _wxStyledTextCtrl_p.");
         return NULL;
         }
     }
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
-    _result = (int )wxStyledTextCtrl_GetCursor(_arg0);
+    _result = (int )wxStyledTextCtrl_GetSTCCursor(_arg0);
 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
@@ -10626,6 +10626,78 @@ static PyObject *_wrap_wxStyledTextCtrl_LoadFile(PyObject *self, PyObject *args,
     return _resultobj;
 }
 
+#define wxStyledTextCtrl_DoDragOver(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->DoDragOver(_swigarg0,_swigarg1,_swigarg2))
+static PyObject *_wrap_wxStyledTextCtrl_DoDragOver(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxDragResult  _result;
+    wxStyledTextCtrl * _arg0;
+    wxCoord  _arg1;
+    wxCoord  _arg2;
+    wxDragResult  _arg3;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","x","y","def", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oiii:wxStyledTextCtrl_DoDragOver",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextCtrl_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_DoDragOver. Expected _wxStyledTextCtrl_p.");
+        return NULL;
+        }
+    }
+{
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    _result = (wxDragResult )wxStyledTextCtrl_DoDragOver(_arg0,_arg1,_arg2,_arg3);
+
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) return NULL;
+}    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxStyledTextCtrl_DoDropText(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->DoDropText(_swigarg0,_swigarg1,_swigarg2))
+static PyObject *_wrap_wxStyledTextCtrl_DoDropText(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxStyledTextCtrl * _arg0;
+    long  _arg1;
+    long  _arg2;
+    wxString * _arg3;
+    PyObject * _argo0 = 0;
+    PyObject * _obj3 = 0;
+    char *_kwnames[] = { "self","x","y","data", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OllO:wxStyledTextCtrl_DoDropText",_kwnames,&_argo0,&_arg1,&_arg2,&_obj3)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextCtrl_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_DoDropText. Expected _wxStyledTextCtrl_p.");
+        return NULL;
+        }
+    }
+{
+    _arg3 = wxString_in_helper(_obj3);
+    if (_arg3 == NULL)
+        return NULL;
+}
+{
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    _result = (bool )wxStyledTextCtrl_DoDropText(_arg0,_arg1,_arg2,*_arg3);
+
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) return NULL;
+}    _resultobj = Py_BuildValue("i",_result);
+{
+    if (_obj3)
+        delete _arg3;
+}
+    return _resultobj;
+}
+
 static void *SwigwxStyledTextEventTowxCommandEvent(void *ptr) {
     wxStyledTextEvent *src;
     wxCommandEvent *dest;
@@ -12052,6 +12124,8 @@ static PyMethodDef stc_cMethods[] = {
         { "wxStyledTextEvent_SetPosition", (PyCFunction) _wrap_wxStyledTextEvent_SetPosition, METH_VARARGS | METH_KEYWORDS },
         { "delete_wxStyledTextEvent", (PyCFunction) _wrap_delete_wxStyledTextEvent, METH_VARARGS | METH_KEYWORDS },
         { "new_wxStyledTextEvent", (PyCFunction) _wrap_new_wxStyledTextEvent, METH_VARARGS | METH_KEYWORDS },
+        { "wxStyledTextCtrl_DoDropText", (PyCFunction) _wrap_wxStyledTextCtrl_DoDropText, METH_VARARGS | METH_KEYWORDS },
+        { "wxStyledTextCtrl_DoDragOver", (PyCFunction) _wrap_wxStyledTextCtrl_DoDragOver, METH_VARARGS | METH_KEYWORDS },
         { "wxStyledTextCtrl_LoadFile", (PyCFunction) _wrap_wxStyledTextCtrl_LoadFile, METH_VARARGS | METH_KEYWORDS },
         { "wxStyledTextCtrl_SaveFile", (PyCFunction) _wrap_wxStyledTextCtrl_SaveFile, METH_VARARGS | METH_KEYWORDS },
         { "wxStyledTextCtrl_SetLastKeydownProcessed", (PyCFunction) _wrap_wxStyledTextCtrl_SetLastKeydownProcessed, METH_VARARGS | METH_KEYWORDS },
@@ -12100,8 +12174,8 @@ static PyMethodDef stc_cMethods[] = {
         { "wxStyledTextCtrl_WordPartLeft", (PyCFunction) _wrap_wxStyledTextCtrl_WordPartLeft, METH_VARARGS | METH_KEYWORDS },
         { "wxStyledTextCtrl_GetControlCharSymbol", (PyCFunction) _wrap_wxStyledTextCtrl_GetControlCharSymbol, METH_VARARGS | METH_KEYWORDS },
         { "wxStyledTextCtrl_SetControlCharSymbol", (PyCFunction) _wrap_wxStyledTextCtrl_SetControlCharSymbol, METH_VARARGS | METH_KEYWORDS },
-        { "wxStyledTextCtrl_GetCursor", (PyCFunction) _wrap_wxStyledTextCtrl_GetCursor, METH_VARARGS | METH_KEYWORDS },
-        { "wxStyledTextCtrl_SetCursor", (PyCFunction) _wrap_wxStyledTextCtrl_SetCursor, METH_VARARGS | METH_KEYWORDS },
+        { "wxStyledTextCtrl_GetSTCCursor", (PyCFunction) _wrap_wxStyledTextCtrl_GetSTCCursor, METH_VARARGS | METH_KEYWORDS },
+        { "wxStyledTextCtrl_SetSTCCursor", (PyCFunction) _wrap_wxStyledTextCtrl_SetSTCCursor, METH_VARARGS | METH_KEYWORDS },
         { "wxStyledTextCtrl_GetMouseDownCaptures", (PyCFunction) _wrap_wxStyledTextCtrl_GetMouseDownCaptures, METH_VARARGS | METH_KEYWORDS },
         { "wxStyledTextCtrl_SetMouseDownCaptures", (PyCFunction) _wrap_wxStyledTextCtrl_SetMouseDownCaptures, METH_VARARGS | METH_KEYWORDS },
         { "wxStyledTextCtrl_GetStatus", (PyCFunction) _wrap_wxStyledTextCtrl_GetStatus, METH_VARARGS | METH_KEYWORDS },
@@ -12515,6 +12589,7 @@ SWIGEXPORT(void) initstc_c() {
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("stc_c", stc_cMethods);
         d = PyModule_GetDict(m);
+        PyDict_SetItemString(d,"STC_USE_DND", PyInt_FromLong((long) 1));
         PyDict_SetItemString(d,"wxSTC_USE_POPUP", PyInt_FromLong((long) 1));
         PyDict_SetItemString(d,"wxSTC_INVALID_POSITION", PyInt_FromLong((long) -1));
         PyDict_SetItemString(d,"wxSTC_START", PyInt_FromLong((long) 2000));
@@ -12602,6 +12677,7 @@ SWIGEXPORT(void) initstc_c() {
         PyDict_SetItemString(d,"wxSTC_INDIC_TT", PyInt_FromLong((long) 2));
         PyDict_SetItemString(d,"wxSTC_INDIC_DIAGONAL", PyInt_FromLong((long) 3));
         PyDict_SetItemString(d,"wxSTC_INDIC_STRIKE", PyInt_FromLong((long) 4));
+        PyDict_SetItemString(d,"wxSTC_INDIC_HIDDEN", PyInt_FromLong((long) 5));
         PyDict_SetItemString(d,"wxSTC_INDIC0_MASK", PyInt_FromLong((long) 0x20));
         PyDict_SetItemString(d,"wxSTC_INDIC1_MASK", PyInt_FromLong((long) 0x40));
         PyDict_SetItemString(d,"wxSTC_INDIC2_MASK", PyInt_FromLong((long) 0x80));
@@ -12648,6 +12724,7 @@ SWIGEXPORT(void) initstc_c() {
         PyDict_SetItemString(d,"wxSTC_CARET_STRICT", PyInt_FromLong((long) 0x04));
         PyDict_SetItemString(d,"wxSTC_CARET_JUMPS", PyInt_FromLong((long) 0x10));
         PyDict_SetItemString(d,"wxSTC_CARET_EVEN", PyInt_FromLong((long) 0x08));
+        PyDict_SetItemString(d,"wxSTC_KEYWORDSET_MAX", PyInt_FromLong((long) 8));
         PyDict_SetItemString(d,"wxSTC_MOD_INSERTTEXT", PyInt_FromLong((long) 0x1));
         PyDict_SetItemString(d,"wxSTC_MOD_DELETETEXT", PyInt_FromLong((long) 0x2));
         PyDict_SetItemString(d,"wxSTC_MOD_CHANGESTYLE", PyInt_FromLong((long) 0x4));
@@ -12722,6 +12799,9 @@ SWIGEXPORT(void) initstc_c() {
         PyDict_SetItemString(d,"wxSTC_LEX_POV", PyInt_FromLong((long) 39));
         PyDict_SetItemString(d,"wxSTC_LEX_LOUT", PyInt_FromLong((long) 40));
         PyDict_SetItemString(d,"wxSTC_LEX_ESCRIPT", PyInt_FromLong((long) 41));
+        PyDict_SetItemString(d,"wxSTC_LEX_PS", PyInt_FromLong((long) 42));
+        PyDict_SetItemString(d,"wxSTC_LEX_NSIS", PyInt_FromLong((long) 43));
+        PyDict_SetItemString(d,"wxSTC_LEX_MMIXAL", PyInt_FromLong((long) 44));
         PyDict_SetItemString(d,"wxSTC_LEX_AUTOMATIC", PyInt_FromLong((long) 1000));
         PyDict_SetItemString(d,"wxSTC_P_DEFAULT", PyInt_FromLong((long) 0));
         PyDict_SetItemString(d,"wxSTC_P_COMMENTLINE", PyInt_FromLong((long) 1));
@@ -12934,6 +13014,8 @@ SWIGEXPORT(void) initstc_c() {
         PyDict_SetItemString(d,"wxSTC_LUA_WORD4", PyInt_FromLong((long) 15));
         PyDict_SetItemString(d,"wxSTC_LUA_WORD5", PyInt_FromLong((long) 16));
         PyDict_SetItemString(d,"wxSTC_LUA_WORD6", PyInt_FromLong((long) 17));
+        PyDict_SetItemString(d,"wxSTC_LUA_WORD7", PyInt_FromLong((long) 18));
+        PyDict_SetItemString(d,"wxSTC_LUA_WORD8", PyInt_FromLong((long) 19));
         PyDict_SetItemString(d,"wxSTC_ERR_DEFAULT", PyInt_FromLong((long) 0));
         PyDict_SetItemString(d,"wxSTC_ERR_PYTHON", PyInt_FromLong((long) 1));
         PyDict_SetItemString(d,"wxSTC_ERR_GCC", PyInt_FromLong((long) 2));
@@ -13121,14 +13203,20 @@ SWIGEXPORT(void) initstc_c() {
         PyDict_SetItemString(d,"wxSTC_POV_DEFAULT", PyInt_FromLong((long) 0));
         PyDict_SetItemString(d,"wxSTC_POV_COMMENT", PyInt_FromLong((long) 1));
         PyDict_SetItemString(d,"wxSTC_POV_COMMENTLINE", PyInt_FromLong((long) 2));
-        PyDict_SetItemString(d,"wxSTC_POV_COMMENTDOC", PyInt_FromLong((long) 3));
-        PyDict_SetItemString(d,"wxSTC_POV_NUMBER", PyInt_FromLong((long) 4));
-        PyDict_SetItemString(d,"wxSTC_POV_WORD", PyInt_FromLong((long) 5));
+        PyDict_SetItemString(d,"wxSTC_POV_NUMBER", PyInt_FromLong((long) 3));
+        PyDict_SetItemString(d,"wxSTC_POV_OPERATOR", PyInt_FromLong((long) 4));
+        PyDict_SetItemString(d,"wxSTC_POV_IDENTIFIER", PyInt_FromLong((long) 5));
         PyDict_SetItemString(d,"wxSTC_POV_STRING", PyInt_FromLong((long) 6));
-        PyDict_SetItemString(d,"wxSTC_POV_OPERATOR", PyInt_FromLong((long) 7));
-        PyDict_SetItemString(d,"wxSTC_POV_IDENTIFIER", PyInt_FromLong((long) 8));
-        PyDict_SetItemString(d,"wxSTC_POV_BRACE", PyInt_FromLong((long) 9));
+        PyDict_SetItemString(d,"wxSTC_POV_STRINGEOL", PyInt_FromLong((long) 7));
+        PyDict_SetItemString(d,"wxSTC_POV_DIRECTIVE", PyInt_FromLong((long) 8));
+        PyDict_SetItemString(d,"wxSTC_POV_BADDIRECTIVE", PyInt_FromLong((long) 9));
         PyDict_SetItemString(d,"wxSTC_POV_WORD2", PyInt_FromLong((long) 10));
+        PyDict_SetItemString(d,"wxSTC_POV_WORD3", PyInt_FromLong((long) 11));
+        PyDict_SetItemString(d,"wxSTC_POV_WORD4", PyInt_FromLong((long) 12));
+        PyDict_SetItemString(d,"wxSTC_POV_WORD5", PyInt_FromLong((long) 13));
+        PyDict_SetItemString(d,"wxSTC_POV_WORD6", PyInt_FromLong((long) 14));
+        PyDict_SetItemString(d,"wxSTC_POV_WORD7", PyInt_FromLong((long) 15));
+        PyDict_SetItemString(d,"wxSTC_POV_WORD8", PyInt_FromLong((long) 16));
         PyDict_SetItemString(d,"wxSTC_LOUT_DEFAULT", PyInt_FromLong((long) 0));
         PyDict_SetItemString(d,"wxSTC_LOUT_COMMENT", PyInt_FromLong((long) 1));
         PyDict_SetItemString(d,"wxSTC_LOUT_NUMBER", PyInt_FromLong((long) 2));
@@ -13152,6 +13240,54 @@ SWIGEXPORT(void) initstc_c() {
         PyDict_SetItemString(d,"wxSTC_ESCRIPT_BRACE", PyInt_FromLong((long) 9));
         PyDict_SetItemString(d,"wxSTC_ESCRIPT_WORD2", PyInt_FromLong((long) 10));
         PyDict_SetItemString(d,"wxSTC_ESCRIPT_WORD3", PyInt_FromLong((long) 11));
+        PyDict_SetItemString(d,"wxSTC_PS_DEFAULT", PyInt_FromLong((long) 0));
+        PyDict_SetItemString(d,"wxSTC_PS_COMMENT", PyInt_FromLong((long) 1));
+        PyDict_SetItemString(d,"wxSTC_PS_DSC_COMMENT", PyInt_FromLong((long) 2));
+        PyDict_SetItemString(d,"wxSTC_PS_DSC_VALUE", PyInt_FromLong((long) 3));
+        PyDict_SetItemString(d,"wxSTC_PS_NUMBER", PyInt_FromLong((long) 4));
+        PyDict_SetItemString(d,"wxSTC_PS_NAME", PyInt_FromLong((long) 5));
+        PyDict_SetItemString(d,"wxSTC_PS_KEYWORD", PyInt_FromLong((long) 6));
+        PyDict_SetItemString(d,"wxSTC_PS_LITERAL", PyInt_FromLong((long) 7));
+        PyDict_SetItemString(d,"wxSTC_PS_IMMEVAL", PyInt_FromLong((long) 8));
+        PyDict_SetItemString(d,"wxSTC_PS_PAREN_ARRAY", PyInt_FromLong((long) 9));
+        PyDict_SetItemString(d,"wxSTC_PS_PAREN_DICT", PyInt_FromLong((long) 10));
+        PyDict_SetItemString(d,"wxSTC_PS_PAREN_PROC", PyInt_FromLong((long) 11));
+        PyDict_SetItemString(d,"wxSTC_PS_TEXT", PyInt_FromLong((long) 12));
+        PyDict_SetItemString(d,"wxSTC_PS_HEXSTRING", PyInt_FromLong((long) 13));
+        PyDict_SetItemString(d,"wxSTC_PS_BASE85STRING", PyInt_FromLong((long) 14));
+        PyDict_SetItemString(d,"wxSTC_PS_BADSTRINGCHAR", PyInt_FromLong((long) 15));
+        PyDict_SetItemString(d,"wxSTC_NSIS_DEFAULT", PyInt_FromLong((long) 0));
+        PyDict_SetItemString(d,"wxSTC_NSIS_COMMENT", PyInt_FromLong((long) 1));
+        PyDict_SetItemString(d,"wxSTC_NSIS_STRINGDQ", PyInt_FromLong((long) 2));
+        PyDict_SetItemString(d,"wxSTC_NSIS_STRINGLQ", PyInt_FromLong((long) 3));
+        PyDict_SetItemString(d,"wxSTC_NSIS_STRINGRQ", PyInt_FromLong((long) 4));
+        PyDict_SetItemString(d,"wxSTC_NSIS_FUNCTION", PyInt_FromLong((long) 5));
+        PyDict_SetItemString(d,"wxSTC_NSIS_VARIABLE", PyInt_FromLong((long) 6));
+        PyDict_SetItemString(d,"wxSTC_NSIS_LABEL", PyInt_FromLong((long) 7));
+        PyDict_SetItemString(d,"wxSTC_NSIS_USERDEFINED", PyInt_FromLong((long) 8));
+        PyDict_SetItemString(d,"wxSTC_NSIS_SECTIONDEF", PyInt_FromLong((long) 9));
+        PyDict_SetItemString(d,"wxSTC_NSIS_SUBSECTIONDEF", PyInt_FromLong((long) 10));
+        PyDict_SetItemString(d,"wxSTC_NSIS_IFDEFINEDEF", PyInt_FromLong((long) 11));
+        PyDict_SetItemString(d,"wxSTC_NSIS_MACRODEF", PyInt_FromLong((long) 12));
+        PyDict_SetItemString(d,"wxSTC_NSIS_STRINGVAR", PyInt_FromLong((long) 13));
+        PyDict_SetItemString(d,"wxSTC_MMIXAL_LEADWS", PyInt_FromLong((long) 0));
+        PyDict_SetItemString(d,"wxSTC_MMIXAL_COMMENT", PyInt_FromLong((long) 1));
+        PyDict_SetItemString(d,"wxSTC_MMIXAL_LABEL", PyInt_FromLong((long) 2));
+        PyDict_SetItemString(d,"wxSTC_MMIXAL_OPCODE", PyInt_FromLong((long) 3));
+        PyDict_SetItemString(d,"wxSTC_MMIXAL_OPCODE_PRE", PyInt_FromLong((long) 4));
+        PyDict_SetItemString(d,"wxSTC_MMIXAL_OPCODE_VALID", PyInt_FromLong((long) 5));
+        PyDict_SetItemString(d,"wxSTC_MMIXAL_OPCODE_UNKNOWN", PyInt_FromLong((long) 6));
+        PyDict_SetItemString(d,"wxSTC_MMIXAL_OPCODE_POST", PyInt_FromLong((long) 7));
+        PyDict_SetItemString(d,"wxSTC_MMIXAL_OPERANDS", PyInt_FromLong((long) 8));
+        PyDict_SetItemString(d,"wxSTC_MMIXAL_NUMBER", PyInt_FromLong((long) 9));
+        PyDict_SetItemString(d,"wxSTC_MMIXAL_REF", PyInt_FromLong((long) 10));
+        PyDict_SetItemString(d,"wxSTC_MMIXAL_CHAR", PyInt_FromLong((long) 11));
+        PyDict_SetItemString(d,"wxSTC_MMIXAL_STRING", PyInt_FromLong((long) 12));
+        PyDict_SetItemString(d,"wxSTC_MMIXAL_REGISTER", PyInt_FromLong((long) 13));
+        PyDict_SetItemString(d,"wxSTC_MMIXAL_HEX", PyInt_FromLong((long) 14));
+        PyDict_SetItemString(d,"wxSTC_MMIXAL_OPERATOR", PyInt_FromLong((long) 15));
+        PyDict_SetItemString(d,"wxSTC_MMIXAL_SYMBOL", PyInt_FromLong((long) 16));
+        PyDict_SetItemString(d,"wxSTC_MMIXAL_INCLUDE", PyInt_FromLong((long) 17));
         PyDict_SetItemString(d,"wxSTC_CMD_REDO", PyInt_FromLong((long) 2011));
         PyDict_SetItemString(d,"wxSTC_CMD_SELECTALL", PyInt_FromLong((long) 2013));
         PyDict_SetItemString(d,"wxSTC_CMD_UNDO", PyInt_FromLong((long) 2176));
@@ -13225,7 +13361,6 @@ SWIGEXPORT(void) initstc_c() {
         PyDict_SetItemString(d,"wxSTC_CMD_PARADOWNEXTEND", PyInt_FromLong((long) 2414));
         PyDict_SetItemString(d,"wxSTC_CMD_PARAUP", PyInt_FromLong((long) 2415));
         PyDict_SetItemString(d,"wxSTC_CMD_PARAUPEXTEND", PyInt_FromLong((long) 2416));
-        PyDict_SetItemString(d,"STC_USE_DND", PyInt_FromLong((long) 1));
         PyDict_SetItemString(d,"wxEVT_STC_CHANGE", PyInt_FromLong((long) wxEVT_STC_CHANGE));
         PyDict_SetItemString(d,"wxEVT_STC_STYLENEEDED", PyInt_FromLong((long) wxEVT_STC_STYLENEEDED));
         PyDict_SetItemString(d,"wxEVT_STC_CHARADDED", PyInt_FromLong((long) wxEVT_STC_CHARADDED));
index 2a0d4627c47455550ae720796234731e9a88c207..d526f8faa36b780dfc9fda7f46aa62af8bb61ce3 100644 (file)
@@ -984,11 +984,11 @@ class wxStyledTextCtrlPtr(wxControlPtr):
     def GetMouseDownCaptures(self, *_args, **_kwargs):
         val = stc_c.wxStyledTextCtrl_GetMouseDownCaptures(self, *_args, **_kwargs)
         return val
-    def SetCursor(self, *_args, **_kwargs):
-        val = stc_c.wxStyledTextCtrl_SetCursor(self, *_args, **_kwargs)
+    def SetSTCCursor(self, *_args, **_kwargs):
+        val = stc_c.wxStyledTextCtrl_SetSTCCursor(self, *_args, **_kwargs)
         return val
-    def GetCursor(self, *_args, **_kwargs):
-        val = stc_c.wxStyledTextCtrl_GetCursor(self, *_args, **_kwargs)
+    def GetSTCCursor(self, *_args, **_kwargs):
+        val = stc_c.wxStyledTextCtrl_GetSTCCursor(self, *_args, **_kwargs)
         return val
     def SetControlCharSymbol(self, *_args, **_kwargs):
         val = stc_c.wxStyledTextCtrl_SetControlCharSymbol(self, *_args, **_kwargs)
@@ -1135,6 +1135,12 @@ class wxStyledTextCtrlPtr(wxControlPtr):
     def LoadFile(self, *_args, **_kwargs):
         val = stc_c.wxStyledTextCtrl_LoadFile(self, *_args, **_kwargs)
         return val
+    def DoDragOver(self, *_args, **_kwargs):
+        val = stc_c.wxStyledTextCtrl_DoDragOver(self, *_args, **_kwargs)
+        return val
+    def DoDropText(self, *_args, **_kwargs):
+        val = stc_c.wxStyledTextCtrl_DoDropText(self, *_args, **_kwargs)
+        return val
     def __repr__(self):
         return "<%s.%s instance; proxy of C++ wxStyledTextCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxStyledTextCtrl(wxStyledTextCtrlPtr):
@@ -1307,6 +1313,7 @@ class wxStyledTextEvent(wxStyledTextEventPtr):
 
 #-------------- VARIABLE WRAPPERS ------------------
 
+STC_USE_DND = stc_c.STC_USE_DND
 wxSTC_USE_POPUP = stc_c.wxSTC_USE_POPUP
 wxSTC_INVALID_POSITION = stc_c.wxSTC_INVALID_POSITION
 wxSTC_START = stc_c.wxSTC_START
@@ -1394,6 +1401,7 @@ wxSTC_INDIC_SQUIGGLE = stc_c.wxSTC_INDIC_SQUIGGLE
 wxSTC_INDIC_TT = stc_c.wxSTC_INDIC_TT
 wxSTC_INDIC_DIAGONAL = stc_c.wxSTC_INDIC_DIAGONAL
 wxSTC_INDIC_STRIKE = stc_c.wxSTC_INDIC_STRIKE
+wxSTC_INDIC_HIDDEN = stc_c.wxSTC_INDIC_HIDDEN
 wxSTC_INDIC0_MASK = stc_c.wxSTC_INDIC0_MASK
 wxSTC_INDIC1_MASK = stc_c.wxSTC_INDIC1_MASK
 wxSTC_INDIC2_MASK = stc_c.wxSTC_INDIC2_MASK
@@ -1440,6 +1448,7 @@ wxSTC_CARET_SLOP = stc_c.wxSTC_CARET_SLOP
 wxSTC_CARET_STRICT = stc_c.wxSTC_CARET_STRICT
 wxSTC_CARET_JUMPS = stc_c.wxSTC_CARET_JUMPS
 wxSTC_CARET_EVEN = stc_c.wxSTC_CARET_EVEN
+wxSTC_KEYWORDSET_MAX = stc_c.wxSTC_KEYWORDSET_MAX
 wxSTC_MOD_INSERTTEXT = stc_c.wxSTC_MOD_INSERTTEXT
 wxSTC_MOD_DELETETEXT = stc_c.wxSTC_MOD_DELETETEXT
 wxSTC_MOD_CHANGESTYLE = stc_c.wxSTC_MOD_CHANGESTYLE
@@ -1514,6 +1523,9 @@ wxSTC_LEX_CSS = stc_c.wxSTC_LEX_CSS
 wxSTC_LEX_POV = stc_c.wxSTC_LEX_POV
 wxSTC_LEX_LOUT = stc_c.wxSTC_LEX_LOUT
 wxSTC_LEX_ESCRIPT = stc_c.wxSTC_LEX_ESCRIPT
+wxSTC_LEX_PS = stc_c.wxSTC_LEX_PS
+wxSTC_LEX_NSIS = stc_c.wxSTC_LEX_NSIS
+wxSTC_LEX_MMIXAL = stc_c.wxSTC_LEX_MMIXAL
 wxSTC_LEX_AUTOMATIC = stc_c.wxSTC_LEX_AUTOMATIC
 wxSTC_P_DEFAULT = stc_c.wxSTC_P_DEFAULT
 wxSTC_P_COMMENTLINE = stc_c.wxSTC_P_COMMENTLINE
@@ -1726,6 +1738,8 @@ wxSTC_LUA_WORD3 = stc_c.wxSTC_LUA_WORD3
 wxSTC_LUA_WORD4 = stc_c.wxSTC_LUA_WORD4
 wxSTC_LUA_WORD5 = stc_c.wxSTC_LUA_WORD5
 wxSTC_LUA_WORD6 = stc_c.wxSTC_LUA_WORD6
+wxSTC_LUA_WORD7 = stc_c.wxSTC_LUA_WORD7
+wxSTC_LUA_WORD8 = stc_c.wxSTC_LUA_WORD8
 wxSTC_ERR_DEFAULT = stc_c.wxSTC_ERR_DEFAULT
 wxSTC_ERR_PYTHON = stc_c.wxSTC_ERR_PYTHON
 wxSTC_ERR_GCC = stc_c.wxSTC_ERR_GCC
@@ -1913,14 +1927,20 @@ wxSTC_CSS_SINGLESTRING = stc_c.wxSTC_CSS_SINGLESTRING
 wxSTC_POV_DEFAULT = stc_c.wxSTC_POV_DEFAULT
 wxSTC_POV_COMMENT = stc_c.wxSTC_POV_COMMENT
 wxSTC_POV_COMMENTLINE = stc_c.wxSTC_POV_COMMENTLINE
-wxSTC_POV_COMMENTDOC = stc_c.wxSTC_POV_COMMENTDOC
 wxSTC_POV_NUMBER = stc_c.wxSTC_POV_NUMBER
-wxSTC_POV_WORD = stc_c.wxSTC_POV_WORD
-wxSTC_POV_STRING = stc_c.wxSTC_POV_STRING
 wxSTC_POV_OPERATOR = stc_c.wxSTC_POV_OPERATOR
 wxSTC_POV_IDENTIFIER = stc_c.wxSTC_POV_IDENTIFIER
-wxSTC_POV_BRACE = stc_c.wxSTC_POV_BRACE
+wxSTC_POV_STRING = stc_c.wxSTC_POV_STRING
+wxSTC_POV_STRINGEOL = stc_c.wxSTC_POV_STRINGEOL
+wxSTC_POV_DIRECTIVE = stc_c.wxSTC_POV_DIRECTIVE
+wxSTC_POV_BADDIRECTIVE = stc_c.wxSTC_POV_BADDIRECTIVE
 wxSTC_POV_WORD2 = stc_c.wxSTC_POV_WORD2
+wxSTC_POV_WORD3 = stc_c.wxSTC_POV_WORD3
+wxSTC_POV_WORD4 = stc_c.wxSTC_POV_WORD4
+wxSTC_POV_WORD5 = stc_c.wxSTC_POV_WORD5
+wxSTC_POV_WORD6 = stc_c.wxSTC_POV_WORD6
+wxSTC_POV_WORD7 = stc_c.wxSTC_POV_WORD7
+wxSTC_POV_WORD8 = stc_c.wxSTC_POV_WORD8
 wxSTC_LOUT_DEFAULT = stc_c.wxSTC_LOUT_DEFAULT
 wxSTC_LOUT_COMMENT = stc_c.wxSTC_LOUT_COMMENT
 wxSTC_LOUT_NUMBER = stc_c.wxSTC_LOUT_NUMBER
@@ -1944,6 +1964,54 @@ wxSTC_ESCRIPT_IDENTIFIER = stc_c.wxSTC_ESCRIPT_IDENTIFIER
 wxSTC_ESCRIPT_BRACE = stc_c.wxSTC_ESCRIPT_BRACE
 wxSTC_ESCRIPT_WORD2 = stc_c.wxSTC_ESCRIPT_WORD2
 wxSTC_ESCRIPT_WORD3 = stc_c.wxSTC_ESCRIPT_WORD3
+wxSTC_PS_DEFAULT = stc_c.wxSTC_PS_DEFAULT
+wxSTC_PS_COMMENT = stc_c.wxSTC_PS_COMMENT
+wxSTC_PS_DSC_COMMENT = stc_c.wxSTC_PS_DSC_COMMENT
+wxSTC_PS_DSC_VALUE = stc_c.wxSTC_PS_DSC_VALUE
+wxSTC_PS_NUMBER = stc_c.wxSTC_PS_NUMBER
+wxSTC_PS_NAME = stc_c.wxSTC_PS_NAME
+wxSTC_PS_KEYWORD = stc_c.wxSTC_PS_KEYWORD
+wxSTC_PS_LITERAL = stc_c.wxSTC_PS_LITERAL
+wxSTC_PS_IMMEVAL = stc_c.wxSTC_PS_IMMEVAL
+wxSTC_PS_PAREN_ARRAY = stc_c.wxSTC_PS_PAREN_ARRAY
+wxSTC_PS_PAREN_DICT = stc_c.wxSTC_PS_PAREN_DICT
+wxSTC_PS_PAREN_PROC = stc_c.wxSTC_PS_PAREN_PROC
+wxSTC_PS_TEXT = stc_c.wxSTC_PS_TEXT
+wxSTC_PS_HEXSTRING = stc_c.wxSTC_PS_HEXSTRING
+wxSTC_PS_BASE85STRING = stc_c.wxSTC_PS_BASE85STRING
+wxSTC_PS_BADSTRINGCHAR = stc_c.wxSTC_PS_BADSTRINGCHAR
+wxSTC_NSIS_DEFAULT = stc_c.wxSTC_NSIS_DEFAULT
+wxSTC_NSIS_COMMENT = stc_c.wxSTC_NSIS_COMMENT
+wxSTC_NSIS_STRINGDQ = stc_c.wxSTC_NSIS_STRINGDQ
+wxSTC_NSIS_STRINGLQ = stc_c.wxSTC_NSIS_STRINGLQ
+wxSTC_NSIS_STRINGRQ = stc_c.wxSTC_NSIS_STRINGRQ
+wxSTC_NSIS_FUNCTION = stc_c.wxSTC_NSIS_FUNCTION
+wxSTC_NSIS_VARIABLE = stc_c.wxSTC_NSIS_VARIABLE
+wxSTC_NSIS_LABEL = stc_c.wxSTC_NSIS_LABEL
+wxSTC_NSIS_USERDEFINED = stc_c.wxSTC_NSIS_USERDEFINED
+wxSTC_NSIS_SECTIONDEF = stc_c.wxSTC_NSIS_SECTIONDEF
+wxSTC_NSIS_SUBSECTIONDEF = stc_c.wxSTC_NSIS_SUBSECTIONDEF
+wxSTC_NSIS_IFDEFINEDEF = stc_c.wxSTC_NSIS_IFDEFINEDEF
+wxSTC_NSIS_MACRODEF = stc_c.wxSTC_NSIS_MACRODEF
+wxSTC_NSIS_STRINGVAR = stc_c.wxSTC_NSIS_STRINGVAR
+wxSTC_MMIXAL_LEADWS = stc_c.wxSTC_MMIXAL_LEADWS
+wxSTC_MMIXAL_COMMENT = stc_c.wxSTC_MMIXAL_COMMENT
+wxSTC_MMIXAL_LABEL = stc_c.wxSTC_MMIXAL_LABEL
+wxSTC_MMIXAL_OPCODE = stc_c.wxSTC_MMIXAL_OPCODE
+wxSTC_MMIXAL_OPCODE_PRE = stc_c.wxSTC_MMIXAL_OPCODE_PRE
+wxSTC_MMIXAL_OPCODE_VALID = stc_c.wxSTC_MMIXAL_OPCODE_VALID
+wxSTC_MMIXAL_OPCODE_UNKNOWN = stc_c.wxSTC_MMIXAL_OPCODE_UNKNOWN
+wxSTC_MMIXAL_OPCODE_POST = stc_c.wxSTC_MMIXAL_OPCODE_POST
+wxSTC_MMIXAL_OPERANDS = stc_c.wxSTC_MMIXAL_OPERANDS
+wxSTC_MMIXAL_NUMBER = stc_c.wxSTC_MMIXAL_NUMBER
+wxSTC_MMIXAL_REF = stc_c.wxSTC_MMIXAL_REF
+wxSTC_MMIXAL_CHAR = stc_c.wxSTC_MMIXAL_CHAR
+wxSTC_MMIXAL_STRING = stc_c.wxSTC_MMIXAL_STRING
+wxSTC_MMIXAL_REGISTER = stc_c.wxSTC_MMIXAL_REGISTER
+wxSTC_MMIXAL_HEX = stc_c.wxSTC_MMIXAL_HEX
+wxSTC_MMIXAL_OPERATOR = stc_c.wxSTC_MMIXAL_OPERATOR
+wxSTC_MMIXAL_SYMBOL = stc_c.wxSTC_MMIXAL_SYMBOL
+wxSTC_MMIXAL_INCLUDE = stc_c.wxSTC_MMIXAL_INCLUDE
 wxSTC_CMD_REDO = stc_c.wxSTC_CMD_REDO
 wxSTC_CMD_SELECTALL = stc_c.wxSTC_CMD_SELECTALL
 wxSTC_CMD_UNDO = stc_c.wxSTC_CMD_UNDO
@@ -2017,7 +2085,6 @@ wxSTC_CMD_PARADOWN = stc_c.wxSTC_CMD_PARADOWN
 wxSTC_CMD_PARADOWNEXTEND = stc_c.wxSTC_CMD_PARADOWNEXTEND
 wxSTC_CMD_PARAUP = stc_c.wxSTC_CMD_PARAUP
 wxSTC_CMD_PARAUPEXTEND = stc_c.wxSTC_CMD_PARAUPEXTEND
-STC_USE_DND = stc_c.STC_USE_DND
 wxEVT_STC_CHANGE = stc_c.wxEVT_STC_CHANGE
 wxEVT_STC_STYLENEEDED = stc_c.wxEVT_STC_STYLENEEDED
 wxEVT_STC_CHARADDED = stc_c.wxEVT_STC_CHARADDED
index 7aa0a60db06fc27a2197dd2b747ecd04f565a1c1..5f531850490723a14fb929f032e712f1fdef90f4 100644 (file)
@@ -4041,6 +4041,34 @@ static PyObject *_wrap_wxGauge_GetValue(PyObject *self, PyObject *args, PyObject
     return _resultobj;
 }
 
+#define wxGauge_IsVertical(_swigobj)  (_swigobj->IsVertical())
+static PyObject *_wrap_wxGauge_IsVertical(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxGauge * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGauge_IsVertical",_kwnames,&_argo0)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGauge_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGauge_IsVertical. Expected _wxGauge_p.");
+        return NULL;
+        }
+    }
+{
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    _result = (bool )wxGauge_IsVertical(_arg0);
+
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) return NULL;
+}    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
 #define wxGauge_SetBezelFace(_swigobj,_swigarg0)  (_swigobj->SetBezelFace(_swigarg0))
 static PyObject *_wrap_wxGauge_SetBezelFace(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
@@ -7704,6 +7732,34 @@ static PyObject *_wrap_wxTextCtrl_SaveFile(PyObject *self, PyObject *args, PyObj
     return _resultobj;
 }
 
+#define wxTextCtrl_MarkDirty(_swigobj)  (_swigobj->MarkDirty())
+static PyObject *_wrap_wxTextCtrl_MarkDirty(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxTextCtrl * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_MarkDirty",_kwnames,&_argo0)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_MarkDirty. Expected _wxTextCtrl_p.");
+        return NULL;
+        }
+    }
+{
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    wxTextCtrl_MarkDirty(_arg0);
+
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) return NULL;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
 #define wxTextCtrl_DiscardEdits(_swigobj)  (_swigobj->DiscardEdits())
 static PyObject *_wrap_wxTextCtrl_DiscardEdits(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
@@ -12395,6 +12451,7 @@ static PyMethodDef controlscMethods[] = {
         { "wxTextCtrl_WriteText", (PyCFunction) _wrap_wxTextCtrl_WriteText, METH_VARARGS | METH_KEYWORDS },
         { "wxTextCtrl_SetMaxLength", (PyCFunction) _wrap_wxTextCtrl_SetMaxLength, METH_VARARGS | METH_KEYWORDS },
         { "wxTextCtrl_DiscardEdits", (PyCFunction) _wrap_wxTextCtrl_DiscardEdits, METH_VARARGS | METH_KEYWORDS },
+        { "wxTextCtrl_MarkDirty", (PyCFunction) _wrap_wxTextCtrl_MarkDirty, METH_VARARGS | METH_KEYWORDS },
         { "wxTextCtrl_SaveFile", (PyCFunction) _wrap_wxTextCtrl_SaveFile, METH_VARARGS | METH_KEYWORDS },
         { "wxTextCtrl_LoadFile", (PyCFunction) _wrap_wxTextCtrl_LoadFile, METH_VARARGS | METH_KEYWORDS },
         { "wxTextCtrl_Remove", (PyCFunction) _wrap_wxTextCtrl_Remove, METH_VARARGS | METH_KEYWORDS },
@@ -12481,6 +12538,7 @@ static PyMethodDef controlscMethods[] = {
         { "wxGauge_SetShadowWidth", (PyCFunction) _wrap_wxGauge_SetShadowWidth, METH_VARARGS | METH_KEYWORDS },
         { "wxGauge_SetRange", (PyCFunction) _wrap_wxGauge_SetRange, METH_VARARGS | METH_KEYWORDS },
         { "wxGauge_SetBezelFace", (PyCFunction) _wrap_wxGauge_SetBezelFace, METH_VARARGS | METH_KEYWORDS },
+        { "wxGauge_IsVertical", (PyCFunction) _wrap_wxGauge_IsVertical, METH_VARARGS | METH_KEYWORDS },
         { "wxGauge_GetValue", (PyCFunction) _wrap_wxGauge_GetValue, METH_VARARGS | METH_KEYWORDS },
         { "wxGauge_GetShadowWidth", (PyCFunction) _wrap_wxGauge_GetShadowWidth, METH_VARARGS | METH_KEYWORDS },
         { "wxGauge_GetRange", (PyCFunction) _wrap_wxGauge_GetRange, METH_VARARGS | METH_KEYWORDS },
index a034fc1a4550b55637b7c91c06fb55ca908a8bdd..94f4a8b53adfda3fd036a497725355170ff91002 100644 (file)
@@ -385,6 +385,9 @@ class wxGaugePtr(wxControlPtr):
     def GetValue(self, *_args, **_kwargs):
         val = controlsc.wxGauge_GetValue(self, *_args, **_kwargs)
         return val
+    def IsVertical(self, *_args, **_kwargs):
+        val = controlsc.wxGauge_IsVertical(self, *_args, **_kwargs)
+        return val
     def SetBezelFace(self, *_args, **_kwargs):
         val = controlsc.wxGauge_SetBezelFace(self, *_args, **_kwargs)
         return val
@@ -747,6 +750,9 @@ class wxTextCtrlPtr(wxControlPtr):
     def SaveFile(self, *_args, **_kwargs):
         val = controlsc.wxTextCtrl_SaveFile(self, *_args, **_kwargs)
         return val
+    def MarkDirty(self, *_args, **_kwargs):
+        val = controlsc.wxTextCtrl_MarkDirty(self, *_args, **_kwargs)
+        return val
     def DiscardEdits(self, *_args, **_kwargs):
         val = controlsc.wxTextCtrl_DiscardEdits(self, *_args, **_kwargs)
         return val
index a692e97323c90961076569102992588c7eb89b5a..90896d4a4d60e6b75861c49adba04920ccabf0f3 100644 (file)
@@ -3135,6 +3135,36 @@ static PyObject *_wrap_wxListCtrl_GetCountPerPage(PyObject *self, PyObject *args
     return _resultobj;
 }
 
+#define wxListCtrl_GetViewRect(_swigobj)  (_swigobj->GetViewRect())
+static PyObject *_wrap_wxListCtrl_GetViewRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxRect * _result;
+    wxPyListCtrl * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListCtrl_GetViewRect",_kwnames,&_argo0)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyListCtrl_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_GetViewRect. Expected _wxPyListCtrl_p.");
+        return NULL;
+        }
+    }
+{
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    _result = new wxRect (wxListCtrl_GetViewRect(_arg0));
+
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) return NULL;
+}    SWIG_MakePtr(_ptemp, (void *) _result,"_wxRect_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+
 static wxListItem * wxPyListCtrl_GetItem(wxPyListCtrl *self,long  itemId,int  col) {
             wxListItem* info = new wxListItem;
             info->m_itemId = itemId;
@@ -3653,18 +3683,17 @@ static PyObject *_wrap_wxListCtrl_GetColumnCount(PyObject *self, PyObject *args,
     return _resultobj;
 }
 
-#define wxListCtrl_GetItemSpacing(_swigobj,_swigarg0)  (_swigobj->GetItemSpacing(_swigarg0))
+#define wxListCtrl_GetItemSpacing(_swigobj)  (_swigobj->GetItemSpacing())
 static PyObject *_wrap_wxListCtrl_GetItemSpacing(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
-    int  _result;
+    wxSize * _result;
     wxPyListCtrl * _arg0;
-    bool  _arg1;
     PyObject * _argo0 = 0;
-    int tempbool1;
-    char *_kwnames[] = { "self","isSmall", NULL };
+    char *_kwnames[] = { "self", NULL };
+    char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxListCtrl_GetItemSpacing",_kwnames,&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListCtrl_GetItemSpacing",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3673,14 +3702,14 @@ static PyObject *_wrap_wxListCtrl_GetItemSpacing(PyObject *self, PyObject *args,
         return NULL;
         }
     }
-    _arg1 = (bool ) tempbool1;
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
-    _result = (int )wxListCtrl_GetItemSpacing(_arg0,_arg1);
+    _result = new wxSize (wxListCtrl_GetItemSpacing(_arg0));
 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
-}    _resultobj = Py_BuildValue("i",_result);
+}    SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
 
@@ -11296,6 +11325,7 @@ static PyMethodDef controls2cMethods[] = {
         { "wxListCtrl_SetStringItem", (PyCFunction) _wrap_wxListCtrl_SetStringItem, METH_VARARGS | METH_KEYWORDS },
         { "wxListCtrl_SetItem", (PyCFunction) _wrap_wxListCtrl_SetItem, METH_VARARGS | METH_KEYWORDS },
         { "wxListCtrl_GetItem", (PyCFunction) _wrap_wxListCtrl_GetItem, METH_VARARGS | METH_KEYWORDS },
+        { "wxListCtrl_GetViewRect", (PyCFunction) _wrap_wxListCtrl_GetViewRect, METH_VARARGS | METH_KEYWORDS },
         { "wxListCtrl_GetCountPerPage", (PyCFunction) _wrap_wxListCtrl_GetCountPerPage, METH_VARARGS | METH_KEYWORDS },
         { "wxListCtrl_SetColumnWidth", (PyCFunction) _wrap_wxListCtrl_SetColumnWidth, METH_VARARGS | METH_KEYWORDS },
         { "wxListCtrl_GetColumnWidth", (PyCFunction) _wrap_wxListCtrl_GetColumnWidth, METH_VARARGS | METH_KEYWORDS },
index 117f3e2a318730b8909342021ff19447d33ed458..cb66eda5de42d4d57d3c11b7f4095deedca61776 100644 (file)
@@ -468,6 +468,10 @@ class wxListCtrlPtr(wxControlPtr):
     def GetCountPerPage(self, *_args, **_kwargs):
         val = controls2c.wxListCtrl_GetCountPerPage(self, *_args, **_kwargs)
         return val
+    def GetViewRect(self, *_args, **_kwargs):
+        val = controls2c.wxListCtrl_GetViewRect(self, *_args, **_kwargs)
+        if val: val = wxRectPtr(val) ; val.thisown = 1
+        return val
     def GetItem(self, *_args, **_kwargs):
         val = controls2c.wxListCtrl_GetItem(self, *_args, **_kwargs)
         return val
@@ -517,6 +521,7 @@ class wxListCtrlPtr(wxControlPtr):
         return val
     def GetItemSpacing(self, *_args, **_kwargs):
         val = controls2c.wxListCtrl_GetItemSpacing(self, *_args, **_kwargs)
+        if val: val = wxSizePtr(val) ; val.thisown = 1
         return val
     def SetItemSpacing(self, *_args, **_kwargs):
         val = controls2c.wxListCtrl_SetItemSpacing(self, *_args, **_kwargs)
index e3e657910c4d036915ca712ad054634612fd0aec..3df05d12223b8a44fb683703a74290b2d9b15c3a 100644 (file)
@@ -93,30 +93,30 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     static const wxString wxPyEmptyString(wxT(""));
 
 // Fix some link errors...  Remove this when these methods get real implementations...
-#if defined(__WXGTK__) || defined(__WXX11__)
-#if wxUSE_PANGO
-void wxNativeFontInfo::SetPointSize(int pointsize)
-    { wxFAIL_MSG( _T("not implemented") ); }
+// #if defined(__WXGTK__) || defined(__WXX11__)
+// #if wxUSE_PANGO
+// void wxNativeFontInfo::SetPointSize(int pointsize)
+//     { wxFAIL_MSG( _T("not implemented") ); }
 
-void wxNativeFontInfo::SetStyle(wxFontStyle style)
-    { wxFAIL_MSG( _T("not implemented") ); }
+// void wxNativeFontInfo::SetStyle(wxFontStyle style)
+//     { wxFAIL_MSG( _T("not implemented") ); }
 
-void wxNativeFontInfo::SetWeight(wxFontWeight weight)
-    { wxFAIL_MSG( _T("not implemented") ); }
+// void wxNativeFontInfo::SetWeight(wxFontWeight weight)
+//     { wxFAIL_MSG( _T("not implemented") ); }
 
-void wxNativeFontInfo::SetUnderlined(bool WXUNUSED(underlined))
-    { wxFAIL_MSG( _T("not implemented") ); }
+// void wxNativeFontInfo::SetUnderlined(bool WXUNUSED(underlined))
+//     { wxFAIL_MSG( _T("not implemented") ); }
 
-void wxNativeFontInfo::SetFaceName(wxString facename)
-    { wxFAIL_MSG( _T("not implemented") ); }
+// void wxNativeFontInfo::SetFaceName(wxString facename)
+//     { wxFAIL_MSG( _T("not implemented") ); }
 
-void wxNativeFontInfo::SetFamily(wxFontFamily family)
-    { wxFAIL_MSG( _T("not implemented") ); }
+// void wxNativeFontInfo::SetFamily(wxFontFamily family)
+//     { wxFAIL_MSG( _T("not implemented") ); }
 
-void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding)
-    { wxFAIL_MSG( _T("not implemented") ); }
-#endif
-#endif
+// void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding)
+//     { wxFAIL_MSG( _T("not implemented") ); }
+// #endif
+// #endif
 
 class wxPyFontEnumerator : public wxFontEnumerator {
 public:
@@ -252,6 +252,42 @@ static PyObject *_wrap_wxNativeFontInfo_Init(PyObject *self, PyObject *args, PyO
     return _resultobj;
 }
 
+#define wxNativeFontInfo_InitFromFont(_swigobj,_swigarg0)  (_swigobj->InitFromFont(_swigarg0))
+static PyObject *_wrap_wxNativeFontInfo_InitFromFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxNativeFontInfo * _arg0;
+    wxFont * _arg1;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","font", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxNativeFontInfo_InitFromFont",_kwnames,&_argo0,&_argo1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNativeFontInfo_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNativeFontInfo_InitFromFont. Expected _wxNativeFontInfo_p.");
+        return NULL;
+        }
+    }
+    if (_argo1) {
+        if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxFont_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxNativeFontInfo_InitFromFont. Expected _wxFont_p.");
+        return NULL;
+        }
+    }
+{
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    wxNativeFontInfo_InitFromFont(_arg0,*_arg1);
+
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) return NULL;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
 #define wxNativeFontInfo_GetPointSize(_swigobj)  (_swigobj->GetPointSize())
 static PyObject *_wrap_wxNativeFontInfo_GetPointSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
@@ -4029,6 +4065,7 @@ static PyMethodDef fontscMethods[] = {
         { "wxNativeFontInfo_GetWeight", (PyCFunction) _wrap_wxNativeFontInfo_GetWeight, METH_VARARGS | METH_KEYWORDS },
         { "wxNativeFontInfo_GetStyle", (PyCFunction) _wrap_wxNativeFontInfo_GetStyle, METH_VARARGS | METH_KEYWORDS },
         { "wxNativeFontInfo_GetPointSize", (PyCFunction) _wrap_wxNativeFontInfo_GetPointSize, METH_VARARGS | METH_KEYWORDS },
+        { "wxNativeFontInfo_InitFromFont", (PyCFunction) _wrap_wxNativeFontInfo_InitFromFont, METH_VARARGS | METH_KEYWORDS },
         { "wxNativeFontInfo_Init", (PyCFunction) _wrap_wxNativeFontInfo_Init, METH_VARARGS | METH_KEYWORDS },
         { "new_wxNativeFontInfo", (PyCFunction) _wrap_new_wxNativeFontInfo, METH_VARARGS | METH_KEYWORDS },
         { "wxGetTranslation", (PyCFunction) _wrap_wxGetTranslation, METH_VARARGS | METH_KEYWORDS },
@@ -4209,6 +4246,12 @@ SWIGEXPORT(void) initfontsc() {
         PyDict_SetItemString(d,"wxFONTENCODING_CP12_MAX", PyInt_FromLong((long) wxFONTENCODING_CP12_MAX));
         PyDict_SetItemString(d,"wxFONTENCODING_UTF7", PyInt_FromLong((long) wxFONTENCODING_UTF7));
         PyDict_SetItemString(d,"wxFONTENCODING_UTF8", PyInt_FromLong((long) wxFONTENCODING_UTF8));
+        PyDict_SetItemString(d,"wxFONTENCODING_UTF16", PyInt_FromLong((long) wxFONTENCODING_UTF16));
+        PyDict_SetItemString(d,"wxFONTENCODING_UTF16BE", PyInt_FromLong((long) wxFONTENCODING_UTF16BE));
+        PyDict_SetItemString(d,"wxFONTENCODING_UTF16LE", PyInt_FromLong((long) wxFONTENCODING_UTF16LE));
+        PyDict_SetItemString(d,"wxFONTENCODING_UTF32", PyInt_FromLong((long) wxFONTENCODING_UTF32));
+        PyDict_SetItemString(d,"wxFONTENCODING_UTF32BE", PyInt_FromLong((long) wxFONTENCODING_UTF32BE));
+        PyDict_SetItemString(d,"wxFONTENCODING_UTF32LE", PyInt_FromLong((long) wxFONTENCODING_UTF32LE));
         PyDict_SetItemString(d,"wxFONTENCODING_GB2312", PyInt_FromLong((long) wxFONTENCODING_GB2312));
         PyDict_SetItemString(d,"wxFONTENCODING_BIG5", PyInt_FromLong((long) wxFONTENCODING_BIG5));
         PyDict_SetItemString(d,"wxFONTENCODING_SHIFT_JIS", PyInt_FromLong((long) wxFONTENCODING_SHIFT_JIS));
index e36477f30cbdb62980097a0c31bb027fae4b1637..5567f57dd24090812018b582d890bfe870b103fc 100644 (file)
@@ -9,6 +9,9 @@ class wxNativeFontInfoPtr :
     def Init(self, *_args, **_kwargs):
         val = fontsc.wxNativeFontInfo_Init(self, *_args, **_kwargs)
         return val
+    def InitFromFont(self, *_args, **_kwargs):
+        val = fontsc.wxNativeFontInfo_InitFromFont(self, *_args, **_kwargs)
+        return val
     def GetPointSize(self, *_args, **_kwargs):
         val = fontsc.wxNativeFontInfo_GetPointSize(self, *_args, **_kwargs)
         return val
@@ -532,6 +535,12 @@ wxFONTENCODING_CP1257 = fontsc.wxFONTENCODING_CP1257
 wxFONTENCODING_CP12_MAX = fontsc.wxFONTENCODING_CP12_MAX
 wxFONTENCODING_UTF7 = fontsc.wxFONTENCODING_UTF7
 wxFONTENCODING_UTF8 = fontsc.wxFONTENCODING_UTF8
+wxFONTENCODING_UTF16 = fontsc.wxFONTENCODING_UTF16
+wxFONTENCODING_UTF16BE = fontsc.wxFONTENCODING_UTF16BE
+wxFONTENCODING_UTF16LE = fontsc.wxFONTENCODING_UTF16LE
+wxFONTENCODING_UTF32 = fontsc.wxFONTENCODING_UTF32
+wxFONTENCODING_UTF32BE = fontsc.wxFONTENCODING_UTF32BE
+wxFONTENCODING_UTF32LE = fontsc.wxFONTENCODING_UTF32LE
 wxFONTENCODING_GB2312 = fontsc.wxFONTENCODING_GB2312
 wxFONTENCODING_BIG5 = fontsc.wxFONTENCODING_BIG5
 wxFONTENCODING_SHIFT_JIS = fontsc.wxFONTENCODING_SHIFT_JIS
index 7fe1bc45bc7172b9fa3976a5cff41eabfb11db93..c777927f211344488286358bcd5b42503280bab9 100644 (file)
@@ -11088,7 +11088,38 @@ static PyObject *_wrap_wxRegionIterator_Next(PyObject *self, PyObject *args, PyO
     return _resultobj;
 }
 
+static bool  wxRegionIterator___nonzero__(wxRegionIterator *self) {
+            return self->operator bool();
+        }
+static PyObject *_wrap_wxRegionIterator___nonzero__(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxRegionIterator * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRegionIterator___nonzero__",_kwnames,&_argo0)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRegionIterator_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator___nonzero__. Expected _wxRegionIterator_p.");
+        return NULL;
+        }
+    }
+{
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    _result = (bool )wxRegionIterator___nonzero__(_arg0);
+
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) return NULL;
+}    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
 static PyMethodDef gdicMethods[] = {
+        { "wxRegionIterator___nonzero__", (PyCFunction) _wrap_wxRegionIterator___nonzero__, METH_VARARGS | METH_KEYWORDS },
         { "wxRegionIterator_Next", (PyCFunction) _wrap_wxRegionIterator_Next, METH_VARARGS | METH_KEYWORDS },
         { "wxRegionIterator_Reset", (PyCFunction) _wrap_wxRegionIterator_Reset, METH_VARARGS | METH_KEYWORDS },
         { "wxRegionIterator_HaveRects", (PyCFunction) _wrap_wxRegionIterator_HaveRects, METH_VARARGS | METH_KEYWORDS },
index ee17f74465c6c37a612cfec4c35b63f4f7b98a2d..019cf90676c2531e6683bf92c97957b7f9f3ca58 100644 (file)
@@ -307,7 +307,7 @@ class wxColourPtr(wxObjectPtr):
         return "<%s.%s instance; proxy of C++ wxColour instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
     asTuple = Get
     def __str__(self):                  return str(self.asTuple())
-    def __repr__(self):                 return 'wxColour:' + str(self.asTuple())
+    def __repr__(self):                 return 'wxColour' + str(self.asTuple())
     def __nonzero__(self):              return self.Ok()
     def __getinitargs__(self):          return ()
     def __getstate__(self):             return self.asTuple()
@@ -1299,6 +1299,9 @@ class wxRegionIteratorPtr(wxObjectPtr):
     def Next(self, *_args, **_kwargs):
         val = gdic.wxRegionIterator_Next(self, *_args, **_kwargs)
         return val
+    def __nonzero__(self, *_args, **_kwargs):
+        val = gdic.wxRegionIterator___nonzero__(self, *_args, **_kwargs)
+        return val
     def __repr__(self):
         return "<%s.%s instance; proxy of C++ wxRegionIterator instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxRegionIterator(wxRegionIteratorPtr):
index 2bd35a5d6ef63fad3c4f4ba11b4bd30d78ba8384..e54d0a474bb35057673e9f6d0df9c5423f102a96 100644 (file)
@@ -318,15 +318,80 @@ public:
 
 #ifdef __WXMSW__
 #include <wx/msw/private.h>
+#include <wx/dynload.h>
 #endif
 
 
-void wxDrawWindowOnDC(wxWindow* window, const wxDC& dc)
+void wxDrawWindowOnDC(wxWindow* window, const wxDC& dc, int method)
 {
 #ifdef __WXMSW__
-    ::SendMessage(GetHwndOf(window), WM_PAINT, (long)GetHdcOf(dc), 0);
-//     ::SendMessage(GetHwndOf(window), WM_PRINTCLIENT, (long)GetHdcOf(dc),
-//                   PRF_CLIENT | PRF_NONCLIENT | PRF_CHILDREN );
+
+    switch (method)
+    {
+        case 1:
+            // This one only partially works.  Appears to be an undocumented
+            // "standard" convention that not all widgets adhear to.  For
+            // example, for some widgets backgrounds or non-client areas may
+            // not be painted.
+            ::SendMessage(GetHwndOf(window), WM_PAINT, (long)GetHdcOf(dc), 0);
+            break;
+
+        case 2:
+            // This one works much better, except for on XP.  On Win2k nearly
+            // all widgets and their children are captured correctly[**].  On
+            // XP with Themes activated most native widgets draw only
+            // partially, if at all.  Without themes it works just like on
+            // Win2k.
+            //
+            // ** For example the radio buttons in a wxRadioBox are not its
+            // children by default, but you can capture it via the panel
+            // instead, or change RADIOBTN_PARENT_IS_RADIOBOX in radiobox.cpp.
+            ::SendMessage(GetHwndOf(window), WM_PRINT, (long)GetHdcOf(dc),
+                          PRF_CLIENT | PRF_NONCLIENT | PRF_CHILDREN |
+                          PRF_ERASEBKGND | PRF_OWNED );
+            break;
+
+        case 3:
+            // This one is only defined in the latest SDK and is only
+            // available on XP.  MSDN says it is similar to sending WM_PRINT
+            // so I expect that it will work similar to the above.  Since it
+            // is avaialble only on XP, it can't be compiled like this and
+            // will have to be loaded dynamically.
+            // //::PrintWindow(GetHwndOf(window), GetHdcOf(dc), 0); //break;
+
+            // fall through
+
+        case 4:
+            // Use PrintWindow if available, or fallback to WM_PRINT
+            // otherwise.  Unfortunately using PrintWindow is even worse than
+            // WM_PRINT.  For most native widgets nothing is drawn to the dc
+            // at all, with or without Themes.
+            typedef BOOL (WINAPI *PrintWindow_t)(HWND, HDC, UINT);
+            static bool s_triedToLoad = false;
+            static PrintWindow_t pfnPrintWindow = NULL;
+            if ( !s_triedToLoad )
+            {
+
+                s_triedToLoad = true;
+                wxDynamicLibrary dllUser32(_T("user32.dll"));
+                if ( dllUser32.IsLoaded() )
+                {
+                    wxLogNull nolog;  // Don't report errors here
+                    pfnPrintWindow = (PrintWindow_t)dllUser32.GetSymbol(_T("PrintWindow"));
+                }
+            }
+            if (pfnPrintWindow)
+            {
+                printf("Using PrintWindow\n");
+                pfnPrintWindow(GetHwndOf(window), GetHdcOf(dc), 0);
+            }
+            else
+            {
+                printf("Using WM_PRINT\n");
+                ::SendMessage(GetHwndOf(window), WM_PRINT, (long)GetHdcOf(dc),
+                              PRF_CLIENT | PRF_NONCLIENT | PRF_CHILDREN | PRF_ERASEBKGND | PRF_OWNED );
+            }
+    }
 #endif
 }
 
@@ -2303,12 +2368,13 @@ static PyObject *_wrap_wxDrawWindowOnDC(PyObject *self, PyObject *args, PyObject
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxDC * _arg1;
+    int  _arg2;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
-    char *_kwnames[] = { "window","dc", NULL };
+    char *_kwnames[] = { "window","dc","method", NULL };
 
     self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxDrawWindowOnDC",_kwnames,&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOi:wxDrawWindowOnDC",_kwnames,&_argo0,&_argo1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2325,7 +2391,7 @@ static PyObject *_wrap_wxDrawWindowOnDC(PyObject *self, PyObject *args, PyObject
     }
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
-    wxDrawWindowOnDC(_arg0,*_arg1);
+    wxDrawWindowOnDC(_arg0,*_arg1,_arg2);
 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
index 55532f5c42d31f9e75b3633a761550f810a408a2..ec767cadbf71a75bb0bde8c0d9dacf5960cd498b 100644 (file)
@@ -832,7 +832,7 @@ static PyObject *_wrap_wxBookCtrl_AddPage(PyObject *self, PyObject *args, PyObje
     PyObject * _argo1 = 0;
     PyObject * _obj2 = 0;
     int tempbool3 = (int) false;
-    char *_kwnames[] = { "self","page","text","bSelect","imageId", NULL };
+    char *_kwnames[] = { "self","page","text","select","imageId", NULL };
 
     self = self;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO|ii:wxBookCtrl_AddPage",_kwnames,&_argo0,&_argo1,&_obj2,&tempbool3,&_arg4)) 
@@ -885,7 +885,7 @@ static PyObject *_wrap_wxBookCtrl_InsertPage(PyObject *self, PyObject *args, PyO
     PyObject * _argo2 = 0;
     PyObject * _obj3 = 0;
     int tempbool4 = (int) false;
-    char *_kwnames[] = { "self","n","page","text","bSelect","imageId", NULL };
+    char *_kwnames[] = { "self","n","page","text","select","imageId", NULL };
 
     self = self;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiOO|ii:wxBookCtrl_InsertPage",_kwnames,&_argo0,&_arg1,&_argo2,&_obj3,&tempbool4,&_arg5)) 
index 771e3b7cea6d1198c597cd11838fa46ae8d2a5a7..b6c46e4f70509680beae743009cc33bdb3d528d8 100644 (file)
@@ -1789,24 +1789,6 @@ static PyObject *_wrap_wxPyApp_SetAssertMode(PyObject *self, PyObject *args, PyO
     return _resultobj;
 }
 
-static PyObject *_wrap_wxPyApp_GetMacDefaultEncodingIsPC(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject * _resultobj;
-    bool  _result;
-    char *_kwnames[] = {  NULL };
-
-    self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxPyApp_GetMacDefaultEncodingIsPC",_kwnames)) 
-        return NULL;
-{
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    _result = (bool )wxPyApp::GetMacDefaultEncodingIsPC();
-
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) return NULL;
-}    _resultobj = Py_BuildValue("i",_result);
-    return _resultobj;
-}
-
 static PyObject *_wrap_wxPyApp_GetMacSupportPCMenuShortcuts(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
@@ -1906,27 +1888,6 @@ static PyObject *_wrap_wxPyApp_GetMacHelpMenuTitleName(PyObject *self, PyObject
     return _resultobj;
 }
 
-static PyObject *_wrap_wxPyApp_SetMacDefaultEncodingIsPC(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject * _resultobj;
-    bool  _arg0;
-    int tempbool0;
-    char *_kwnames[] = { "val", NULL };
-
-    self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:wxPyApp_SetMacDefaultEncodingIsPC",_kwnames,&tempbool0)) 
-        return NULL;
-    _arg0 = (bool ) tempbool0;
-{
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    wxPyApp::SetMacDefaultEncodingIsPC(_arg0);
-
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) return NULL;
-}    Py_INCREF(Py_None);
-    _resultobj = Py_None;
-    return _resultobj;
-}
-
 static PyObject *_wrap_wxPyApp_SetMacSupportPCMenuShortcuts(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _arg0;
@@ -2040,13 +2001,11 @@ static PyMethodDef wxcMethods[] = {
         { "wxPyApp_SetMacPreferencesMenuItemId", (PyCFunction) _wrap_wxPyApp_SetMacPreferencesMenuItemId, METH_VARARGS | METH_KEYWORDS },
         { "wxPyApp_SetMacAboutMenuItemId", (PyCFunction) _wrap_wxPyApp_SetMacAboutMenuItemId, METH_VARARGS | METH_KEYWORDS },
         { "wxPyApp_SetMacSupportPCMenuShortcuts", (PyCFunction) _wrap_wxPyApp_SetMacSupportPCMenuShortcuts, METH_VARARGS | METH_KEYWORDS },
-        { "wxPyApp_SetMacDefaultEncodingIsPC", (PyCFunction) _wrap_wxPyApp_SetMacDefaultEncodingIsPC, METH_VARARGS | METH_KEYWORDS },
         { "wxPyApp_GetMacHelpMenuTitleName", (PyCFunction) _wrap_wxPyApp_GetMacHelpMenuTitleName, METH_VARARGS | METH_KEYWORDS },
         { "wxPyApp_GetMacExitMenuItemId", (PyCFunction) _wrap_wxPyApp_GetMacExitMenuItemId, METH_VARARGS | METH_KEYWORDS },
         { "wxPyApp_GetMacPreferencesMenuItemId", (PyCFunction) _wrap_wxPyApp_GetMacPreferencesMenuItemId, METH_VARARGS | METH_KEYWORDS },
         { "wxPyApp_GetMacAboutMenuItemId", (PyCFunction) _wrap_wxPyApp_GetMacAboutMenuItemId, METH_VARARGS | METH_KEYWORDS },
         { "wxPyApp_GetMacSupportPCMenuShortcuts", (PyCFunction) _wrap_wxPyApp_GetMacSupportPCMenuShortcuts, METH_VARARGS | METH_KEYWORDS },
-        { "wxPyApp_GetMacDefaultEncodingIsPC", (PyCFunction) _wrap_wxPyApp_GetMacDefaultEncodingIsPC, METH_VARARGS | METH_KEYWORDS },
         { "wxPyApp_SetAssertMode", (PyCFunction) _wrap_wxPyApp_SetAssertMode, METH_VARARGS | METH_KEYWORDS },
         { "wxPyApp_GetAssertMode", (PyCFunction) _wrap_wxPyApp_GetAssertMode, METH_VARARGS | METH_KEYWORDS },
         { "wxPyApp_SetUseBestVisual", (PyCFunction) _wrap_wxPyApp_SetUseBestVisual, METH_VARARGS | METH_KEYWORDS },
@@ -2387,6 +2346,7 @@ SWIGEXPORT(void) initwxc() {
         PyDict_SetItemString(d,"wxID_HELP_PROCEDURES", PyInt_FromLong((long) wxID_HELP_PROCEDURES));
         PyDict_SetItemString(d,"wxID_HELP_CONTEXT", PyInt_FromLong((long) wxID_HELP_CONTEXT));
         PyDict_SetItemString(d,"wxID_CLOSE_ALL", PyInt_FromLong((long) wxID_CLOSE_ALL));
+        PyDict_SetItemString(d,"wxID_PREFERENCES", PyInt_FromLong((long) wxID_PREFERENCES));
         PyDict_SetItemString(d,"wxID_CUT", PyInt_FromLong((long) wxID_CUT));
         PyDict_SetItemString(d,"wxID_COPY", PyInt_FromLong((long) wxID_COPY));
         PyDict_SetItemString(d,"wxID_PASTE", PyInt_FromLong((long) wxID_PASTE));
index 5dff12250fc3304df17ed4caad9df2a3fb005c79..c69e72d77d19278e53e96ca1bfc58f17c823f416 100644 (file)
@@ -164,8 +164,6 @@ def wxGetApp(*_args, **_kwargs):
 
 wxApp_CleanUp = wxc.wxApp_CleanUp
 
-wxPyApp_GetMacDefaultEncodingIsPC = wxc.wxPyApp_GetMacDefaultEncodingIsPC
-
 wxPyApp_GetMacSupportPCMenuShortcuts = wxc.wxPyApp_GetMacSupportPCMenuShortcuts
 
 wxPyApp_GetMacAboutMenuItemId = wxc.wxPyApp_GetMacAboutMenuItemId
@@ -176,8 +174,6 @@ wxPyApp_GetMacExitMenuItemId = wxc.wxPyApp_GetMacExitMenuItemId
 
 wxPyApp_GetMacHelpMenuTitleName = wxc.wxPyApp_GetMacHelpMenuTitleName
 
-wxPyApp_SetMacDefaultEncodingIsPC = wxc.wxPyApp_SetMacDefaultEncodingIsPC
-
 wxPyApp_SetMacSupportPCMenuShortcuts = wxc.wxPyApp_SetMacSupportPCMenuShortcuts
 
 wxPyApp_SetMacAboutMenuItemId = wxc.wxPyApp_SetMacAboutMenuItemId
@@ -373,6 +369,7 @@ wxID_HELP_COMMANDS = wxc.wxID_HELP_COMMANDS
 wxID_HELP_PROCEDURES = wxc.wxID_HELP_PROCEDURES
 wxID_HELP_CONTEXT = wxc.wxID_HELP_CONTEXT
 wxID_CLOSE_ALL = wxc.wxID_CLOSE_ALL
+wxID_PREFERENCES = wxc.wxID_PREFERENCES
 wxID_CUT = wxc.wxID_CUT
 wxID_COPY = wxc.wxID_COPY
 wxID_PASTE = wxc.wxID_PASTE
@@ -1942,13 +1939,11 @@ of your Mac."""
 
 
 # change from wxPyApp_ to wxApp_
-wxApp_GetMacDefaultEncodingIsPC = wxc.wxPyApp_GetMacDefaultEncodingIsPC
 wxApp_GetMacSupportPCMenuShortcuts = wxc.wxPyApp_GetMacSupportPCMenuShortcuts
 wxApp_GetMacAboutMenuItemId = wxc.wxPyApp_GetMacAboutMenuItemId
 wxApp_GetMacPreferencesMenuItemId = wxc.wxPyApp_GetMacPreferencesMenuItemId
 wxApp_GetMacExitMenuItemId = wxc.wxPyApp_GetMacExitMenuItemId
 wxApp_GetMacHelpMenuTitleName = wxc.wxPyApp_GetMacHelpMenuTitleName
-wxApp_SetMacDefaultEncodingIsPC = wxc.wxPyApp_SetMacDefaultEncodingIsPC
 wxApp_SetMacSupportPCMenuShortcuts = wxc.wxPyApp_SetMacSupportPCMenuShortcuts
 wxApp_SetMacAboutMenuItemId = wxc.wxPyApp_SetMacAboutMenuItemId
 wxApp_SetMacPreferencesMenuItemId = wxc.wxPyApp_SetMacPreferencesMenuItemId