Merged wxPython 2.4.x to the 2.5 branch (Finally!!!)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -196,7 +196,7 @@ public:
|
||||
|
||||
// Insert the new tool at the given position, if pos == GetToolsCount(), it
|
||||
// is equivalent to DoAddTool()
|
||||
wxToolBarToolBase *InsertTool(size_t pos,
|
||||
wxToolBarToolBase *DoInsertTool(size_t pos,
|
||||
int id,
|
||||
const wxString& label,
|
||||
const wxBitmap& bitmap,
|
||||
@@ -270,7 +270,7 @@ public:
|
||||
# 2.3.3. They are renamed to have 'Label' in the name so as to be
|
||||
# able to keep backwards compatibility with using the above
|
||||
# methods. Eventually these should migrate to be the methods used
|
||||
# primarily and loose the 'Label' in the name...
|
||||
# primarily and lose the 'Label' in the name...
|
||||
|
||||
def AddLabelTool(self, id, label, bitmap,
|
||||
bmpDisabled = wxNullBitmap,
|
||||
|
||||
Reference in New Issue
Block a user