Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed a method name

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2001-12-07 04:32:43 +00:00
parent 4d416b5f21
commit ff65119eb2
6 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wxPython/contrib/dllwidget/dllwidget.h
View File

@@ -86,7 +86,7 @@ public:
bool Ok() { return m_widget != NULL; } bool Ok() { return m_widget != NULL; }
virtual int SendCommand(int cmd, const wxString& param = wxEmptyString); virtual int SendCommand(int cmd, const wxString& param = wxEmptyString);
virtual wxWindow* GetEmbeddedWindow() { return m_widget; } virtual wxWindow* GetWidgetWindow() { return m_widget; }
virtual void AddChild(wxWindowBase *child); virtual void AddChild(wxWindowBase *child);

12
wxPython/contrib/dllwidget/dllwidget_.cpp
View File

@@ -309,8 +309,8 @@ static PyObject *_wrap_wxDllWidget_SendCommand(PyObject *self, PyObject *args, P
return _resultobj; return _resultobj;
} }
#define wxDllWidget_GetEmbeddedWindow(_swigobj) (_swigobj->GetEmbeddedWindow()) #define wxDllWidget_GetWidgetWindow(_swigobj) (_swigobj->GetWidgetWindow())
static PyObject *_wrap_wxDllWidget_GetEmbeddedWindow(PyObject *self, PyObject *args, PyObject *kwargs) { static PyObject *_wrap_wxDllWidget_GetWidgetWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj; PyObject * _resultobj;
wxWindow * _result; wxWindow * _result;
wxDllWidget * _arg0; wxDllWidget * _arg0;
@@ -318,18 +318,18 @@ static PyObject *_wrap_wxDllWidget_GetEmbeddedWindow(PyObject *self, PyObject *a
char *_kwnames[] = { "self", NULL }; char *_kwnames[] = { "self", NULL };
self = self; self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDllWidget_GetEmbeddedWindow",_kwnames,&_argo0)) if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDllWidget_GetWidgetWindow",_kwnames,&_argo0))
return NULL; return NULL;
if (_argo0) { if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; } if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDllWidget_p")) { else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDllWidget_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDllWidget_GetEmbeddedWindow. Expected _wxDllWidget_p."); PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDllWidget_GetWidgetWindow. Expected _wxDllWidget_p.");
return NULL; return NULL;
} }
} }
{ {
wxPy_BEGIN_ALLOW_THREADS; wxPy_BEGIN_ALLOW_THREADS;
_result = (wxWindow *)wxDllWidget_GetEmbeddedWindow(_arg0); _result = (wxWindow *)wxDllWidget_GetWidgetWindow(_arg0);
wxPy_END_ALLOW_THREADS; wxPy_END_ALLOW_THREADS;
}{ _resultobj = wxPyMake_wxObject(_result); } }{ _resultobj = wxPyMake_wxObject(_result); }
@@ -360,7 +360,7 @@ static PyObject *_wrap_wxDllWidget_GetDllExt(PyObject *self, PyObject *args, PyO
static PyMethodDef dllwidget_cMethods[] = { static PyMethodDef dllwidget_cMethods[] = {
{ "wxDllWidget_GetDllExt", (PyCFunction) _wrap_wxDllWidget_GetDllExt, METH_VARARGS | METH_KEYWORDS }, { "wxDllWidget_GetDllExt", (PyCFunction) _wrap_wxDllWidget_GetDllExt, METH_VARARGS | METH_KEYWORDS },
{ "wxDllWidget_GetEmbeddedWindow", (PyCFunction) _wrap_wxDllWidget_GetEmbeddedWindow, METH_VARARGS | METH_KEYWORDS }, { "wxDllWidget_GetWidgetWindow", (PyCFunction) _wrap_wxDllWidget_GetWidgetWindow, METH_VARARGS | METH_KEYWORDS },
{ "wxDllWidget_SendCommand", (PyCFunction) _wrap_wxDllWidget_SendCommand, METH_VARARGS | METH_KEYWORDS }, { "wxDllWidget_SendCommand", (PyCFunction) _wrap_wxDllWidget_SendCommand, METH_VARARGS | METH_KEYWORDS },
{ "wxDllWidget_Ok", (PyCFunction) _wrap_wxDllWidget_Ok, METH_VARARGS | METH_KEYWORDS }, { "wxDllWidget_Ok", (PyCFunction) _wrap_wxDllWidget_Ok, METH_VARARGS | METH_KEYWORDS },
{ "new_wxDllWidget", (PyCFunction) _wrap_new_wxDllWidget, METH_VARARGS | METH_KEYWORDS }, { "new_wxDllWidget", (PyCFunction) _wrap_new_wxDllWidget, METH_VARARGS | METH_KEYWORDS },

2
wxPython/contrib/dllwidget/dllwidget_.i
View File

@@ -93,7 +93,7 @@ public:
bool Ok(); bool Ok();
int SendCommand(int cmd, const wxString& param = wxEmptyString); int SendCommand(int cmd, const wxString& param = wxEmptyString);
wxWindow* GetEmbeddedWindow(); wxWindow* GetWidgetWindow();
static wxString GetDllExt(); static wxString GetDllExt();
}; };

4
wxPython/contrib/dllwidget/dllwidget_.py
View File

@@ -50,8 +50,8 @@ class wxDllWidgetPtr(wxPanelPtr):
def SendCommand(self, *_args, **_kwargs): def SendCommand(self, *_args, **_kwargs):
val = apply(dllwidget_c.wxDllWidget_SendCommand,(self,) + _args, _kwargs) val = apply(dllwidget_c.wxDllWidget_SendCommand,(self,) + _args, _kwargs)
return val return val
def GetEmbeddedWindow(self, *_args, **_kwargs): def GetWidgetWindow(self, *_args, **_kwargs):
val = apply(dllwidget_c.wxDllWidget_GetEmbeddedWindow,(self,) + _args, _kwargs) val = apply(dllwidget_c.wxDllWidget_GetWidgetWindow,(self,) + _args, _kwargs)
return val return val
def __repr__(self): def __repr__(self):
return "<C wxDllWidget instance at %s>" % (self.this,) return "<C wxDllWidget instance at %s>" % (self.this,)

4
wxPython/demo/dllwidget/test_prog.py
View File

@@ -38,11 +38,11 @@ class TestFrame(wxFrame):
if dw.Ok(): if dw.Ok():
# The embedded window is the one exported from the DLL # The embedded window is the one exported from the DLL
print dw.GetEmbeddedWindow().GetClassName() print dw.GetWidgetWindow().GetClassName()
# This shows that we can give it a child from this side of things. # This shows that we can give it a child from this side of things.
# You can also call any wxWindow methods on it too. # You can also call any wxWindow methods on it too.
wxStaticText(dw.GetEmbeddedWindow(), -1, wxStaticText(dw.GetWidgetWindow(), -1,
"Loaded from test_dll...", pos=(10,10)) "Loaded from test_dll...", pos=(10,10))
else: else:
wxStaticText(dw, -1, "ERROR!!!!", pos=(20,20)) wxStaticText(dw, -1, "ERROR!!!!", pos=(20,20))

1
wxPython/src/_defs.i
View File

@@ -319,6 +319,7 @@ enum {
wxSP_BORDER, wxSP_BORDER,
wxSP_LIVE_UPDATE, wxSP_LIVE_UPDATE,
wxSP_PERMIT_UNSPLIT, wxSP_PERMIT_UNSPLIT,
//wxSP_SASH_AQUA,
wxFLOOD_SURFACE, wxFLOOD_SURFACE,
wxFLOOD_BORDER, wxFLOOD_BORDER,
wxODDEVEN_RULE, wxODDEVEN_RULE,