Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-09-19 20:41:04 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Refactored Python shadows to use wxControlWithItems where appropriate.

Browse Source 
Implememted SetClientData for wxControlWithItems.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11799 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2001-10-03 06:12:49 +00:00
parent 900d98862d
commit 65191ae8f2
14 changed files with 2397 additions and 2351 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wxPython/src/gtk/controls.cpp
+534 -789
View File
File diff suppressed because it is too large Load Diff
wxPython/src/gtk/controls.py
+49 -67
View File
@@ -42,6 +42,53 @@ def wxPreControl(*_args,**_kwargs):
return val
class wxControlWithItemsPtr(wxControlPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def Delete(self, *_args, **_kwargs):
val = apply(controlsc.wxControlWithItems_Delete,(self,) + _args, _kwargs)
return val
def GetCount(self, *_args, **_kwargs):
val = apply(controlsc.wxControlWithItems_GetCount,(self,) + _args, _kwargs)
return val
def GetString(self, *_args, **_kwargs):
val = apply(controlsc.wxControlWithItems_GetString,(self,) + _args, _kwargs)
return val
def SetString(self, *_args, **_kwargs):
val = apply(controlsc.wxControlWithItems_SetString,(self,) + _args, _kwargs)
return val
def FindString(self, *_args, **_kwargs):
val = apply(controlsc.wxControlWithItems_FindString,(self,) + _args, _kwargs)
return val
def Select(self, *_args, **_kwargs):
val = apply(controlsc.wxControlWithItems_Select,(self,) + _args, _kwargs)
return val
def GetSelection(self, *_args, **_kwargs):
val = apply(controlsc.wxControlWithItems_GetSelection,(self,) + _args, _kwargs)
return val
def GetStringSelection(self, *_args, **_kwargs):
val = apply(controlsc.wxControlWithItems_GetStringSelection,(self,) + _args, _kwargs)
return val
def Append(self, *_args, **_kwargs):
val = apply(controlsc.wxControlWithItems_Append,(self,) + _args, _kwargs)
return val
def GetClientData(self, *_args, **_kwargs):
val = apply(controlsc.wxControlWithItems_GetClientData,(self,) + _args, _kwargs)
return val
def SetClientData(self, *_args, **_kwargs):
val = apply(controlsc.wxControlWithItems_SetClientData,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxControlWithItems instance at %s>" % (self.this,)
Number = GetCount
class wxControlWithItems(wxControlWithItemsPtr):
def __init__(self,this):
self.this = this
class wxButtonPtr(wxControlPtr):
def __init__(self,this):
self.this = this
@@ -160,40 +207,19 @@ def wxPreCheckBox(*_args,**_kwargs):
return val
class wxChoicePtr(wxControlPtr):
class wxChoicePtr(wxControlWithItemsPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def Create(self, *_args, **_kwargs):
val = apply(controlsc.wxChoice_Create,(self,) + _args, _kwargs)
return val
def Append(self, *_args, **_kwargs):
val = apply(controlsc.wxChoice_Append,(self,) + _args, _kwargs)
return val
def Clear(self, *_args, **_kwargs):
val = apply(controlsc.wxChoice_Clear,(self,) + _args, _kwargs)
return val
def Delete(self, *_args, **_kwargs):
val = apply(controlsc.wxChoice_Delete,(self,) + _args, _kwargs)
return val
def FindString(self, *_args, **_kwargs):
val = apply(controlsc.wxChoice_FindString,(self,) + _args, _kwargs)
return val
def GetColumns(self, *_args, **_kwargs):
val = apply(controlsc.wxChoice_GetColumns,(self,) + _args, _kwargs)
return val
def GetSelection(self, *_args, **_kwargs):
val = apply(controlsc.wxChoice_GetSelection,(self,) + _args, _kwargs)
return val
def GetString(self, *_args, **_kwargs):
val = apply(controlsc.wxChoice_GetString,(self,) + _args, _kwargs)
return val
def GetStringSelection(self, *_args, **_kwargs):
val = apply(controlsc.wxChoice_GetStringSelection,(self,) + _args, _kwargs)
return val
def GetCount(self, *_args, **_kwargs):
val = apply(controlsc.wxChoice_GetCount,(self,) + _args, _kwargs)
return val
def SetColumns(self, *_args, **_kwargs):
val = apply(controlsc.wxChoice_SetColumns,(self,) + _args, _kwargs)
return val
@@ -209,7 +235,6 @@ class wxChoicePtr(wxControlPtr):
def __repr__(self):
return "<C wxChoice instance at %s>" % (self.this,)
Number = GetCount
Select = SetSelection
class wxChoice(wxChoicePtr):
@@ -232,39 +257,18 @@ class wxComboBoxPtr(wxChoicePtr):
def Create(self, *_args, **_kwargs):
val = apply(controlsc.wxComboBox_Create,(self,) + _args, _kwargs)
return val
def Append(self, *_args, **_kwargs):
val = apply(controlsc.wxComboBox_Append,(self,) + _args, _kwargs)
return val
def Clear(self, *_args, **_kwargs):
val = apply(controlsc.wxComboBox_Clear,(self,) + _args, _kwargs)
return val
def Copy(self, *_args, **_kwargs):
val = apply(controlsc.wxComboBox_Copy,(self,) + _args, _kwargs)
return val
def Cut(self, *_args, **_kwargs):
val = apply(controlsc.wxComboBox_Cut,(self,) + _args, _kwargs)
return val
def Delete(self, *_args, **_kwargs):
val = apply(controlsc.wxComboBox_Delete,(self,) + _args, _kwargs)
return val
def FindString(self, *_args, **_kwargs):
val = apply(controlsc.wxComboBox_FindString,(self,) + _args, _kwargs)
return val
def GetInsertionPoint(self, *_args, **_kwargs):
val = apply(controlsc.wxComboBox_GetInsertionPoint,(self,) + _args, _kwargs)
return val
def GetLastPosition(self, *_args, **_kwargs):
val = apply(controlsc.wxComboBox_GetLastPosition,(self,) + _args, _kwargs)
return val
def GetSelection(self, *_args, **_kwargs):
val = apply(controlsc.wxComboBox_GetSelection,(self,) + _args, _kwargs)
return val
def GetString(self, *_args, **_kwargs):
val = apply(controlsc.wxComboBox_GetString,(self,) + _args, _kwargs)
return val
def GetStringSelection(self, *_args, **_kwargs):
val = apply(controlsc.wxComboBox_GetStringSelection,(self,) + _args, _kwargs)
return val
def GetValue(self, *_args, **_kwargs):
val = apply(controlsc.wxComboBox_GetValue,(self,) + _args, _kwargs)
return val
@@ -428,46 +432,25 @@ def wxPreStaticText(*_args,**_kwargs):
return val
class wxListBoxPtr(wxControlPtr):
class wxListBoxPtr(wxControlWithItemsPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def Create(self, *_args, **_kwargs):
val = apply(controlsc.wxListBox_Create,(self,) + _args, _kwargs)
return val
def Append(self, *_args, **_kwargs):
val = apply(controlsc.wxListBox_Append,(self,) + _args, _kwargs)
return val
def Clear(self, *_args, **_kwargs):
val = apply(controlsc.wxListBox_Clear,(self,) + _args, _kwargs)
return val
def Delete(self, *_args, **_kwargs):
val = apply(controlsc.wxListBox_Delete,(self,) + _args, _kwargs)
return val
def Deselect(self, *_args, **_kwargs):
val = apply(controlsc.wxListBox_Deselect,(self,) + _args, _kwargs)
return val
def FindString(self, *_args, **_kwargs):
val = apply(controlsc.wxListBox_FindString,(self,) + _args, _kwargs)
return val
def GetSelection(self, *_args, **_kwargs):
val = apply(controlsc.wxListBox_GetSelection,(self,) + _args, _kwargs)
return val
def GetSelections(self, *_args, **_kwargs):
val = apply(controlsc.wxListBox_GetSelections,(self,) + _args, _kwargs)
return val
def InsertItems(self, *_args, **_kwargs):
val = apply(controlsc.wxListBox_InsertItems,(self,) + _args, _kwargs)
return val
def GetString(self, *_args, **_kwargs):
val = apply(controlsc.wxListBox_GetString,(self,) + _args, _kwargs)
return val
def GetStringSelection(self, *_args, **_kwargs):
val = apply(controlsc.wxListBox_GetStringSelection,(self,) + _args, _kwargs)
return val
def GetCount(self, *_args, **_kwargs):
val = apply(controlsc.wxListBox_GetCount,(self,) + _args, _kwargs)
return val
def IsSelected(self, *_args, **_kwargs):
val = apply(controlsc.wxListBox_IsSelected,(self,) + _args, _kwargs)
return val
@@ -494,7 +477,6 @@ class wxListBoxPtr(wxControlPtr):
return val
def __repr__(self):
return "<C wxListBox instance at %s>" % (self.this,)
Number = GetCount
class wxListBox(wxListBoxPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(controlsc.new_wxListBox,_args,_kwargs)
wxPython/src/gtk/controls2.cpp
+37
View File
@@ -6498,6 +6498,42 @@ static PyObject *_wrap_wxTreeEvent_GetPoint(PyObject *self, PyObject *args, PyOb
return _resultobj;
}
#define wxTreeEvent_GetKeyEvent(_swigobj) (_swigobj->GetKeyEvent())
static PyObject *_wrap_wxTreeEvent_GetKeyEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxKeyEvent * _result;
wxTreeEvent * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTreeEvent_GetKeyEvent",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeEvent_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeEvent_GetKeyEvent. Expected _wxTreeEvent_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
const wxKeyEvent & _result_ref = wxTreeEvent_GetKeyEvent(_arg0);
_result = (wxKeyEvent *) &_result_ref;
wxPy_END_ALLOW_THREADS;
if (PyErr_Occurred()) return NULL;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxKeyEvent_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
return _resultobj;
}
#define wxTreeEvent_GetCode(_swigobj) (_swigobj->GetCode())
static PyObject *_wrap_wxTreeEvent_GetCode(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -9473,6 +9509,7 @@ static PyMethodDef controls2cMethods[] = {
{ "new_wxTreeCtrl", (PyCFunction) _wrap_new_wxTreeCtrl, METH_VARARGS | METH_KEYWORDS },
{ "wxTreeEvent_GetLabel", (PyCFunction) _wrap_wxTreeEvent_GetLabel, METH_VARARGS | METH_KEYWORDS },
{ "wxTreeEvent_GetCode", (PyCFunction) _wrap_wxTreeEvent_GetCode, METH_VARARGS | METH_KEYWORDS },
{ "wxTreeEvent_GetKeyEvent", (PyCFunction) _wrap_wxTreeEvent_GetKeyEvent, METH_VARARGS | METH_KEYWORDS },
{ "wxTreeEvent_GetPoint", (PyCFunction) _wrap_wxTreeEvent_GetPoint, METH_VARARGS | METH_KEYWORDS },
{ "wxTreeEvent_GetOldItem", (PyCFunction) _wrap_wxTreeEvent_GetOldItem, METH_VARARGS | METH_KEYWORDS },
{ "wxTreeEvent_GetItem", (PyCFunction) _wrap_wxTreeEvent_GetItem, METH_VARARGS | METH_KEYWORDS },
wxPython/src/gtk/controls2.py
+4
View File
@@ -829,6 +829,10 @@ class wxTreeEventPtr(wxNotifyEventPtr):
val = apply(controls2c.wxTreeEvent_GetPoint,(self,) + _args, _kwargs)
if val: val = wxPointPtr(val) ; val.thisown = 1
return val
def GetKeyEvent(self, *_args, **_kwargs):
val = apply(controls2c.wxTreeEvent_GetKeyEvent,(self,) + _args, _kwargs)
if val: val = wxKeyEventPtr(val)
return val
def GetCode(self, *_args, **_kwargs):
val = apply(controls2c.wxTreeEvent_GetCode,(self,) + _args, _kwargs)
return val
wxPython/src/gtk/events.cpp
+42
View File
@@ -1098,6 +1098,45 @@ static PyObject *_wrap_wxCommandEvent_SetInt(PyObject *self, PyObject *args, PyO
return _resultobj;
}
static PyObject * wxCommandEvent_GetClientData(wxCommandEvent *self) {
wxPyClientData* data = (wxPyClientData*)self->GetClientObject();
if (data) {
Py_INCREF(data->m_obj);
return data->m_obj;
} else {
Py_INCREF(Py_None);
return Py_None;
}
}
static PyObject *_wrap_wxCommandEvent_GetClientData(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
PyObject * _result;
wxCommandEvent * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxCommandEvent_GetClientData",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCommandEvent_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCommandEvent_GetClientData. Expected _wxCommandEvent_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = (PyObject *)wxCommandEvent_GetClientData(_arg0);
wxPy_END_ALLOW_THREADS;
if (PyErr_Occurred()) return NULL;
}{
_resultobj = _result;
}
return _resultobj;
}
static void *SwigwxScrollEventTowxCommandEvent(void *ptr) {
wxScrollEvent *src;
wxCommandEvent *dest;
@@ -7119,6 +7158,7 @@ static PyMethodDef eventscMethods[] = {
{ "wxScrollEvent_GetPosition", (PyCFunction) _wrap_wxScrollEvent_GetPosition, METH_VARARGS | METH_KEYWORDS },
{ "wxScrollEvent_GetOrientation", (PyCFunction) _wrap_wxScrollEvent_GetOrientation, METH_VARARGS | METH_KEYWORDS },
{ "new_wxScrollEvent", (PyCFunction) _wrap_new_wxScrollEvent, METH_VARARGS | METH_KEYWORDS },
{ "wxCommandEvent_GetClientData", (PyCFunction) _wrap_wxCommandEvent_GetClientData, METH_VARARGS | METH_KEYWORDS },
{ "wxCommandEvent_SetInt", (PyCFunction) _wrap_wxCommandEvent_SetInt, METH_VARARGS | METH_KEYWORDS },
{ "wxCommandEvent_SetExtraLong", (PyCFunction) _wrap_wxCommandEvent_SetExtraLong, METH_VARARGS | METH_KEYWORDS },
{ "wxCommandEvent_SetString", (PyCFunction) _wrap_wxCommandEvent_SetString, METH_VARARGS | METH_KEYWORDS },
@@ -7404,6 +7444,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxCommandEvent","_class_wxScrollEvent",SwigwxScrollEventTowxCommandEvent},
{ "_wxCommandEvent","_wxScrollEvent",SwigwxScrollEventTowxCommandEvent},
{ "_char","_wxChar",0},
{ "_struct_wxNativeFontInfo","_wxNativeFontInfo",0},
{ "_wxScrollEvent","_class_wxSpinEvent",SwigwxSpinEventTowxScrollEvent},
{ "_wxScrollEvent","_wxSpinEvent",SwigwxSpinEventTowxScrollEvent},
{ "_EBool","_wxCoord",0},
@@ -7412,6 +7453,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_EBool","_int",0},
{ "_EBool","_wxWindowID",0},
{ "_unsigned_long","_long",0},
{ "_wxNativeFontInfo","_struct_wxNativeFontInfo",0},
{ "_signed_int","_wxCoord",0},
{ "_signed_int","_wxPrintQuality",0},
{ "_signed_int","_EBool",0},
wxPython/src/gtk/events.py
+3
View File
@@ -135,6 +135,9 @@ class wxCommandEventPtr(wxEventPtr):
def SetInt(self, *_args, **_kwargs):
val = apply(eventsc.wxCommandEvent_SetInt,(self,) + _args, _kwargs)
return val
def GetClientData(self, *_args, **_kwargs):
val = apply(eventsc.wxCommandEvent_GetClientData,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxCommandEvent instance at %s>" % (self.this,)
class wxCommandEvent(wxCommandEventPtr):
wxPython/src/gtk/frames.cpp
+1268 -571
View File
File diff suppressed because it is too large Load Diff
wxPython/src/gtk/frames.py
+126 -63
View File
@@ -15,62 +15,91 @@ from controls import *
from events import *
import wx
class wxFramePtr(wxWindowPtr):
class wxTopLevelWindowPtr(wxWindowPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def Create(self, *_args, **_kwargs):
val = apply(framesc.wxTopLevelWindow_Create,(self,) + _args, _kwargs)
return val
def Maximize(self, *_args, **_kwargs):
val = apply(framesc.wxTopLevelWindow_Maximize,(self,) + _args, _kwargs)
return val
def Restore(self, *_args, **_kwargs):
val = apply(framesc.wxTopLevelWindow_Restore,(self,) + _args, _kwargs)
return val
def Iconize(self, *_args, **_kwargs):
val = apply(framesc.wxTopLevelWindow_Iconize,(self,) + _args, _kwargs)
return val
def IsMaximized(self, *_args, **_kwargs):
val = apply(framesc.wxTopLevelWindow_IsMaximized,(self,) + _args, _kwargs)
return val
def IsIconized(self, *_args, **_kwargs):
val = apply(framesc.wxTopLevelWindow_IsIconized,(self,) + _args, _kwargs)
return val
def GetIcon(self, *_args, **_kwargs):
val = apply(framesc.wxTopLevelWindow_GetIcon,(self,) + _args, _kwargs)
if val: val = wxIconPtr(val)
return val
def SetIcon(self, *_args, **_kwargs):
val = apply(framesc.wxTopLevelWindow_SetIcon,(self,) + _args, _kwargs)
return val
def ShowFullScreen(self, *_args, **_kwargs):
val = apply(framesc.wxTopLevelWindow_ShowFullScreen,(self,) + _args, _kwargs)
return val
def IsFullScreen(self, *_args, **_kwargs):
val = apply(framesc.wxTopLevelWindow_IsFullScreen,(self,) + _args, _kwargs)
return val
def SetTitle(self, *_args, **_kwargs):
val = apply(framesc.wxTopLevelWindow_SetTitle,(self,) + _args, _kwargs)
return val
def GetTitle(self, *_args, **_kwargs):
val = apply(framesc.wxTopLevelWindow_GetTitle,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxTopLevelWindow instance at %s>" % (self.this,)
class wxTopLevelWindow(wxTopLevelWindowPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(framesc.new_wxTopLevelWindow,_args,_kwargs)
self.thisown = 1
def wxPreTopLevelWindow(*_args,**_kwargs):
val = wxTopLevelWindowPtr(apply(framesc.new_wxPreTopLevelWindow,_args,_kwargs))
val.thisown = 1
return val
class wxFramePtr(wxTopLevelWindowPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def Create(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_Create,(self,) + _args, _kwargs)
return val
def Centre(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_Centre,(self,) + _args, _kwargs)
def GetClientAreaOrigin(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_GetClientAreaOrigin,(self,) + _args, _kwargs)
if val: val = wxPointPtr(val) ; val.thisown = 1
return val
def CreateStatusBar(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_CreateStatusBar,(self,) + _args, _kwargs)
return val
def CreateToolBar(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_CreateToolBar,(self,) + _args, _kwargs)
return val
def GetIcon(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_GetIcon,(self,) + _args, _kwargs)
if val: val = wxIconPtr(val)
def SetMenuBar(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_SetMenuBar,(self,) + _args, _kwargs)
return val
def GetMenuBar(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_GetMenuBar,(self,) + _args, _kwargs)
return val
def Command(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_Command,(self,) + _args, _kwargs)
return val
def ProcessCommand(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_ProcessCommand,(self,) + _args, _kwargs)
return val
def CreateStatusBar(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_CreateStatusBar,(self,) + _args, _kwargs)
return val
def GetStatusBar(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_GetStatusBar,(self,) + _args, _kwargs)
return val
def GetTitle(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_GetTitle,(self,) + _args, _kwargs)
return val
def GetToolBar(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_GetToolBar,(self,) + _args, _kwargs)
return val
def Iconize(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_Iconize,(self,) + _args, _kwargs)
return val
def IsIconized(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_IsIconized,(self,) + _args, _kwargs)
return val
def Maximize(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_Maximize,(self,) + _args, _kwargs)
return val
def IsMaximized(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_IsMaximized,(self,) + _args, _kwargs)
return val
def Restore(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_Restore,(self,) + _args, _kwargs)
return val
def SetAcceleratorTable(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_SetAcceleratorTable,(self,) + _args, _kwargs)
return val
def SetIcon(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_SetIcon,(self,) + _args, _kwargs)
return val
def SetMenuBar(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_SetMenuBar,(self,) + _args, _kwargs)
return val
def SetStatusBar(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_SetStatusBar,(self,) + _args, _kwargs)
return val
@@ -80,31 +109,15 @@ class wxFramePtr(wxWindowPtr):
def SetStatusWidths(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_SetStatusWidths,(self,) + _args, _kwargs)
return val
def SetTitle(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_SetTitle,(self,) + _args, _kwargs)
def CreateToolBar(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_CreateToolBar,(self,) + _args, _kwargs)
return val
def GetToolBar(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_GetToolBar,(self,) + _args, _kwargs)
return val
def SetToolBar(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_SetToolBar,(self,) + _args, _kwargs)
return val
def MakeModal(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_MakeModal,(self,) + _args, _kwargs)
return val
def GetClientAreaOrigin(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_GetClientAreaOrigin,(self,) + _args, _kwargs)
if val: val = wxPointPtr(val) ; val.thisown = 1
return val
def Command(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_Command,(self,) + _args, _kwargs)
return val
def ProcessCommand(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_ProcessCommand,(self,) + _args, _kwargs)
return val
def ShowFullScreen(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_ShowFullScreen,(self,) + _args, _kwargs)
return val
def IsFullScreen(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_IsFullScreen,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxFrame instance at %s>" % (self.this,)
class wxFrame(wxFramePtr):
@@ -120,6 +133,55 @@ def wxPreFrame(*_args,**_kwargs):
return val
class wxDialogPtr(wxTopLevelWindowPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def Create(self, *_args, **_kwargs):
val = apply(framesc.wxDialog_Create,(self,) + _args, _kwargs)
return val
def Centre(self, *_args, **_kwargs):
val = apply(framesc.wxDialog_Centre,(self,) + _args, _kwargs)
return val
def EndModal(self, *_args, **_kwargs):
val = apply(framesc.wxDialog_EndModal,(self,) + _args, _kwargs)
return val
def SetModal(self, *_args, **_kwargs):
val = apply(framesc.wxDialog_SetModal,(self,) + _args, _kwargs)
return val
def IsModal(self, *_args, **_kwargs):
val = apply(framesc.wxDialog_IsModal,(self,) + _args, _kwargs)
return val
def ShowModal(self, *_args, **_kwargs):
val = apply(framesc.wxDialog_ShowModal,(self,) + _args, _kwargs)
return val
def GetReturnCode(self, *_args, **_kwargs):
val = apply(framesc.wxDialog_GetReturnCode,(self,) + _args, _kwargs)
return val
def SetReturnCode(self, *_args, **_kwargs):
val = apply(framesc.wxDialog_SetReturnCode,(self,) + _args, _kwargs)
return val
def CreateTextSizer(self, *_args, **_kwargs):
val = apply(framesc.wxDialog_CreateTextSizer,(self,) + _args, _kwargs)
return val
def CreateButtonSizer(self, *_args, **_kwargs):
val = apply(framesc.wxDialog_CreateButtonSizer,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxDialog instance at %s>" % (self.this,)
class wxDialog(wxDialogPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(framesc.new_wxDialog,_args,_kwargs)
self.thisown = 1
def wxPreDialog(*_args,**_kwargs):
val = wxDialogPtr(apply(framesc.new_wxPreDialog,_args,_kwargs))
val.thisown = 1
return val
class wxMiniFramePtr(wxFramePtr):
def __init__(self,this):
self.this = this
@@ -170,3 +232,4 @@ wxFULLSCREEN_NOSTATUSBAR = framesc.wxFULLSCREEN_NOSTATUSBAR
wxFULLSCREEN_NOBORDER = framesc.wxFULLSCREEN_NOBORDER
wxFULLSCREEN_NOCAPTION = framesc.wxFULLSCREEN_NOCAPTION
wxFULLSCREEN_ALL = framesc.wxFULLSCREEN_ALL
wxTOPLEVEL_EX_DIALOG = framesc.wxTOPLEVEL_EX_DIALOG
wxPython/src/gtk/gdi.cpp
+225 -40
View File
@@ -186,6 +186,27 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
wxColour* wxNamedColour(const wxString& colorName) {
return new wxColour(colorName);
}
class wxPyPen : public wxPen {
public:
wxPyPen(wxColour& colour, int width=1, int style=wxSOLID)
: wxPen(colour, width, style)
{ m_dash = NULL; }
~wxPyPen() {
if (m_dash)
delete m_dash;
}
void SetDashes(int nb_dashes, const wxDash *dash) {
m_dash = new wxDash[nb_dashes];
for (int i=0; i<nb_dashes; i++)
m_dash[i] = dash[i];
wxPen::SetDashes(nb_dashes, m_dash);
}
private:
wxDash* m_dash;
};
// Alternate 'constructor'
wxMemoryDC* wxMemoryDCFromDC(wxDC* oldDC) {
return new wxMemoryDC(oldDC);
@@ -236,7 +257,7 @@ extern wxFont wxNullFont;
extern wxColour wxNullColour;
extern wxFontList * wxTheFontList;
extern wxPenList * wxThePenList;
extern wxBrushlist * wxTheBrushList;
extern wxBrushList * wxTheBrushList;
extern wxColourDatabase * wxTheColourDatabase;
#endif
@@ -1240,7 +1261,7 @@ static PyObject *_wrap_wxTheBrushList_get() {
PyObject * pyobj;
char ptemp[128];
SWIG_MakePtr(ptemp, (char *) wxTheBrushList,"_wxBrushlist_p");
SWIG_MakePtr(ptemp, (char *) wxTheBrushList,"_wxBrushList_p");
pyobj = PyString_FromString(ptemp);
return pyobj;
}
@@ -1963,6 +1984,43 @@ static PyObject *_wrap_wxBitmap_GetSubBitmap(PyObject *self, PyObject *args, PyO
return _resultobj;
}
#define wxBitmap_CopyFromIcon(_swigobj,_swigarg0) (_swigobj->CopyFromIcon(_swigarg0))
static PyObject *_wrap_wxBitmap_CopyFromIcon(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
bool _result;
wxBitmap * _arg0;
wxIcon * _arg1;
PyObject * _argo0 = 0;
PyObject * _argo1 = 0;
char *_kwnames[] = { "self","icon", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxBitmap_CopyFromIcon",_kwnames,&_argo0,&_argo1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_CopyFromIcon. Expected _wxBitmap_p.");
return NULL;
}
}
if (_argo1) {
if (_argo1 == Py_None) { _arg1 = NULL; }
else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxIcon_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxBitmap_CopyFromIcon. Expected _wxIcon_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = (bool )wxBitmap_CopyFromIcon(_arg0,*_arg1);
wxPy_END_ALLOW_THREADS;
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
static void *SwigwxMaskTowxObject(void *ptr) {
wxMask *src;
wxObject *dest;
@@ -4793,43 +4851,6 @@ static PyObject *_wrap_wxPen_SetWidth(PyObject *self, PyObject *args, PyObject *
return _resultobj;
}
#define wxPen_GetDashes(_swigobj,_swigarg0) (_swigobj->GetDashes(_swigarg0))
static PyObject *_wrap_wxPen_GetDashes(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
int _result;
wxPen * _arg0;
wxDash ** _arg1;
PyObject * _argo0 = 0;
PyObject * _argo1 = 0;
char *_kwnames[] = { "self","dashes", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPen_GetDashes",_kwnames,&_argo0,&_argo1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPen_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_GetDashes. Expected _wxPen_p.");
return NULL;
}
}
if (_argo1) {
if (_argo1 == Py_None) { _arg1 = NULL; }
else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxDash_pp")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPen_GetDashes. Expected _wxDash_pp.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = (int )wxPen_GetDashes(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
#define wxPen_SetDashes(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetDashes(_swigarg0,_swigarg1))
static PyObject *_wrap_wxPen_SetDashes(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -4879,6 +4900,143 @@ static PyObject *_wrap_wxPen_SetDashes(PyObject *self, PyObject *args, PyObject
return _resultobj;
}
static void *SwigwxPyPenTowxPen(void *ptr) {
wxPyPen *src;
wxPen *dest;
src = (wxPyPen *) ptr;
dest = (wxPen *) src;
return (void *) dest;
}
static void *SwigwxPyPenTowxGDIObject(void *ptr) {
wxPyPen *src;
wxGDIObject *dest;
src = (wxPyPen *) ptr;
dest = (wxGDIObject *) src;
return (void *) dest;
}
static void *SwigwxPyPenTowxObject(void *ptr) {
wxPyPen *src;
wxObject *dest;
src = (wxPyPen *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxPyPen(_swigarg0,_swigarg1,_swigarg2) (new wxPyPen(_swigarg0,_swigarg1,_swigarg2))
static PyObject *_wrap_new_wxPyPen(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxPyPen * _result;
wxColour * _arg0;
int _arg1 = (int ) 1;
int _arg2 = (int ) wxSOLID;
wxColour temp;
PyObject * _obj0 = 0;
char *_kwnames[] = { "colour","width","style", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|ii:new_wxPyPen",_kwnames,&_obj0,&_arg1,&_arg2))
return NULL;
{
_arg0 = &temp;
if (! wxColour_helper(_obj0, &_arg0))
return NULL;
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = (wxPyPen *)new_wxPyPen(*_arg0,_arg1,_arg2);
wxPy_END_ALLOW_THREADS;
if (PyErr_Occurred()) return NULL;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyPen_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
return _resultobj;
}
#define delete_wxPyPen(_swigobj) (delete _swigobj)
static PyObject *_wrap_delete_wxPyPen(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxPyPen * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxPyPen",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPen_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxPyPen. Expected _wxPyPen_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
delete_wxPyPen(_arg0);
wxPy_END_ALLOW_THREADS;
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
#define wxPyPen_SetDashes(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetDashes(_swigarg0,_swigarg1))
static PyObject *_wrap_wxPyPen_SetDashes(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxPyPen * _arg0;
int _arg1;
wxDash * _arg2;
PyObject * _argo0 = 0;
PyObject * _obj2 = 0;
char *_kwnames[] = { "self","choices", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyPen_SetDashes",_kwnames,&_argo0,&_obj2))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPen_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyPen_SetDashes. Expected _wxPyPen_p.");
return NULL;
}
}
if (_obj2)
{
_arg2 = (wxDash*)byte_LIST_helper(_obj2);
if (_arg2 == NULL) {
return NULL;
}
}
{
if (_obj2) {
_arg1 = PyList_Size(_obj2);
}
else {
_arg1 = 0;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxPyPen_SetDashes(_arg0,_arg1,_arg2);
wxPy_END_ALLOW_THREADS;
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
{
delete [] _arg2;
}
return _resultobj;
}
static void *SwigwxPenListTowxObject(void *ptr) {
wxPenList *src;
wxObject *dest;
@@ -5308,6 +5466,14 @@ static PyObject *_wrap_wxBrush_SetStyle(PyObject *self, PyObject *args, PyObject
return _resultobj;
}
static void *SwigwxBrushListTowxObject(void *ptr) {
wxBrushList *src;
wxObject *dest;
src = (wxBrushList *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define wxBrushList_AddBrush(_swigobj,_swigarg0) (_swigobj->AddBrush(_swigarg0))
static PyObject *_wrap_wxBrushList_AddBrush(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -10800,8 +10966,10 @@ static PyMethodDef gdicMethods[] = {
{ "wxPenList_RemovePen", (PyCFunction) _wrap_wxPenList_RemovePen, METH_VARARGS | METH_KEYWORDS },
{ "wxPenList_FindOrCreatePen", (PyCFunction) _wrap_wxPenList_FindOrCreatePen, METH_VARARGS | METH_KEYWORDS },
{ "wxPenList_AddPen", (PyCFunction) _wrap_wxPenList_AddPen, METH_VARARGS | METH_KEYWORDS },
{ "wxPyPen_SetDashes", (PyCFunction) _wrap_wxPyPen_SetDashes, METH_VARARGS | METH_KEYWORDS },
{ "delete_wxPyPen", (PyCFunction) _wrap_delete_wxPyPen, METH_VARARGS | METH_KEYWORDS },
{ "new_wxPyPen", (PyCFunction) _wrap_new_wxPyPen, METH_VARARGS | METH_KEYWORDS },
{ "wxPen_SetDashes", (PyCFunction) _wrap_wxPen_SetDashes, METH_VARARGS | METH_KEYWORDS },
{ "wxPen_GetDashes", (PyCFunction) _wrap_wxPen_GetDashes, METH_VARARGS | METH_KEYWORDS },
{ "wxPen_SetWidth", (PyCFunction) _wrap_wxPen_SetWidth, METH_VARARGS | METH_KEYWORDS },
{ "wxPen_SetStyle", (PyCFunction) _wrap_wxPen_SetStyle, METH_VARARGS | METH_KEYWORDS },
{ "wxPen_SetJoin", (PyCFunction) _wrap_wxPen_SetJoin, METH_VARARGS | METH_KEYWORDS },
@@ -10884,6 +11052,7 @@ static PyMethodDef gdicMethods[] = {
{ "new_wxIcon", (PyCFunction) _wrap_new_wxIcon, METH_VARARGS | METH_KEYWORDS },
{ "wxMask_Destroy", (PyCFunction) _wrap_wxMask_Destroy, METH_VARARGS | METH_KEYWORDS },
{ "new_wxMask", (PyCFunction) _wrap_new_wxMask, METH_VARARGS | METH_KEYWORDS },
{ "wxBitmap_CopyFromIcon", (PyCFunction) _wrap_wxBitmap_CopyFromIcon, METH_VARARGS | METH_KEYWORDS },
{ "wxBitmap_GetSubBitmap", (PyCFunction) _wrap_wxBitmap_GetSubBitmap, METH_VARARGS | METH_KEYWORDS },
{ "wxBitmap_SetDepth", (PyCFunction) _wrap_wxBitmap_SetDepth, METH_VARARGS | METH_KEYWORDS },
{ "wxBitmap_SetHeight", (PyCFunction) _wrap_wxBitmap_SetHeight, METH_VARARGS | METH_KEYWORDS },
@@ -10933,6 +11102,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxPrintQuality","_EBool",0},
{ "_wxPrintQuality","_size_t",0},
{ "_wxPrintQuality","_time_t",0},
{ "_wxPen","_class_wxPyPen",SwigwxPyPenTowxPen},
{ "_wxPen","_wxPyPen",SwigwxPyPenTowxPen},
{ "_byte","_unsigned_char",0},
{ "_long","_unsigned_long",0},
{ "_long","_signed_long",0},
@@ -10942,6 +11113,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxGDIObject","_wxPalette",SwigwxPaletteTowxGDIObject},
{ "_wxGDIObject","_class_wxBrush",SwigwxBrushTowxGDIObject},
{ "_wxGDIObject","_wxBrush",SwigwxBrushTowxGDIObject},
{ "_wxGDIObject","_class_wxPyPen",SwigwxPyPenTowxGDIObject},
{ "_wxGDIObject","_wxPyPen",SwigwxPyPenTowxGDIObject},
{ "_wxGDIObject","_class_wxPen",SwigwxPenTowxGDIObject},
{ "_wxGDIObject","_wxPen",SwigwxPenTowxGDIObject},
{ "_wxGDIObject","_class_wxFont",SwigwxFontTowxGDIObject},
@@ -10986,10 +11159,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxObject","_wxMemoryDC",SwigwxMemoryDCTowxObject},
{ "_class_wxObject","_class_wxDC",SwigwxDCTowxObject},
{ "_class_wxObject","_wxDC",SwigwxDCTowxObject},
{ "_class_wxObject","_class_wxBrushList",SwigwxBrushListTowxObject},
{ "_class_wxObject","_wxBrushList",SwigwxBrushListTowxObject},
{ "_class_wxObject","_class_wxBrush",SwigwxBrushTowxObject},
{ "_class_wxObject","_wxBrush",SwigwxBrushTowxObject},
{ "_class_wxObject","_class_wxPenList",SwigwxPenListTowxObject},
{ "_class_wxObject","_wxPenList",SwigwxPenListTowxObject},
{ "_class_wxObject","_class_wxPyPen",SwigwxPyPenTowxObject},
{ "_class_wxObject","_wxPyPen",SwigwxPyPenTowxObject},
{ "_class_wxObject","_class_wxPen",SwigwxPenTowxObject},
{ "_class_wxObject","_wxPen",SwigwxPenTowxObject},
{ "_class_wxObject","_class_wxColourDatabase",SwigwxColourDatabaseTowxObject},
@@ -11078,10 +11255,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxObject","_wxMemoryDC",SwigwxMemoryDCTowxObject},
{ "_wxObject","_class_wxDC",SwigwxDCTowxObject},
{ "_wxObject","_wxDC",SwigwxDCTowxObject},
{ "_wxObject","_class_wxBrushList",SwigwxBrushListTowxObject},
{ "_wxObject","_wxBrushList",SwigwxBrushListTowxObject},
{ "_wxObject","_class_wxBrush",SwigwxBrushTowxObject},
{ "_wxObject","_wxBrush",SwigwxBrushTowxObject},
{ "_wxObject","_class_wxPenList",SwigwxPenListTowxObject},
{ "_wxObject","_wxPenList",SwigwxPenListTowxObject},
{ "_wxObject","_class_wxPyPen",SwigwxPyPenTowxObject},
{ "_wxObject","_wxPyPen",SwigwxPyPenTowxObject},
{ "_wxObject","_class_wxPen",SwigwxPenTowxObject},
{ "_wxObject","_wxPen",SwigwxPenTowxObject},
{ "_wxObject","_class_wxColourDatabase",SwigwxColourDatabaseTowxObject},
@@ -11112,6 +11293,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_unsigned_int","_uint",0},
{ "_unsigned_int","_wxWindowID",0},
{ "_unsigned_int","_int",0},
{ "_class_wxPen","_class_wxPyPen",SwigwxPyPenTowxPen},
{ "_class_wxPen","_wxPyPen",SwigwxPyPenTowxPen},
{ "_short","_WXTYPE",0},
{ "_short","_unsigned_short",0},
{ "_short","_signed_short",0},
@@ -11130,6 +11313,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxGDIObject","_wxPalette",SwigwxPaletteTowxGDIObject},
{ "_class_wxGDIObject","_class_wxBrush",SwigwxBrushTowxGDIObject},
{ "_class_wxGDIObject","_wxBrush",SwigwxBrushTowxGDIObject},
{ "_class_wxGDIObject","_class_wxPyPen",SwigwxPyPenTowxGDIObject},
{ "_class_wxGDIObject","_wxPyPen",SwigwxPyPenTowxGDIObject},
{ "_class_wxGDIObject","_class_wxPen",SwigwxPenTowxGDIObject},
{ "_class_wxGDIObject","_wxPen",SwigwxPenTowxGDIObject},
{ "_class_wxGDIObject","_class_wxFont",SwigwxFontTowxGDIObject},
wxPython/src/gtk/gdi.py
+25 -4
View File
@@ -77,6 +77,9 @@ class wxBitmapPtr(wxGDIObjectPtr):
val = apply(gdic.wxBitmap_GetSubBitmap,(self,) + _args, _kwargs)
if val: val = wxBitmapPtr(val) ; val.thisown = 1
return val
def CopyFromIcon(self, *_args, **_kwargs):
val = apply(gdic.wxBitmap_CopyFromIcon,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxBitmap instance at %s>" % (self.this,)
@@ -451,9 +454,6 @@ class wxPenPtr(wxGDIObjectPtr):
def SetWidth(self, *_args, **_kwargs):
val = apply(gdic.wxPen_SetWidth,(self,) + _args, _kwargs)
return val
def GetDashes(self, *_args, **_kwargs):
val = apply(gdic.wxPen_GetDashes,(self,) + _args, _kwargs)
return val
def SetDashes(self, *_args, **_kwargs):
val = apply(gdic.wxPen_SetDashes,(self,) + _args, _kwargs)
return val
@@ -467,6 +467,26 @@ class wxPen(wxPenPtr):
class wxPyPenPtr(wxPenPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self,gdic=gdic):
if self.thisown == 1 :
gdic.delete_wxPyPen(self)
def SetDashes(self, *_args, **_kwargs):
val = apply(gdic.wxPyPen_SetDashes,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxPyPen instance at %s>" % (self.this,)
class wxPyPen(wxPyPenPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(gdic.new_wxPyPen,_args,_kwargs)
self.thisown = 1
class wxPenListPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
@@ -530,7 +550,7 @@ class wxBrush(wxBrushPtr):
class wxBrushListPtr :
class wxBrushListPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -1292,6 +1312,7 @@ wxNullFont = wxFontPtr(gdic.cvar.wxNullFont)
wxNullColour = wxColourPtr(gdic.cvar.wxNullColour)
wxTheFontList = wxFontListPtr(gdic.cvar.wxTheFontList)
wxThePenList = wxPenListPtr(gdic.cvar.wxThePenList)
wxTheBrushList = wxBrushListPtr(gdic.cvar.wxTheBrushList)
wxTheColourDatabase = wxColourDatabasePtr(gdic.cvar.wxTheColourDatabase)
wxIMAGELIST_DRAW_NORMAL = gdic.wxIMAGELIST_DRAW_NORMAL
wxIMAGELIST_DRAW_TRANSPARENT = gdic.wxIMAGELIST_DRAW_TRANSPARENT
wxPython/src/gtk/utils.cpp
+38 -35
View File
@@ -3552,40 +3552,6 @@ static PyObject *_wrap_wxDateTime_SetToWeekDay(PyObject *self, PyObject *args, P
return _resultobj;
}
#define wxDateTime_GetWeekDay(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->GetWeekDay(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
static PyObject *_wrap_wxDateTime_GetWeekDay(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxDateTime * _result;
wxDateTime * _arg0;
wxDateTime::WeekDay _arg1;
int _arg2 = (int ) 1;
wxDateTime::Month _arg3 = (wxDateTime::Month ) wxDateTime::Inv_Month;
int _arg4 = (int ) wxDateTime::Inv_Year;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","weekday","n","month","year", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|iii:wxDateTime_GetWeekDay",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDateTime_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDateTime_GetWeekDay. Expected _wxDateTime_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = new wxDateTime (wxDateTime_GetWeekDay(_arg0,_arg1,_arg2,_arg3,_arg4));
wxPy_END_ALLOW_THREADS;
if (PyErr_Occurred()) return NULL;
} SWIG_MakePtr(_ptemp, (void *) _result,"_wxDateTime_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
}
#define wxDateTime_SetToLastWeekDay(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->SetToLastWeekDay(_swigarg0,_swigarg1,_swigarg2))
static PyObject *_wrap_wxDateTime_SetToLastWeekDay(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -4346,6 +4312,43 @@ static PyObject *_wrap_wxDateTime_GetDay(PyObject *self, PyObject *args, PyObjec
return _resultobj;
}
#define wxDateTime_GetWeekDay(_swigobj,_swigarg0) (_swigobj->GetWeekDay(_swigarg0))
static PyObject *_wrap_wxDateTime_GetWeekDay(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxDateTime::WeekDay _result;
wxDateTime * _arg0;
wxDateTime::TimeZone * _arg1 = (wxDateTime::TimeZone *) &LOCAL;
PyObject * _argo0 = 0;
PyObject * _obj1 = 0;
char *_kwnames[] = { "self","tz", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|O:wxDateTime_GetWeekDay",_kwnames,&_argo0,&_obj1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDateTime_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDateTime_GetWeekDay. Expected _wxDateTime_p.");
return NULL;
}
}
if (_obj1)
{
_arg1 = new wxDateTime::TimeZone((wxDateTime::TZ)PyInt_AsLong(_obj1));
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = (wxDateTime::WeekDay )wxDateTime_GetWeekDay(_arg0,*_arg1);
wxPy_END_ALLOW_THREADS;
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
{
if (_arg1) delete _arg1;
}
return _resultobj;
}
#define wxDateTime_GetHour(_swigobj,_swigarg0) (_swigobj->GetHour(_swigarg0))
static PyObject *_wrap_wxDateTime_GetHour(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -7775,6 +7778,7 @@ static PyMethodDef utilscMethods[] = {
{ "wxDateTime_GetSecond", (PyCFunction) _wrap_wxDateTime_GetSecond, METH_VARARGS | METH_KEYWORDS },
{ "wxDateTime_GetMinute", (PyCFunction) _wrap_wxDateTime_GetMinute, METH_VARARGS | METH_KEYWORDS },
{ "wxDateTime_GetHour", (PyCFunction) _wrap_wxDateTime_GetHour, METH_VARARGS | METH_KEYWORDS },
{ "wxDateTime_GetWeekDay", (PyCFunction) _wrap_wxDateTime_GetWeekDay, METH_VARARGS | METH_KEYWORDS },
{ "wxDateTime_GetDay", (PyCFunction) _wrap_wxDateTime_GetDay, METH_VARARGS | METH_KEYWORDS },
{ "wxDateTime_GetMonth", (PyCFunction) _wrap_wxDateTime_GetMonth, METH_VARARGS | METH_KEYWORDS },
{ "wxDateTime_GetYear", (PyCFunction) _wrap_wxDateTime_GetYear, METH_VARARGS | METH_KEYWORDS },
@@ -7798,7 +7802,6 @@ static PyMethodDef utilscMethods[] = {
{ "wxDateTime_SetToTheWeek", (PyCFunction) _wrap_wxDateTime_SetToTheWeek, METH_VARARGS | METH_KEYWORDS },
{ "wxDateTime_GetLastWeekDay", (PyCFunction) _wrap_wxDateTime_GetLastWeekDay, METH_VARARGS | METH_KEYWORDS },
{ "wxDateTime_SetToLastWeekDay", (PyCFunction) _wrap_wxDateTime_SetToLastWeekDay, METH_VARARGS | METH_KEYWORDS },
{ "wxDateTime_GetWeekDay", (PyCFunction) _wrap_wxDateTime_GetWeekDay, METH_VARARGS | METH_KEYWORDS },
{ "wxDateTime_SetToWeekDay", (PyCFunction) _wrap_wxDateTime_SetToWeekDay, METH_VARARGS | METH_KEYWORDS },
{ "wxDateTime_GetPrevWeekDay", (PyCFunction) _wrap_wxDateTime_GetPrevWeekDay, METH_VARARGS | METH_KEYWORDS },
{ "wxDateTime_SetToPrevWeekDay", (PyCFunction) _wrap_wxDateTime_SetToPrevWeekDay, METH_VARARGS | METH_KEYWORDS },
wxPython/src/gtk/utils.py
+3 -4
View File
@@ -338,10 +338,6 @@ class wxDateTimePtr :
def SetToWeekDay(self, *_args, **_kwargs):
val = apply(utilsc.wxDateTime_SetToWeekDay,(self,) + _args, _kwargs)
return val
def GetWeekDay(self, *_args, **_kwargs):
val = apply(utilsc.wxDateTime_GetWeekDay,(self,) + _args, _kwargs)
if val: val = wxDateTimePtr(val) ; val.thisown = 1
return val
def SetToLastWeekDay(self, *_args, **_kwargs):
val = apply(utilsc.wxDateTime_SetToLastWeekDay,(self,) + _args, _kwargs)
return val
@@ -421,6 +417,9 @@ class wxDateTimePtr :
def GetDay(self, *_args, **_kwargs):
val = apply(utilsc.wxDateTime_GetDay,(self,) + _args, _kwargs)
return val
def GetWeekDay(self, *_args, **_kwargs):
val = apply(utilsc.wxDateTime_GetWeekDay,(self,) + _args, _kwargs)
return val
def GetHour(self, *_args, **_kwargs):
val = apply(utilsc.wxDateTime_GetHour,(self,) + _args, _kwargs)
return val
wxPython/src/gtk/windows.cpp
+39 -714
View File
File diff suppressed because it is too large Load Diff
wxPython/src/gtk/windows.py
+4 -64
View File
@@ -544,6 +544,10 @@ class wxWindowPtr(wxEvtHandlerPtr):
def PageDown(self, *_args, **_kwargs):
val = apply(windowsc.wxWindow_PageDown,(self,) + _args, _kwargs)
return val
def GetAcceleratorTable(self, *_args, **_kwargs):
val = apply(windowsc.wxWindow_GetAcceleratorTable,(self,) + _args, _kwargs)
if val: val = wxAcceleratorTablePtr(val)
return val
def __repr__(self):
return "<C wxWindow instance at %s>" % (self.this,)
# replaces broken shadow method
@@ -597,70 +601,6 @@ def wxPrePanel(*_args,**_kwargs):
return val
class wxDialogPtr(wxPanelPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def Create(self, *_args, **_kwargs):
val = apply(windowsc.wxDialog_Create,(self,) + _args, _kwargs)
return val
def Centre(self, *_args, **_kwargs):
val = apply(windowsc.wxDialog_Centre,(self,) + _args, _kwargs)
return val
def EndModal(self, *_args, **_kwargs):
val = apply(windowsc.wxDialog_EndModal,(self,) + _args, _kwargs)
return val
def GetTitle(self, *_args, **_kwargs):
val = apply(windowsc.wxDialog_GetTitle,(self,) + _args, _kwargs)
return val
def Iconize(self, *_args, **_kwargs):
val = apply(windowsc.wxDialog_Iconize,(self,) + _args, _kwargs)
return val
def IsIconized(self, *_args, **_kwargs):
val = apply(windowsc.wxDialog_IsIconized,(self,) + _args, _kwargs)
return val
def SetModal(self, *_args, **_kwargs):
val = apply(windowsc.wxDialog_SetModal,(self,) + _args, _kwargs)
return val
def IsModal(self, *_args, **_kwargs):
val = apply(windowsc.wxDialog_IsModal,(self,) + _args, _kwargs)
return val
def SetTitle(self, *_args, **_kwargs):
val = apply(windowsc.wxDialog_SetTitle,(self,) + _args, _kwargs)
return val
def Show(self, *_args, **_kwargs):
val = apply(windowsc.wxDialog_Show,(self,) + _args, _kwargs)
return val
def ShowModal(self, *_args, **_kwargs):
val = apply(windowsc.wxDialog_ShowModal,(self,) + _args, _kwargs)
return val
def GetReturnCode(self, *_args, **_kwargs):
val = apply(windowsc.wxDialog_GetReturnCode,(self,) + _args, _kwargs)
return val
def SetReturnCode(self, *_args, **_kwargs):
val = apply(windowsc.wxDialog_SetReturnCode,(self,) + _args, _kwargs)
return val
def CreateTextSizer(self, *_args, **_kwargs):
val = apply(windowsc.wxDialog_CreateTextSizer,(self,) + _args, _kwargs)
return val
def CreateButtonSizer(self, *_args, **_kwargs):
val = apply(windowsc.wxDialog_CreateButtonSizer,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxDialog instance at %s>" % (self.this,)
class wxDialog(wxDialogPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(windowsc.new_wxDialog,_args,_kwargs)
self.thisown = 1
def wxPreDialog(*_args,**_kwargs):
val = wxDialogPtr(apply(windowsc.new_wxPreDialog,_args,_kwargs))
val.thisown = 1
return val
class wxScrolledWindowPtr(wxPanelPtr):
def __init__(self,this):
self.this = this