More Clear -> ClearBackground

[wxWidgets.git] / contrib / src / fl / dyntbar.cpp

diff --git a/contrib/src/fl/dyntbar.cpp b/contrib/src/fl/dyntbar.cpp
index 549d6899167f311227cdb58179c21d55af002cf5..28b79a91b1774aeb54fb19526d4f0aa8bd706608 100644 (file)
--- a/contrib/src/fl/dyntbar.cpp
+++ b/contrib/src/fl/dyntbar.cpp
@@ -29,9 +29,9 @@
 #include "wx/fl/dyntbar.h"
 #include "wx/fl/newbmpbtn.h"
 
 #include "wx/fl/dyntbar.h"
 #include "wx/fl/newbmpbtn.h"
 

-IMPLEMENT_DYNAMIC_CLASS(wxDynamicToolBar, wxControl )
+IMPLEMENT_DYNAMIC_CLASS( wxDynamicToolBar, wxObject )

 
 

-BEGIN_EVENT_TABLE( wxDynamicToolBar, wxControl )
+BEGIN_EVENT_TABLE( wxDynamicToolBar, wxToolBarBase )

 
     EVT_SIZE ( wxDynamicToolBar::OnSize  )
     EVT_PAINT( wxDynamicToolBar::OnPaint )
 
     EVT_SIZE ( wxDynamicToolBar::OnSize  )
     EVT_PAINT( wxDynamicToolBar::OnPaint )


@@ -185,6 +185,10 @@ wxToolBarToolBase*
 
     pBmpBtn->Reshape();
 
 
     pBmpBtn->Reshape();
 

+#if wxUSE_TOOLTIPS
+    pBmpBtn->SetToolTip( helpString1 );
+#endif  // wxUSE_TOOLTIPS
+

     AddTool( toolIndex, pBmpBtn );
 
     return NULL;
     AddTool( toolIndex, pBmpBtn );
 
     return NULL;


@@ -488,7 +492,7 @@ void wxDynamicToolBar::SetLayout( LayoutManagerBase* pLayout )
     Layout();
 }
 
     Layout();
 }
 

-void wxDynamicToolBar::EnableTool(const int toolIndex, const bool enable )
+void wxDynamicToolBar::EnableTool(int toolIndex, bool enable )

 {
     wxDynToolInfo* pInfo = GetToolInfo( toolIndex );
 
 {
     wxDynToolInfo* pInfo = GetToolInfo( toolIndex );
 


@@ -592,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;
 }