corrected version number extraction

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

diff --git a/contrib/src/fl/dyntbar.cpp b/contrib/src/fl/dyntbar.cpp
index 549d6899167f311227cdb58179c21d55af002cf5..f68882a5c5dac096cc73aab0d64fc71f9e766580 100644 (file)
--- a/contrib/src/fl/dyntbar.cpp
+++ b/contrib/src/fl/dyntbar.cpp
@@ -6,7 +6,7 @@
 // Created:     ??/10/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Aleksandras Gluchovas
 // Created:     ??/10/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Aleksandras Gluchovas

-// Licence:       wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -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 )


@@ -76,23 +76,23 @@ bool wxDynamicToolBar::Create(wxWindow *parent, const wxWindowID id,
                               const wxPoint& pos, 
                               const wxSize& size,
                               const long style, 
                               const wxPoint& pos, 
                               const wxSize& size,
                               const long style, 

-                              const int orientation, const int RowsOrColumns, 
+                              const int WXUNUSED(orientation), const int WXUNUSED(RowsOrColumns), 

                               const wxString& name)
 {
     // cut&pasted from wxtbatsmpl.h
 
     if ( ! wxWindow::Create(parent, id, pos, size, style, name) )
                               const wxString& name)
 {
     // cut&pasted from wxtbatsmpl.h
 
     if ( ! wxWindow::Create(parent, id, pos, size, style, name) )

-        return FALSE;
+        return false;

 
     SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ));
 
 
     SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ));
 

-    return TRUE;
+    return true;

 }
 
 bool wxDynamicToolBar::Realize(void)
 {
     // FOR NOW:: nothing
 }
 
 bool wxDynamicToolBar::Realize(void)
 {
     // FOR NOW:: nothing

-    return TRUE;
+    return true;

 }
 
 wxDynamicToolBar::~wxDynamicToolBar(void)
 }
 
 wxDynamicToolBar::~wxDynamicToolBar(void)


@@ -109,14 +109,14 @@ wxDynamicToolBar::~wxDynamicToolBar(void)
 
 void wxDynamicToolBar::AddTool( int toolIndex, 
                                 wxWindow* pToolWindow, 
 
 void wxDynamicToolBar::AddTool( int toolIndex, 
                                 wxWindow* pToolWindow, 

-                                const wxSize& size
+                                const wxSize& WXUNUSED(size)

                               )
 {
     wxDynToolInfo* pInfo = new wxDynToolInfo();
 
     pInfo->mpToolWnd    = pToolWindow;
     pInfo->mIndex       = toolIndex;
                               )
 {
     wxDynToolInfo* pInfo = new wxDynToolInfo();
 
     pInfo->mpToolWnd    = pToolWindow;
     pInfo->mIndex       = toolIndex;

-    pInfo->mIsSeparator    = FALSE;
+    pInfo->mIsSeparator    = false;

 
     int x,y;
     pToolWindow->GetSize( &x, &y );
 
     int x,y;
     pToolWindow->GetSize( &x, &y );


@@ -174,10 +174,10 @@ void wxDynamicToolBar::AddTool( int toolIndex, wxBitmap labelBmp,
 
 wxToolBarToolBase* 
       wxDynamicToolBar::AddTool(const int toolIndex, const wxBitmap& bitmap, 
 
 wxToolBarToolBase* 
       wxDynamicToolBar::AddTool(const int toolIndex, const wxBitmap& bitmap, 

-                                const wxBitmap& pushedBitmap,
-                                const bool toggle, const long xPos, 
-                                const long yPos, wxObject *clientData,
-                                const wxString& helpString1, const wxString& helpString2)
+                                const wxBitmap& WXUNUSED(pushedBitmap),
+                                const bool WXUNUSED(toggle), const long WXUNUSED(xPos), 
+                                const long WXUNUSED(yPos), wxObject *WXUNUSED(clientData),
+                                const wxString& helpString1, const wxString& WXUNUSED(helpString2))

 {
     wxNewBitmapButton* pBmpBtn = new wxNewBitmapButton( bitmap );
 
 {
     wxNewBitmapButton* pBmpBtn = new wxNewBitmapButton( bitmap );
 


@@ -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;


@@ -234,7 +238,7 @@ void wxDynamicToolBar::AddSeparator( wxWindow* pSepartorWnd )
 
     pInfo->mpToolWnd    = pSepartorWnd;
     pInfo->mIndex       = -1;
 
     pInfo->mpToolWnd    = pSepartorWnd;
     pInfo->mIndex       = -1;

-    pInfo->mIsSeparator = TRUE;
+    pInfo->mIsSeparator = true;

 
     // Do we draw a separator or is a other object?
     if ( pSepartorWnd )
 
     // Do we draw a separator or is a other object?
     if ( pSepartorWnd )


@@ -265,12 +269,12 @@ void wxDynamicToolBar::AddSeparator( wxWindow* pSepartorWnd )
     mTools.Add( pInfo );
 }
 
     mTools.Add( pInfo );
 }
 

-void wxDynamicToolBar::OnEraseBackground( wxEraseEvent& event )
+void wxDynamicToolBar::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )

 {
     // FOR NOW:: nothing
 }
 
 {
     // FOR NOW:: nothing
 }
 

-void wxDynamicToolBar::OnSize( wxSizeEvent& event )
+void wxDynamicToolBar::OnSize( wxSizeEvent& WXUNUSED(event) )

 {
     //SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ) );
 
 {
     //SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ) );
 


@@ -306,7 +310,7 @@ void wxDynamicToolBar::DrawSeparator( wxDynToolInfo& info, wxDC& dc )
     }
 }
 
     }
 }
 

