#include "wx/defs.h"
+#if wxUSE_TOOLBAR
+
#include "wx/bitmap.h"
#include "wx/list.h"
#include "wx/control.h"
wxToolBarBase *GetToolBar() const { return m_tbar; }
// style
- int IsButton() const { return m_toolStyle == wxTOOL_STYLE_BUTTON; }
- int IsControl() const { return m_toolStyle == wxTOOL_STYLE_CONTROL; }
- int IsSeparator() const { return m_toolStyle == wxTOOL_STYLE_SEPARATOR; }
+ bool IsButton() const { return m_toolStyle == wxTOOL_STYLE_BUTTON; }
+ bool IsControl() const { return m_toolStyle == wxTOOL_STYLE_CONTROL; }
+ bool IsSeparator() const { return m_toolStyle == wxTOOL_STYLE_SEPARATOR; }
int GetStyle() const { return m_toolStyle; }
// state
// between the two states.
wxToolBarToolBase *AddTool(int id,
const wxBitmap& bitmap,
- const wxBitmap& pushedBitmap = wxNullBitmap,
+ const wxBitmap& pushedBitmap,
bool toggle = FALSE,
wxObject *clientData = NULL,
const wxString& shortHelpString = wxEmptyString,
virtual void SetToolSeparation(int separation)
{ m_toolSeparation = separation; }
- virtual wxSize GetToolMargins() { return wxSize(m_xMargin, m_yMargin); }
+ virtual wxSize GetToolMargins() { return GetMargins(); }
virtual int GetToolPacking() { return m_toolPacking; }
virtual int GetToolSeparation() { return m_toolSeparation; }
+ // for compatibility
+ wxSize GetMargins() const { return wxSize(m_xMargin, m_yMargin); }
+
// toolbar geometry
// ----------------
// Do the toolbar button updates (check for EVT_UPDATE_UI handlers)
virtual void DoToolbarUpdates();
+ // don't want toolbars to accept the focus
+ virtual bool AcceptsFocus() const { return FALSE; }
+
protected:
// to implement in derived classes
// -------------------------------
private:
DECLARE_EVENT_TABLE()
+ DECLARE_CLASS(wxToolBarBase)
};
+#endif // wxUSE_TOOLBAR
+
#endif
// _WX_TBARBASE_H_