//---------------------------------------------------------------------------
-%{
- DECLARE_DEF_STRING(ToolBarNameStr);
-%}
+MAKE_CONST_WXSTRING_NOSWIG(ToolBarNameStr);
+
//---------------------------------------------------------------------------
%newgroup;
enum {
wxTB_HORIZONTAL,
wxTB_VERTICAL,
+ wxTB_TOP,
+ wxTB_LEFT,
+ wxTB_BOTTOM,
+ wxTB_RIGHT,
+
wxTB_3DBUTTONS,
wxTB_FLAT,
wxTB_DOCKABLE,
wxTB_NOALIGN,
wxTB_HORZ_LAYOUT,
wxTB_HORZ_TEXT,
+ wxTB_NO_TOOLTIPS
};
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 wxString& shortHelpString = wxEmptyString,
-// const wxString& longHelpString = wxEmptyString)
+// const wxString& shortHelpString = wxPyEmptyString,
+// const wxString& longHelpString = wxPyEmptyString)
// ~wxToolBarToolBase();
int GetId();
SetBitmap1 = SetNormalBitmap
SetBitmap2 = SetDisabledBitmap
}
+
+ %property(Bitmap, GetBitmap, doc="See `GetBitmap`");
+ %property(ClientData, GetClientData, SetClientData, doc="See `GetClientData` and `SetClientData`");
+ %property(Control, GetControl, doc="See `GetControl`");
+ %property(DisabledBitmap, GetDisabledBitmap, SetDisabledBitmap, doc="See `GetDisabledBitmap` and `SetDisabledBitmap`");
+ %property(Id, GetId, doc="See `GetId`");
+ %property(Kind, GetKind, doc="See `GetKind`");
+ %property(Label, GetLabel, SetLabel, doc="See `GetLabel` and `SetLabel`");
+ %property(LongHelp, GetLongHelp, SetLongHelp, doc="See `GetLongHelp` and `SetLongHelp`");
+ %property(NormalBitmap, GetNormalBitmap, SetNormalBitmap, doc="See `GetNormalBitmap` and `SetNormalBitmap`");
+ %property(ShortHelp, GetShortHelp, SetShortHelp, doc="See `GetShortHelp` and `SetShortHelp`");
+ %property(Style, GetStyle, doc="See `GetStyle`");
+ %property(ToolBar, GetToolBar, doc="See `GetToolBar`");
};
%# 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 = '',
shortHelp, longHelp, clientData)
}
- %name(AddToolItem) wxToolBarToolBase *AddTool (wxToolBarToolBase *tool);
- %name(InsertToolItem) wxToolBarToolBase *InsertTool (size_t pos, wxToolBarToolBase *tool);
+ %Rename(AddToolItem, wxToolBarToolBase*, AddTool (wxToolBarToolBase *tool));
+ %Rename(InsertToolItem, wxToolBarToolBase*, InsertTool (size_t pos, wxToolBarToolBase *tool));
wxToolBarToolBase *AddControl(wxControl *control);
wxToolBarToolBase *InsertControl(size_t pos, wxControl *control);
void SetToolLongHelp(int id, const wxString& helpString);
wxString GetToolLongHelp(int id);
- %name(SetMarginsXY) void SetMargins(int x, int y);
+ %Rename(SetMarginsXY, void, SetMargins(int x, int y));
void SetMargins(const wxSize& size);
void SetToolPacking(int packing);
void SetToolSeparation(int separation);
// return True if this is a vertical toolbar, otherwise False
bool IsVertical();
+
+ size_t GetToolsCount() const;
+
+ %property(Margins, GetMargins, SetMargins, doc="See `GetMargins` and `SetMargins`");
+ %property(MaxCols, GetMaxCols, doc="See `GetMaxCols`");
+ %property(MaxRows, GetMaxRows, doc="See `GetMaxRows`");
+ %property(ToolBitmapSize, GetToolBitmapSize, SetToolBitmapSize, doc="See `GetToolBitmapSize` and `SetToolBitmapSize`");
+ %property(ToolMargins, GetToolMargins, doc="See `GetToolMargins`");
+ %property(ToolPacking, GetToolPacking, SetToolPacking, doc="See `GetToolPacking` and `SetToolPacking`");
+ %property(ToolSeparation, GetToolSeparation, SetToolSeparation, doc="See `GetToolSeparation` and `SetToolSeparation`");
+ %property(ToolSize, GetToolSize, doc="See `GetToolSize`");
+ %property(ToolsCount, GetToolsCount, doc="See `GetToolsCount`");
};
+MustHaveApp(wxToolBar);
+
class wxToolBar : public wxToolBarBase {
public:
- %addtofunc wxToolBar "self._setOORInfo(self)"
- %addtofunc wxToolBar() ""
-
+ %pythonAppend wxToolBar "self._setOORInfo(self)"
+ %pythonAppend wxToolBar() ""
+ %typemap(out) wxToolBar*; // turn off this typemap
+
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();
+ %RenameCtor(PreToolBar, wxToolBar());
+
+ // Turn it back on again
+ %typemap(out) wxToolBar* { $result = wxPyMake_wxObject($1, $owner); }
bool Create(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);
- wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y);
+ // TODO: In 2.9 move these to the base class...
+ void SetToolNormalBitmap(int id, const wxBitmap& bitmap);
+ void SetToolDisabledBitmap(int id, const wxBitmap& bitmap);
+
+ static wxVisualAttributes
+ GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+};
+
+//---------------------------------------------------------------------------
+
+#if 0
+%{
+#include <wx/generic/buttonbar.h>
+%}
+
+MustHaveApp(wxToolBar);
+class wxButtonToolBar : public wxToolBarBase
+{
+public:
+ %pythonAppend wxButtonToolBar "self._setOORInfo(self)"
+ %pythonAppend wxButtonToolBar() ""
+
+ wxButtonToolBar(wxWindow *parent,
+ wxWindowID id=-1,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ long style = 0,
+ const wxString& name = wxPyToolBarNameStr);
+ %RenameCtor(PreButtonToolBar, wxButtonToolBar());
+
+
+ bool Create(wxWindow *parent,
+ wxWindowID id=-1,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ long style = 0,
+ const wxString& name = wxPyToolBarNameStr);
};
+#endif
//---------------------------------------------------------------------------