-void wxDynamicToolBar::OnPaint( wxPaintEvent& event )
+void wxDynamicToolBar::OnPaint( wxPaintEvent& WXUNUSED(event) )

 {
     // draw separators if any
     wxPaintDC dc(this);
 {
     // draw separators if any
     wxPaintDC dc(this);


@@ -329,8 +333,8 @@ void wxDynamicToolBar::OnPaint( wxPaintEvent& event )
 
 void wxDynamicToolBar::SizeToolWindows()
 {
 
 void wxDynamicToolBar::SizeToolWindows()
 {

-    bool bStateCheckDone = FALSE;
-    bool bHorzSeparator  = FALSE;
+    bool bStateCheckDone = false;
+    bool bHorzSeparator  = false;

     int maxWidth         = 0;
     int maxHeight        = 0;
 
     int maxWidth         = 0;
     int maxHeight        = 0;
 


@@ -367,10 +371,10 @@ void wxDynamicToolBar::SizeToolWindows()
             // separators and we do it only once (all to do with performance...)
             if (!bStateCheckDone)
             {
             // separators and we do it only once (all to do with performance...)
             if (!bStateCheckDone)
             {

-                bStateCheckDone = TRUE;
+                bStateCheckDone = true;

                 
                 size_t j;
                 
                 size_t j;

-                wxDynToolInfo *pInfo = NULL;
+                wxDynToolInfo *pInfo;

                 wxDynToolInfo *pPrevInfo = NULL;
                 int nVertSeparators = 0;
 
                 wxDynToolInfo *pPrevInfo = NULL;
                 int nVertSeparators = 0;
 


@@ -460,7 +464,7 @@ bool wxDynamicToolBar::Layout()
     GetPreferredDim( wndDim, result );
 
     SizeToolWindows();
     GetPreferredDim( wndDim, result );
 
     SizeToolWindows();

-    return TRUE;
+    return true;

 }
 
 void wxDynamicToolBar::GetPreferredDim( const wxSize& givenDim, wxSize& prefDim )
 }
 
 void wxDynamicToolBar::GetPreferredDim( const wxSize& givenDim, wxSize& prefDim )


@@ -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 );
 


@@ -565,39 +569,47 @@ void BagLayout::Layout(  const wxSize&       parentDim,
 
 //////// stuff from 2.1.15 ///////////
 
 
 //////// stuff from 2.1.15 ///////////
 

-wxToolBarToolBase* wxDynamicToolBar::FindToolForPosition( wxCoord x, wxCoord y ) const
+wxToolBarToolBase* wxDynamicToolBar::FindToolForPosition( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) ) const

 {
     return NULL;
 }
 
 {
     return NULL;
 }
 

-bool wxDynamicToolBar::DoInsertTool( size_t pos, wxToolBarToolBase* tool )
+bool wxDynamicToolBar::DoInsertTool( size_t WXUNUSED(pos), wxToolBarToolBase* WXUNUSED(tool) )

 {
 {

-    return TRUE;
+    return true;

 }
 
 }
 

-bool wxDynamicToolBar::DoDeleteTool( size_t pos, wxToolBarToolBase* tool )
+bool wxDynamicToolBar::DoDeleteTool( size_t WXUNUSED(pos), wxToolBarToolBase* WXUNUSED(tool) )

 {
 {

-    return TRUE;
+    return true;

 }
 
 }
 

-void wxDynamicToolBar::DoEnableTool( wxToolBarToolBase* tool, bool enable )
+void wxDynamicToolBar::DoEnableTool( wxToolBarToolBase* WXUNUSED(tool), bool WXUNUSED(enable) )

 {
 }
 
 {
 }
 

-void wxDynamicToolBar::DoToggleTool( wxToolBarToolBase* tool, bool toggle )
+void wxDynamicToolBar::DoToggleTool( wxToolBarToolBase* WXUNUSED(tool), bool WXUNUSED(toggle) )

 {
 }
 
 {
 }
 

-void wxDynamicToolBar::DoSetToggle( wxToolBarToolBase* tool, bool toggle )
+void wxDynamicToolBar::DoSetToggle( wxToolBarToolBase* WXUNUSED(tool), bool WXUNUSED(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 WXUNUSED(id), 
+                                                 const wxString& WXUNUSED(label), 
+                                                 const wxBitmap& WXUNUSED(bmpNormal), 
+                                                 const wxBitmap& WXUNUSED(bmpDisabled), 
+                                                 wxItemKind WXUNUSED(kind), 
+                                                 wxObject *WXUNUSED(clientData), 
+                                                 const wxString& WXUNUSED(shortHelp), 
+                                                 const wxString& WXUNUSED(longHelp)
+                                                )

 {
     return NULL;
 }
 
 {
     return NULL;
 }
 

-wxToolBarToolBase* wxDynamicToolBar::CreateTool( wxControl* control )
+wxToolBarToolBase* wxDynamicToolBar::CreateTool( wxControl* WXUNUSED(control) )

 {
     return NULL;
 }
 {
     return NULL;
 }