conditional compilation for compositing

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

diff --git a/contrib/src/fl/dyntbar.cpp b/contrib/src/fl/dyntbar.cpp
index 28b79a91b1774aeb54fb19526d4f0aa8bd706608..c30ce0668b7c511d4cfd91d9021e6750270dfe43 100644 (file)
--- a/contrib/src/fl/dyntbar.cpp
+++ b/contrib/src/fl/dyntbar.cpp
@@ -76,7 +76,7 @@ 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
                               const wxString& name)
 {
     // cut&pasted from wxtbatsmpl.h


@@ -109,7 +109,7 @@ 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();
                               )
 {
     wxDynToolInfo* pInfo = new wxDynToolInfo();


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


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


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


@@ -374,7 +374,7 @@ void wxDynamicToolBar::SizeToolWindows()
                 bStateCheckDone = TRUE;
                 
                 size_t j;
                 bStateCheckDone = TRUE;
                 
                 size_t j;

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

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


@@ -569,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 wxString& label, const wxBitmap& bmpNormal, const wxBitmap& bmpDisabled, wxItemKind kind, wxObject *clientData, const wxString& shortHelp, const wxString& longHelp)
+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;
 }