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

Updates for new wxToolBar API

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14812 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2002-03-27 01:10:28 +00:00
parent be86ffe39e
commit c12de7f83a
8 changed files with 45 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wxPython/src/__version__.py
View File

@@ -1 +1 @@
ver = '2.3.3pre2u'
ver = '2.3.3pre2'

16
wxPython/src/msw/stattool.cpp
View File

@@ -1748,8 +1748,8 @@ static PyObject *_wrap_wxToolBarBase_AddCheckTool(PyObject *self, PyObject *args
wxString * _arg2;
wxBitmap * _arg3;
wxBitmap * _arg4 = (wxBitmap *) &wxNullBitmap;
wxString * _arg5 = (wxString *) &wxEmptyString;
wxString * _arg6 = (wxString *) &wxEmptyString;
wxString * _arg5 = (wxString *) &wxPyEmptyString;
wxString * _arg6 = (wxString *) &wxPyEmptyString;
PyObject * _arg7 = (PyObject *) NULL;
PyObject * _argo0 = 0;
PyObject * _obj2 = 0;
@@ -1842,8 +1842,8 @@ static PyObject *_wrap_wxToolBarBase_AddRadioTool(PyObject *self, PyObject *args
wxString * _arg2;
wxBitmap * _arg3;
wxBitmap * _arg4 = (wxBitmap *) &wxNullBitmap;
wxString * _arg5 = (wxString *) &wxEmptyString;
wxString * _arg6 = (wxString *) &wxEmptyString;
wxString * _arg5 = (wxString *) &wxPyEmptyString;
wxString * _arg6 = (wxString *) &wxPyEmptyString;
PyObject * _arg7 = (PyObject *) NULL;
PyObject * _argo0 = 0;
PyObject * _obj2 = 0;
@@ -1938,8 +1938,8 @@ static PyObject *_wrap_wxToolBarBase_InsertTool(PyObject *self, PyObject *args,
wxBitmap * _arg4;
wxBitmap * _arg5 = (wxBitmap *) &wxNullBitmap;
wxItemKind _arg6 = (wxItemKind ) wxITEM_NORMAL;
wxString * _arg7 = (wxString *) &wxEmptyString;
wxString * _arg8 = (wxString *) &wxEmptyString;
wxString * _arg7 = (wxString *) &wxPyEmptyString;
wxString * _arg8 = (wxString *) &wxPyEmptyString;
PyObject * _arg9 = (PyObject *) NULL;
PyObject * _argo0 = 0;
PyObject * _obj3 = 0;
@@ -2030,8 +2030,8 @@ static PyObject *_wrap_wxToolBarBase_InsertSimpleTool(PyObject *self, PyObject *
wxString * _arg3;
wxBitmap * _arg4;
wxItemKind _arg5 = (wxItemKind ) wxITEM_NORMAL;
wxString * _arg6 = (wxString *) &wxEmptyString;
wxString * _arg7 = (wxString *) &wxEmptyString;
wxString * _arg6 = (wxString *) &wxPyEmptyString;
wxString * _arg7 = (wxString *) &wxPyEmptyString;
PyObject * _argo0 = 0;
PyObject * _obj3 = 0;
PyObject * _argo4 = 0;

16
wxPython/src/stattool.i
View File

@@ -206,8 +206,8 @@ public:
const wxString& label,
const wxBitmap& bitmap,
const wxBitmap& bmpDisabled = wxNullBitmap,
const wxString& shortHelp = wxEmptyString,
const wxString& longHelp = wxEmptyString,
const wxString& shortHelp = wxPyEmptyString,
const wxString& longHelp = wxPyEmptyString,
PyObject *clientData = NULL)
{
wxPyUserData* udata = NULL;
@@ -223,8 +223,8 @@ public:
const wxString& label,
const wxBitmap& bitmap,
const wxBitmap& bmpDisabled = wxNullBitmap,
const wxString& shortHelp = wxEmptyString,
const wxString& longHelp = wxEmptyString,
const wxString& shortHelp = wxPyEmptyString,
const wxString& longHelp = wxPyEmptyString,
PyObject *clientData = NULL)
{
wxPyUserData* udata = NULL;
@@ -242,8 +242,8 @@ public:
const wxBitmap& bitmap,
const wxBitmap& bmpDisabled = wxNullBitmap,
wxItemKind kind = wxITEM_NORMAL,
const wxString& shortHelp = wxEmptyString,
const wxString& longHelp = wxEmptyString,
const wxString& shortHelp = wxPyEmptyString,
const wxString& longHelp = wxPyEmptyString,
PyObject *clientData = NULL)
{
wxPyUserData* udata = NULL;
@@ -259,8 +259,8 @@ public:
const wxString& label,
const wxBitmap& bitmap,
wxItemKind kind = wxITEM_NORMAL,
const wxString& shortHelp = wxEmptyString,
const wxString& longHelp = wxEmptyString)
const wxString& shortHelp = wxPyEmptyString,
const wxString& longHelp = wxPyEmptyString)
{
return self->InsertTool(pos, id, label, bitmap, wxNullBitmap, kind,
shortHelp, longHelp);