From b42ea279ce2c53753af141a23da147050d7e9f56 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Sun, 8 Sep 2002 00:38:34 +0000
Subject: [PATCH] SWIGged updates for wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
wxPython/contrib/stc/gtk/stc_.py | 3 +++
wxPython/src/gtk/fonts.cpp | 27 +++++++++++++++++++++++++++
wxPython/src/gtk/fonts.py | 5 +++++
wxPython/src/gtk/grid.cpp | 29 +++++++++++++++++++++++++++++
wxPython/src/gtk/grid.py | 3 +++
5 files changed, 67 insertions(+)
diff --git a/wxPython/contrib/stc/gtk/stc_.py b/wxPython/contrib/stc/gtk/stc_.py
index b15920505c..4e9ec5fadd 100644
--- a/wxPython/contrib/stc/gtk/stc_.py
+++ b/wxPython/contrib/stc/gtk/stc_.py
@@ -1794,3 +1794,6 @@ wxEVT_STC_ZOOM = stc_c.wxEVT_STC_ZOOM
wx.wxStyledTextEventPtr = wxStyledTextEventPtr
wx.wxStyledTextCtrlPtr = wxStyledTextCtrlPtr
+
+
+wxSTC_CARET_CENTER = wxSTC_CARET_STRICT
diff --git a/wxPython/src/gtk/fonts.cpp b/wxPython/src/gtk/fonts.cpp
index f3670151a6..4a10db9ff8 100644
--- a/wxPython/src/gtk/fonts.cpp
+++ b/wxPython/src/gtk/fonts.cpp
@@ -3045,6 +3045,32 @@ static PyObject *_wrap_wxLocale_IsLoaded(PyObject *self, PyObject *args, PyObjec
return _resultobj;
}
+static PyObject *_wrap_wxLocale_GetLanguageInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+ PyObject * _resultobj;
+ wxLanguageInfo * _result;
+ int _arg0;
+ char *_kwnames[] = { "lang", NULL };
+ char _ptemp[128];
+
+ self = self;
+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:wxLocale_GetLanguageInfo",_kwnames,&_arg0))
+ return NULL;
+{
+ PyThreadState* __tstate = wxPyBeginAllowThreads();
+ _result = (wxLanguageInfo *)wxLocale::GetLanguageInfo(_arg0);
+
+ wxPyEndAllowThreads(__tstate);
+ if (PyErr_Occurred()) return NULL;
+} if (_result) {
+ SWIG_MakePtr(_ptemp, (char *) _result,"_wxLanguageInfo_p");
+ _resultobj = Py_BuildValue("s",_ptemp);
+ } else {
+ Py_INCREF(Py_None);
+ _resultobj = Py_None;
+ }
+ return _resultobj;
+}
+
static PyObject *_wrap_wxLocale_AddLanguage(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxLanguageInfo * _arg0;
@@ -3371,6 +3397,7 @@ static PyMethodDef fontscMethods[] = {
{ "wxLocale_GetName", (PyCFunction) _wrap_wxLocale_GetName, METH_VARARGS | METH_KEYWORDS },
{ "wxLocale_GetString", (PyCFunction) _wrap_wxLocale_GetString, METH_VARARGS | METH_KEYWORDS },
{ "wxLocale_AddLanguage", (PyCFunction) _wrap_wxLocale_AddLanguage, METH_VARARGS | METH_KEYWORDS },
+ { "wxLocale_GetLanguageInfo", (PyCFunction) _wrap_wxLocale_GetLanguageInfo, METH_VARARGS | METH_KEYWORDS },
{ "wxLocale_IsLoaded", (PyCFunction) _wrap_wxLocale_IsLoaded, METH_VARARGS | METH_KEYWORDS },
{ "wxLocale_AddCatalog", (PyCFunction) _wrap_wxLocale_AddCatalog, METH_VARARGS | METH_KEYWORDS },
{ "wxLocale_AddCatalogLookupPathPrefix", (PyCFunction) _wrap_wxLocale_AddCatalogLookupPathPrefix, METH_VARARGS | METH_KEYWORDS },
diff --git a/wxPython/src/gtk/fonts.py b/wxPython/src/gtk/fonts.py
index 837ccad73d..71e013f9c6 100644
--- a/wxPython/src/gtk/fonts.py
+++ b/wxPython/src/gtk/fonts.py
@@ -379,6 +379,11 @@ wxLocale_GetSystemEncodingName = fontsc.wxLocale_GetSystemEncodingName
wxLocale_AddCatalogLookupPathPrefix = fontsc.wxLocale_AddCatalogLookupPathPrefix
+def wxLocale_GetLanguageInfo(*_args, **_kwargs):
+ val = apply(fontsc.wxLocale_GetLanguageInfo,_args,_kwargs)
+ if val: val = wxLanguageInfoPtr(val)
+ return val
+
wxLocale_AddLanguage = fontsc.wxLocale_AddLanguage
wxEncodingConverter_GetPlatformEquivalents = fontsc.wxEncodingConverter_GetPlatformEquivalents
diff --git a/wxPython/src/gtk/grid.cpp b/wxPython/src/gtk/grid.cpp
index 046fd09506..e0f5dd6baf 100644
--- a/wxPython/src/gtk/grid.cpp
+++ b/wxPython/src/gtk/grid.cpp
@@ -7458,6 +7458,34 @@ static PyObject *_wrap_wxGrid_SetSelectionMode(PyObject *self, PyObject *args, P
return _resultobj;
}
+#define wxGrid_GetSelectionMode(_swigobj) (_swigobj->GetSelectionMode())
+static PyObject *_wrap_wxGrid_GetSelectionMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+ PyObject * _resultobj;
+ WXGRIDSELECTIONMODES _result;
+ wxGrid * _arg0;
+ PyObject * _argo0 = 0;
+ char *_kwnames[] = { "self", NULL };
+
+ self = self;
+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_GetSelectionMode",_kwnames,&_argo0))
+ return NULL;
+ if (_argo0) {
+ if (_argo0 == Py_None) { _arg0 = NULL; }
+ else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {
+ PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetSelectionMode. Expected _wxGrid_p.");
+ return NULL;
+ }
+ }
+{
+ PyThreadState* __tstate = wxPyBeginAllowThreads();
+ _result = (WXGRIDSELECTIONMODES )wxGrid_GetSelectionMode(_arg0);
+
+ wxPyEndAllowThreads(__tstate);
+ if (PyErr_Occurred()) return NULL;
+} _resultobj = Py_BuildValue("i",_result);
+ return _resultobj;
+}
+
#define wxGrid_GetNumberRows(_swigobj) (_swigobj->GetNumberRows())
static PyObject *_wrap_wxGrid_GetNumberRows(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -14427,6 +14455,7 @@ static PyMethodDef gridcMethods[] = {
{ "wxGrid_ProcessTableMessage", (PyCFunction) _wrap_wxGrid_ProcessTableMessage, METH_VARARGS | METH_KEYWORDS },
{ "wxGrid_GetNumberCols", (PyCFunction) _wrap_wxGrid_GetNumberCols, METH_VARARGS | METH_KEYWORDS },
{ "wxGrid_GetNumberRows", (PyCFunction) _wrap_wxGrid_GetNumberRows, METH_VARARGS | METH_KEYWORDS },
+ { "wxGrid_GetSelectionMode", (PyCFunction) _wrap_wxGrid_GetSelectionMode, METH_VARARGS | METH_KEYWORDS },
{ "wxGrid_SetSelectionMode", (PyCFunction) _wrap_wxGrid_SetSelectionMode, METH_VARARGS | METH_KEYWORDS },
{ "wxGrid_CreateGrid", (PyCFunction) _wrap_wxGrid_CreateGrid, METH_VARARGS | METH_KEYWORDS },
{ "new_wxGrid", (PyCFunction) _wrap_new_wxGrid, METH_VARARGS | METH_KEYWORDS },
diff --git a/wxPython/src/gtk/grid.py b/wxPython/src/gtk/grid.py
index b97466845a..7cbd1c0df1 100644
--- a/wxPython/src/gtk/grid.py
+++ b/wxPython/src/gtk/grid.py
@@ -955,6 +955,9 @@ class wxGridPtr(wxScrolledWindowPtr):
def SetSelectionMode(self, *_args, **_kwargs):
val = apply(gridc.wxGrid_SetSelectionMode,(self,) + _args, _kwargs)
return val
+ def GetSelectionMode(self, *_args, **_kwargs):
+ val = apply(gridc.wxGrid_GetSelectionMode,(self,) + _args, _kwargs)
+ return val
def GetNumberRows(self, *_args, **_kwargs):
val = apply(gridc.wxGrid_GetNumberRows,(self,) + _args, _kwargs)
return val
--
2.49.0