AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
contrib/include/wx/fl/dyntbar.h
View File

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

6
contrib/src/fl/dyntbar.cpp
View File

@ -29,9 +29,9 @@
#include "wx/fl/dyntbar.h" #include "wx/fl/dyntbar.h"
#include "wx/fl/newbmpbtn.h" #include "wx/fl/newbmpbtn.h"
IMPLEMENT_DYNAMIC_CLASS(wxDynamicToolBar, wxControl ) IMPLEMENT_DYNAMIC_CLASS( wxDynamicToolBar, wxToolBarBase )
BEGIN_EVENT_TABLE( wxDynamicToolBar, wxControl ) BEGIN_EVENT_TABLE( wxDynamicToolBar, wxToolBarBase )
EVT_SIZE ( wxDynamicToolBar::OnSize ) EVT_SIZE ( wxDynamicToolBar::OnSize )
EVT_PAINT( wxDynamicToolBar::OnPaint ) EVT_PAINT( wxDynamicToolBar::OnPaint )
@ -596,7 +596,7 @@ void wxDynamicToolBar::DoSetToggle( wxToolBarToolBase* tool, bool toggle )
{ {
} }
wxToolBarToolBase* wxDynamicToolBar::CreateTool( int id, const wxBitmap& bitmap1, const wxBitmap& bitmap2, bool toggle, wxObject* clientData, const wxString& shortHelpString, const wxString& longHelpString ) wxToolBarToolBase* wxDynamicToolBar::CreateTool( int id, const wxString& label, const wxBitmap& bmpNormal, const wxBitmap& bmpDisabled, wxItemKind kind, wxObject *clientData, const wxString& shortHelp, const wxString& longHelp)
{ {
return NULL; return NULL;
} }