Better markup.

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

diff --git a/wxPython/src/_toolbar.i b/wxPython/src/_toolbar.i
index 0c9ad075ce2391cbed2bb4fac2ea3113dc150d14..f3d0bb52f23709a37a7d2c38eb38b57a786b7a58 100644 (file)
--- a/wxPython/src/_toolbar.i
+++ b/wxPython/src/_toolbar.i
@@ -282,6 +282,7 @@ public:
 
     %# For consistency with the backwards compatible methods above, here are
     %# some non-'Label' versions of the Check and Radio methods
 
     %# For consistency with the backwards compatible methods above, here are
     %# some non-'Label' versions of the Check and Radio methods

+

     def AddCheckTool(self, id, bitmap,
                      bmpDisabled = wx.NullBitmap,
                      shortHelp = '', longHelp = '',
     def AddCheckTool(self, id, bitmap,
                      bmpDisabled = wx.NullBitmap,
                      shortHelp = '', longHelp = '',


@@ -390,17 +391,21 @@ class wxToolBar : public wxToolBarBase {
 public:
     %pythonAppend wxToolBar         "self._setOORInfo(self)"
     %pythonAppend wxToolBar()       ""
 public:
     %pythonAppend wxToolBar         "self._setOORInfo(self)"
     %pythonAppend wxToolBar()       ""

-    
+    %typemap(out) wxToolBar*;    // turn off this typemap
+ 

     wxToolBar(wxWindow *parent,
     wxToolBar(wxWindow *parent,

-              wxWindowID id,
+              wxWindowID id=-1,

               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = wxNO_BORDER | wxTB_HORIZONTAL,
               const wxString& name = wxPyToolBarNameStr);
     %name(PreToolBar)wxToolBar();
 
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = wxNO_BORDER | wxTB_HORIZONTAL,
               const wxString& name = wxPyToolBarNameStr);
     %name(PreToolBar)wxToolBar();
 

+    // Turn it back on again
+    %typemap(out) wxToolBar* { $result = wxPyMake_wxObject($1, $owner); }
+

     bool Create(wxWindow *parent,
     bool Create(wxWindow *parent,

-              wxWindowID id,
+              wxWindowID id=-1,

               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = wxNO_BORDER | wxTB_HORIZONTAL,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = wxNO_BORDER | wxTB_HORIZONTAL,