Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9054/wxLua/bindings/wxwidgets
Modified Files:
menutool.i
Log Message:
Fix wxToolBar::Add/InsertTool, dunno what old version was from, but before 2.4 at least
Index: menutool.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/menutool.i,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** menutool.i 18 Jun 2005 20:45:59 -0000 1.2
--- menutool.i 19 Jun 2005 05:47:45 -0000 1.3
***************
*** 86,90 ****
%class wxMenuItem, wxObject
%include "wx/menuitem.h"
! wxMenuItem(wxMenu *parentMenu = NULL, int id = wxID_SEPARATOR, const wxString& text = wxEmptyString, const wxString& help = wxEmptyString, bool isCheckable = FALSE, wxMenu *subMenu = NULL)
void Check(bool check)
void Enable(bool enable)
--- 86,90 ----
%class wxMenuItem, wxObject
%include "wx/menuitem.h"
! wxMenuItem(wxMenu *parentMenu = NULL, int id = wxID_SEPARATOR, const wxString& text = "", const wxString& help = "", bool isCheckable = FALSE, wxMenu *subMenu = NULL)
void Check(bool check)
void Enable(bool enable)
***************
*** 177,182 ****
wxToolBarToolBase *AddControl(wxControl *control)
wxToolBarToolBase *AddSeparator()
! wxToolBarToolBase *AddTool(int id, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap, bool isToggle = FALSE, wxObject *clientData = NULL, const wxString& longHelpString = "")
! wxToolBarToolBase *InsertTool(size_t pos, int id, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap, bool isToggle = FALSE, wxObject *clientData = NULL, const wxString& shortHelpString = "", const wxString& longHelpString = "")
wxToolBarToolBase *InsertControl(size_t pos, wxControl *control)
wxToolBarToolBase *InsertSeparator(size_t pos)
--- 177,187 ----
wxToolBarToolBase *AddControl(wxControl *control)
wxToolBarToolBase *AddSeparator()
! !%wxchkver24 wxToolBarToolBase *AddTool(int id, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap, bool isToggle = FALSE, wxObject *clientData = NULL, const wxString& longHelpString = "")
! %wxchkver24 %rename AddToolSimple wxToolBarToolBase *AddTool(int toolid, const wxString& label, const wxBitmap& bitmap, const wxString& shortHelp = "", wxItemKind kind = wxITEM_NORMAL)
! %wxchkver24 wxToolBarToolBase *AddTool(int toolid, const wxString& label, const wxBitmap& bitmap, const wxBitmap& bmpDisabled, wxItemKind kind = wxITEM_NORMAL, const wxString& shortHelp = "", const wxString& longHelp = "", wxObject *data = NULL)
! %wxchkver24 wxToolBarToolBase *AddCheckTool(int toolid, const wxString& label, const wxBitmap& bitmap, const wxBitmap& bmpDisabled = wxNullBitmap, const wxString& shortHelp = "", const wxString& longHelp = "", wxObject *data = NULL)
! %wxchkver24 wxToolBarToolBase *AddRadioTool(int toolid, const wxString& label, const wxBitmap& bitmap, const wxBitmap& bmpDisabled = wxNullBitmap, const wxString& shortHelp = "", const wxString& longHelp = "", wxObject *data = NULL)
! !%wxchkver24 wxToolBarToolBase *InsertTool(size_t pos, int id, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap, bool isToggle = FALSE, wxObject *clientData = NULL, const wxString& shortHelpString = "", const wxString& longHelpString = "")
! %wxchkver24 virtual wxToolBarToolBase *InsertTool(size_t pos, int toolid, const wxString& label, const wxBitmap& bitmap, const wxBitmap& bmpDisabled = wxNullBitmap, wxItemKind kind = wxITEM_NORMAL, const wxString& shortHelp = "", const wxString& longHelp = "", wxObject *clientData = NULL)
wxToolBarToolBase *InsertControl(size_t pos, wxControl *control)
wxToolBarToolBase *InsertSeparator(size_t pos)
|
