Starting to update the tarball and rpm spec files for 2.5. Mostly

[wxWidgets.git] / wxPython / src / _toolbar.i

diff --git a/wxPython/src/_toolbar.i b/wxPython/src/_toolbar.i
index 208beb8b0adc8de4d15aaf53d27e678b44039850..f3779512632ff4825f2cd23fd81e694d41b4cd69 100644 (file)
--- a/wxPython/src/_toolbar.i
+++ b/wxPython/src/_toolbar.i
@@ -15,9 +15,8 @@
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-%{
-    DECLARE_DEF_STRING(ToolBarNameStr);
-%}
+MAKE_CONST_WXSTRING_NOSWIG(ToolBarNameStr);
+

 
 //---------------------------------------------------------------------------
 %newgroup;
 
 //---------------------------------------------------------------------------
 %newgroup;


@@ -60,13 +59,13 @@ class wxToolBarToolBase : public wxObject {
 public:
 //      wxToolBarToolBase(wxToolBarBase *tbar = (wxToolBarBase *)NULL,
 //                        int id = wxID_SEPARATOR,
 public:
 //      wxToolBarToolBase(wxToolBarBase *tbar = (wxToolBarBase *)NULL,
 //                        int id = wxID_SEPARATOR,

-//                        const wxString& label = wxEmptyString,
+//                        const wxString& label = wxPyEmptyString,

 //                        const wxBitmap& bmpNormal = wxNullBitmap,
 //                        const wxBitmap& bmpDisabled = wxNullBitmap,
 //                        wxItemKind kind = wxITEM_NORMAL,
 //                        wxObject *clientData = (wxObject *) NULL,
 //                        const wxBitmap& bmpNormal = wxNullBitmap,
 //                        const wxBitmap& bmpDisabled = wxNullBitmap,
 //                        wxItemKind kind = wxITEM_NORMAL,
 //                        wxObject *clientData = (wxObject *) NULL,

-//                        const wxString& shortHelpString = wxEmptyString,
-//                        const wxString& longHelpString = wxEmptyString)
+//                        const wxString& shortHelpString = wxPyEmptyString,
+//                        const wxString& longHelpString = wxPyEmptyString)

 //      ~wxToolBarToolBase();
 
     int GetId();
 //      ~wxToolBarToolBase();
 
     int GetId();


@@ -303,9 +302,8 @@ public:
                               shortHelp, longHelp, clientData)
     }
 
                               shortHelp, longHelp, clientData)
     }
 

-    // TODO?
-    //wxToolBarToolBase *AddTool (wxToolBarToolBase *tool);
-    //wxToolBarToolBase *InsertTool (size_t pos, wxToolBarToolBase *tool);
+    %name(AddToolItem) wxToolBarToolBase *AddTool (wxToolBarToolBase *tool);
+    %name(InsertToolItem) wxToolBarToolBase *InsertTool (size_t pos, wxToolBarToolBase *tool);

 
     wxToolBarToolBase *AddControl(wxControl *control);
     wxToolBarToolBase *InsertControl(size_t pos, wxControl *control);
 
     wxToolBarToolBase *AddControl(wxControl *control);
     wxToolBarToolBase *InsertControl(size_t pos, wxControl *control);


@@ -376,6 +374,9 @@ public:
     // there is no tool at this point (corrdinates are client)
     wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y);
 
     // there is no tool at this point (corrdinates are client)
     wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y);
 

+    // find the tool by id
+    wxToolBarToolBase *FindById(int toolid) const;
+

     // return True if this is a vertical toolbar, otherwise False
     bool IsVertical();
 };
     // return True if this is a vertical toolbar, otherwise False
     bool IsVertical();
 };