// Modified by: VZ on 14.12.99 during wxToolBar classes reorganization
// Created: 01/02/97
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart and Markus Holzem
+// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_TBARSMPLH__
#define _WX_TBARSMPLH__
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
#pragma interface "tbarsmpl.h"
#endif
#include "wx/tbarbase.h"
-#if wxUSE_TOOLBAR_SIMPLE
+#if wxUSE_TOOLBAR && wxUSE_TOOLBAR_SIMPLE
class WXDLLEXPORT wxMemoryDC;
wxToolBarSimple() { Init(); }
wxToolBarSimple(wxWindow *parent,
- wxWindowID id,
+ wxWindowID winid,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxNO_BORDER | wxTB_HORIZONTAL,
{
Init();
- Create(parent, id, pos, size, style, name);
+ Create(parent, winid, pos, size, style, name);
}
bool Create(wxWindow *parent,
- wxWindowID id,
+ wxWindowID winid,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxNO_BORDER | wxTB_HORIZONTAL,
// implement base class pure virtuals
virtual wxToolBarToolBase *DoAddTool
(
- int id,
+ int toolid,
const wxString& label,
const wxBitmap& bitmap,
const wxBitmap& bmpDisabled,
virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle);
virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
- virtual wxToolBarToolBase *CreateTool(int id,
+ virtual wxToolBarToolBase *CreateTool(int winid,
const wxString& label,
const wxBitmap& bmpNormal,
const wxBitmap& bmpDisabled,
private:
DECLARE_EVENT_TABLE()
- DECLARE_DYNAMIC_CLASS(wxToolBarSimple)
+ DECLARE_DYNAMIC_CLASS_NO_COPY(wxToolBarSimple)
};
#endif // wxUSE_TOOLBAR_SIMPLE