fixed fl compilation after the recent tbar changes (patch 536539)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-03-29 09:39:18 +00:00
parent c81394060f
commit 349f1d8ed3
2 changed files with 11 additions and 10 deletions

View File

@@ -100,8 +100,6 @@ wxDynamicToolBar manages containment and layout of tool windows.
class wxDynamicToolBar : public wxToolBarBase
{
DECLARE_DYNAMIC_CLASS(wxDynamicToolBar)
protected:
friend class wxDynamicToolBarSerializer;
@@ -247,18 +245,21 @@ public:
// Creates a toolbar tool.
virtual wxToolBarToolBase *CreateTool(int id,
const wxBitmap& bitmap1,
const wxBitmap& bitmap2,
bool toggle,
const wxString& label,
const wxBitmap& bmpNormal,
const wxBitmap& bmpDisabled,
wxItemKind kind,
wxObject *clientData,
const wxString& shortHelpString,
const wxString& longHelpString);
const wxString& shortHelp,
const wxString& longHelp);
// Creates a toolbar tool.
virtual wxToolBarToolBase *CreateTool(wxControl *control);
private:
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxDynamicToolBar)
};
#endif /* __DYNTBAR_G__ */