Added Python wrappers for wxRTTI for the wxVScrolledWindow,
wxVListBox, and wxHtmlListBox classes. Removed the calls to wxClassInfo::Cleanup and Initialize. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -2155,8 +2155,6 @@ SWIGEXPORT(void) initcalendarc() {
|
||||
PyDict_SetItemString(d,"wxEVT_CALENDAR_YEAR_CHANGED", PyInt_FromLong((long) wxEVT_CALENDAR_YEAR_CHANGED));
|
||||
PyDict_SetItemString(d,"wxEVT_CALENDAR_WEEKDAY_CLICKED", PyInt_FromLong((long) wxEVT_CALENDAR_WEEKDAY_CLICKED));
|
||||
|
||||
wxClassInfo::CleanUpClasses();
|
||||
wxClassInfo::InitializeClasses();
|
||||
{
|
||||
int i;
|
||||
for (i = 0; _swig_mapping[i].n1; i++)
|
||||
|
@@ -15733,8 +15733,6 @@ SWIGEXPORT(void) initgridc() {
|
||||
PyDict_SetItemString(d,"wxEVT_GRID_EDITOR_HIDDEN", PyInt_FromLong((long) wxEVT_GRID_EDITOR_HIDDEN));
|
||||
PyDict_SetItemString(d,"wxEVT_GRID_EDITOR_CREATED", PyInt_FromLong((long) wxEVT_GRID_EDITOR_CREATED));
|
||||
|
||||
wxClassInfo::CleanUpClasses();
|
||||
wxClassInfo::InitializeClasses();
|
||||
PyDict_SetItemString(d,"wxGridCellAttr_Any", PyInt_FromLong((long) wxGridCellAttr::Any));
|
||||
PyDict_SetItemString(d,"wxGridCellAttr_Default", PyInt_FromLong((long) wxGridCellAttr::Default));
|
||||
PyDict_SetItemString(d,"wxGridCellAttr_Cell", PyInt_FromLong((long) wxGridCellAttr::Cell));
|
||||
|
@@ -8670,9 +8670,6 @@ SWIGEXPORT(void) inithtmlc() {
|
||||
|
||||
inithtmlhelpc();
|
||||
|
||||
wxClassInfo::CleanUpClasses();
|
||||
wxClassInfo::InitializeClasses();
|
||||
|
||||
wxPyPtrTypeMap_Add("wxHtmlTagHandler", "wxPyHtmlTagHandler");
|
||||
wxPyPtrTypeMap_Add("wxHtmlWinTagHandler", "wxPyHtmlWinTagHandler");
|
||||
wxPyPtrTypeMap_Add("wxHtmlWindow", "wxPyHtmlWindow");
|
||||
|
@@ -835,6 +835,24 @@ static PyObject *_wrap_wxGetProcessId(PyObject *self, PyObject *args, PyObject *
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
static PyObject *_wrap_wxTrap(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
char *_kwnames[] = { NULL };
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxTrap",_kwnames))
|
||||
return NULL;
|
||||
{
|
||||
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||
wxTrap();
|
||||
|
||||
wxPyEndAllowThreads(__tstate);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
} Py_INCREF(Py_None);
|
||||
_resultobj = Py_None;
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
static PyObject *_wrap_wxGetAccelFromString(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
wxAcceleratorEntry * _result;
|
||||
@@ -5586,6 +5604,7 @@ static PyMethodDef misccMethods[] = {
|
||||
{ "wxObject_Destroy", (PyCFunction) _wrap_wxObject_Destroy, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxObject_GetClassName", (PyCFunction) _wrap_wxObject_GetClassName, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxGetAccelFromString", (PyCFunction) _wrap_wxGetAccelFromString, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxTrap", (PyCFunction) _wrap_wxTrap, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxGetProcessId", (PyCFunction) _wrap_wxGetProcessId, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxGetUserHome", (PyCFunction) _wrap_wxGetUserHome, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxGetHomeDir", (PyCFunction) _wrap_wxGetHomeDir, METH_VARARGS | METH_KEYWORDS },
|
||||
|
@@ -811,6 +811,8 @@ wxGetUserHome = miscc.wxGetUserHome
|
||||
|
||||
wxGetProcessId = miscc.wxGetProcessId
|
||||
|
||||
wxTrap = miscc.wxTrap
|
||||
|
||||
def wxGetAccelFromString(*_args, **_kwargs):
|
||||
val = miscc.wxGetAccelFromString(*_args,**_kwargs)
|
||||
if val: val = wxAcceleratorEntryPtr(val)
|
||||
|
@@ -7860,9 +7860,6 @@ SWIGEXPORT(void) initutilsc() {
|
||||
PyDict_SetItemString(d,"wxCONFIG_USE_RELATIVE_PATH", PyInt_FromLong((long) wxCONFIG_USE_RELATIVE_PATH));
|
||||
PyDict_SetItemString(d,"wxCONFIG_USE_NO_ESCAPE_CHARACTERS", PyInt_FromLong((long) wxCONFIG_USE_NO_ESCAPE_CHARACTERS));
|
||||
|
||||
// These are no longer needed since utils is back in the core
|
||||
// wxClassInfo::CleanUpClasses();
|
||||
// wxClassInfo::InitializeClasses();
|
||||
PyDict_SetItemString(d,"wxConfigBase_Type_Unknown", PyInt_FromLong((long) wxConfigBase::Type_Unknown));
|
||||
PyDict_SetItemString(d,"wxConfigBase_Type_String", PyInt_FromLong((long) wxConfigBase::Type_String));
|
||||
PyDict_SetItemString(d,"wxConfigBase_Type_Boolean", PyInt_FromLong((long) wxConfigBase::Type_Boolean));
|
||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -350,6 +350,200 @@ class wxTipWindow(wxTipWindowPtr):
|
||||
|
||||
|
||||
|
||||
class wxVScrolledWindowPtr(wxPanelPtr):
|
||||
def __init__(self,this):
|
||||
self.this = this
|
||||
self.thisown = 0
|
||||
def _setCallbackInfo(self, *_args, **_kwargs):
|
||||
val = windows3c.wxVScrolledWindow__setCallbackInfo(self, *_args, **_kwargs)
|
||||
return val
|
||||
def Create(self, *_args, **_kwargs):
|
||||
val = windows3c.wxVScrolledWindow_Create(self, *_args, **_kwargs)
|
||||
return val
|
||||
def SetLineCount(self, *_args, **_kwargs):
|
||||
val = windows3c.wxVScrolledWindow_SetLineCount(self, *_args, **_kwargs)
|
||||
return val
|
||||
def ScrollToLine(self, *_args, **_kwargs):
|
||||
val = windows3c.wxVScrolledWindow_ScrollToLine(self, *_args, **_kwargs)
|
||||
return val
|
||||
def ScrollLines(self, *_args, **_kwargs):
|
||||
val = windows3c.wxVScrolledWindow_ScrollLines(self, *_args, **_kwargs)
|
||||
return val
|
||||
def ScrollPages(self, *_args, **_kwargs):
|
||||
val = windows3c.wxVScrolledWindow_ScrollPages(self, *_args, **_kwargs)
|
||||
return val
|
||||
def RefreshLine(self, *_args, **_kwargs):
|
||||
val = windows3c.wxVScrolledWindow_RefreshLine(self, *_args, **_kwargs)
|
||||
return val
|
||||
def RefreshLines(self, *_args, **_kwargs):
|
||||
val = windows3c.wxVScrolledWindow_RefreshLines(self, *_args, **_kwargs)
|
||||
return val
|
||||
def HitTestXT(self, *_args, **_kwargs):
|
||||
val = windows3c.wxVScrolledWindow_HitTestXT(self, *_args, **_kwargs)
|
||||
return val
|
||||
def HitTest(self, *_args, **_kwargs):
|
||||
val = windows3c.wxVScrolledWindow_HitTest(self, *_args, **_kwargs)
|
||||
return val
|
||||
def RefreshAll(self, *_args, **_kwargs):
|
||||
val = windows3c.wxVScrolledWindow_RefreshAll(self, *_args, **_kwargs)
|
||||
return val
|
||||
def GetLineCount(self, *_args, **_kwargs):
|
||||
val = windows3c.wxVScrolledWindow_GetLineCount(self, *_args, **_kwargs)
|
||||
return val
|
||||
def GetFirstVisibleLine(self, *_args, **_kwargs):
|
||||
val = windows3c.wxVScrolledWindow_GetFirstVisibleLine(self, *_args, **_kwargs)
|
||||
return val
|
||||
def GetLastVisibleLine(self, *_args, **_kwargs):
|
||||
val = windows3c.wxVScrolledWindow_GetLastVisibleLine(self, *_args, **_kwargs)
|
||||
return val
|
||||
def IsVisible(self, *_args, **_kwargs):
|
||||
val = windows3c.wxVScrolledWindow_IsVisible(self, *_args, **_kwargs)
|
||||
return val
|
||||
def __repr__(self):
|
||||
return "<%s.%s instance; proxy of C++ wxVScrolledWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
|
||||
class wxVScrolledWindow(wxVScrolledWindowPtr):
|
||||
def __init__(self,*_args,**_kwargs):
|
||||
self.this = windows3c.new_wxVScrolledWindow(*_args,**_kwargs)
|
||||
self.thisown = 1
|
||||
self._setCallbackInfo(self, wxVScrolledWindow)
|
||||
self._setOORInfo(self)
|
||||
|
||||
|
||||
|
||||
def wxPreVScrolledWindow(*_args,**_kwargs):
|
||||
val = wxVScrolledWindowPtr(windows3c.new_wxPreVScrolledWindow(*_args,**_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
class wxVListBoxPtr(wxVScrolledWindowPtr):
|
||||
def __init__(self,this):
|
||||
self.this = this
|
||||
self.thisown = 0
|
||||
def _setCallbackInfo(self, *_args, **_kwargs):
|
||||
val = windows3c.wxVListBox__setCallbackInfo(self, *_args, **_kwargs)
|
||||
return val
|
||||
def Create(self, *_args, **_kwargs):
|
||||
val = windows3c.wxVListBox_Create(self, *_args, **_kwargs)
|
||||
return val
|
||||
def GetItemCount(self, *_args, **_kwargs):
|
||||
val = windows3c.wxVListBox_GetItemCount(self, *_args, **_kwargs)
|
||||
return val
|
||||
def HasMultipleSelection(self, *_args, **_kwargs):
|
||||
val = windows3c.wxVListBox_HasMultipleSelection(self, *_args, **_kwargs)
|
||||
return val
|
||||
def GetSelection(self, *_args, **_kwargs):
|
||||
val = windows3c.wxVListBox_GetSelection(self, *_args, **_kwargs)
|
||||
return val
|
||||
def IsCurrent(self, *_args, **_kwargs):
|
||||
val = windows3c.wxVListBox_IsCurrent(self, *_args, **_kwargs)
|
||||
return val
|
||||
def IsSelected(self, *_args, **_kwargs):
|
||||
val = windows3c.wxVListBox_IsSelected(self, *_args, **_kwargs)
|
||||
return val
|
||||
def GetSelectedCount(self, *_args, **_kwargs):
|
||||
val = windows3c.wxVListBox_GetSelectedCount(self, *_args, **_kwargs)
|
||||
return val
|
||||
def GetFirstSelected(self, *_args, **_kwargs):
|
||||
val = windows3c.wxVListBox_GetFirstSelected(self, *_args, **_kwargs)
|
||||
return val
|
||||
def GetNextSelected(self, *_args, **_kwargs):
|
||||
val = windows3c.wxVListBox_GetNextSelected(self, *_args, **_kwargs)
|
||||
return val
|
||||
def GetMargins(self, *_args, **_kwargs):
|
||||
val = windows3c.wxVListBox_GetMargins(self, *_args, **_kwargs)
|
||||
if val: val = wxPointPtr(val) ; val.thisown = 1
|
||||
return val
|
||||
def GetSelectionBackground(self, *_args, **_kwargs):
|
||||
val = windows3c.wxVListBox_GetSelectionBackground(self, *_args, **_kwargs)
|
||||
if val: val = wxColourPtr(val)
|
||||
return val
|
||||
def SetItemCount(self, *_args, **_kwargs):
|
||||
val = windows3c.wxVListBox_SetItemCount(self, *_args, **_kwargs)
|
||||
return val
|
||||
def Clear(self, *_args, **_kwargs):
|
||||
val = windows3c.wxVListBox_Clear(self, *_args, **_kwargs)
|
||||
return val
|
||||
def SetSelection(self, *_args, **_kwargs):
|
||||
val = windows3c.wxVListBox_SetSelection(self, *_args, **_kwargs)
|
||||
return val
|
||||
def Select(self, *_args, **_kwargs):
|
||||
val = windows3c.wxVListBox_Select(self, *_args, **_kwargs)
|
||||
return val
|
||||
def SelectRange(self, *_args, **_kwargs):
|
||||
val = windows3c.wxVListBox_SelectRange(self, *_args, **_kwargs)
|
||||
return val
|
||||
def Toggle(self, *_args, **_kwargs):
|
||||
val = windows3c.wxVListBox_Toggle(self, *_args, **_kwargs)
|
||||
return val
|
||||
def SelectAll(self, *_args, **_kwargs):
|
||||
val = windows3c.wxVListBox_SelectAll(self, *_args, **_kwargs)
|
||||
return val
|
||||
def DeselectAll(self, *_args, **_kwargs):
|
||||
val = windows3c.wxVListBox_DeselectAll(self, *_args, **_kwargs)
|
||||
return val
|
||||
def SetMargins(self, *_args, **_kwargs):
|
||||
val = windows3c.wxVListBox_SetMargins(self, *_args, **_kwargs)
|
||||
return val
|
||||
def SetMarginsXY(self, *_args, **_kwargs):
|
||||
val = windows3c.wxVListBox_SetMarginsXY(self, *_args, **_kwargs)
|
||||
return val
|
||||
def SetSelectionBackground(self, *_args, **_kwargs):
|
||||
val = windows3c.wxVListBox_SetSelectionBackground(self, *_args, **_kwargs)
|
||||
return val
|
||||
def __repr__(self):
|
||||
return "<%s.%s instance; proxy of C++ wxVListBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
|
||||
class wxVListBox(wxVListBoxPtr):
|
||||
def __init__(self,*_args,**_kwargs):
|
||||
self.this = windows3c.new_wxVListBox(*_args,**_kwargs)
|
||||
self.thisown = 1
|
||||
self._setCallbackInfo(self, wxVListBox)
|
||||
self._setOORInfo(self)
|
||||
|
||||
|
||||
|
||||
def wxPreVListBox(*_args,**_kwargs):
|
||||
val = wxVListBoxPtr(windows3c.new_wxPreVListBox(*_args,**_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
class wxHtmlListBoxPtr(wxVListBoxPtr):
|
||||
def __init__(self,this):
|
||||
self.this = this
|
||||
self.thisown = 0
|
||||
def _setCallbackInfo(self, *_args, **_kwargs):
|
||||
val = windows3c.wxHtmlListBox__setCallbackInfo(self, *_args, **_kwargs)
|
||||
return val
|
||||
def Create(self, *_args, **_kwargs):
|
||||
val = windows3c.wxHtmlListBox_Create(self, *_args, **_kwargs)
|
||||
return val
|
||||
def RefreshAll(self, *_args, **_kwargs):
|
||||
val = windows3c.wxHtmlListBox_RefreshAll(self, *_args, **_kwargs)
|
||||
return val
|
||||
def SetItemCount(self, *_args, **_kwargs):
|
||||
val = windows3c.wxHtmlListBox_SetItemCount(self, *_args, **_kwargs)
|
||||
return val
|
||||
def __repr__(self):
|
||||
return "<%s.%s instance; proxy of C++ wxHtmlListBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
|
||||
class wxHtmlListBox(wxHtmlListBoxPtr):
|
||||
def __init__(self,*_args,**_kwargs):
|
||||
self.this = windows3c.new_wxHtmlListBox(*_args,**_kwargs)
|
||||
self.thisown = 1
|
||||
self._setCallbackInfo(self, wxHtmlListBox)
|
||||
self._setOORInfo(self)
|
||||
|
||||
|
||||
|
||||
def wxPreHtmlListBox(*_args,**_kwargs):
|
||||
val = wxHtmlListBoxPtr(windows3c.new_wxPreHtmlListBox(*_args,**_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
|
||||
|
||||
#-------------- FUNCTION WRAPPERS ------------------
|
||||
|
@@ -2389,8 +2389,6 @@ SWIGEXPORT(void) initwizardc() {
|
||||
PyDict_SetItemString(d,"wxEVT_WIZARD_HELP", PyInt_FromLong((long) wxEVT_WIZARD_HELP));
|
||||
PyDict_SetItemString(d,"wxEVT_WIZARD_FINISHED", PyInt_FromLong((long) wxEVT_WIZARD_FINISHED));
|
||||
|
||||
wxClassInfo::CleanUpClasses();
|
||||
wxClassInfo::InitializeClasses();
|
||||
{
|
||||
int i;
|
||||
for (i = 0; _swig_mapping[i].n1; i++)
|
||||
|
Reference in New Issue
Block a user