// Created: ??/10/98
// RCS-ID: $Id$
// Copyright: (c) Aleksandras Gluchovas
-// Licence: wxWindows license
+// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#include "wx/fl/dyntbar.h"
#include "wx/fl/newbmpbtn.h"
-IMPLEMENT_DYNAMIC_CLASS( wxDynamicToolBar, wxToolBarBase )
+IMPLEMENT_DYNAMIC_CLASS( wxDynamicToolBar, wxObject )
BEGIN_EVENT_TABLE( wxDynamicToolBar, wxToolBarBase )
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) )
- return FALSE;
+ return false;
SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ));
- return TRUE;
+ return true;
}
bool wxDynamicToolBar::Realize(void)
{
// FOR NOW:: nothing
- return TRUE;
+ return true;
}
wxDynamicToolBar::~wxDynamicToolBar(void)
void wxDynamicToolBar::AddTool( int toolIndex,
wxWindow* pToolWindow,
- const wxSize& size
+ const wxSize& WXUNUSED(size)
)
{
wxDynToolInfo* pInfo = new wxDynToolInfo();
pInfo->mpToolWnd = pToolWindow;
pInfo->mIndex = toolIndex;
- pInfo->mIsSeparator = FALSE;
+ pInfo->mIsSeparator = false;
int x,y;
pToolWindow->GetSize( &x, &y );
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 );
pInfo->mpToolWnd = pSepartorWnd;
pInfo->mIndex = -1;
- pInfo->mIsSeparator = TRUE;
+ pInfo->mIsSeparator = true;
// Do we draw a separator or is a other object?
if ( pSepartorWnd )
mTools.Add( pInfo );
}
-void wxDynamicToolBar::OnEraseBackground( wxEraseEvent& event )
+void wxDynamicToolBar::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )
{
// FOR NOW:: nothing
}
-void wxDynamicToolBar::OnSize( wxSizeEvent& event )
+void wxDynamicToolBar::OnSize( wxSizeEvent& WXUNUSED(event) )
{
//SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ) );
}
}
-void wxDynamicToolBar::OnPaint( wxPaintEvent& event )
+void wxDynamicToolBar::OnPaint( wxPaintEvent& WXUNUSED(event) )
{
// draw separators if any
wxPaintDC dc(this);
void wxDynamicToolBar::SizeToolWindows()
{
- bool bStateCheckDone = FALSE;
- bool bHorzSeparator = FALSE;
+ bool bStateCheckDone = false;
+ bool bHorzSeparator = false;
int maxWidth = 0;
int maxHeight = 0;
// separators and we do it only once (all to do with performance...)
if (!bStateCheckDone)
{
- bStateCheckDone = TRUE;
+ bStateCheckDone = true;
size_t j;
- wxDynToolInfo *pInfo = NULL;
+ wxDynToolInfo *pInfo;
wxDynToolInfo *pPrevInfo = NULL;
int nVertSeparators = 0;
GetPreferredDim( wndDim, result );
SizeToolWindows();
- return TRUE;
+ return true;
}
void wxDynamicToolBar::GetPreferredDim( const wxSize& givenDim, wxSize& prefDim )
Layout();
}
-void wxDynamicToolBar::EnableTool(const int toolIndex, const bool enable )
+void wxDynamicToolBar::EnableTool(int toolIndex, bool enable )
{
wxDynToolInfo* pInfo = GetToolInfo( toolIndex );
//////// 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;
}
-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;
}
-wxToolBarToolBase* wxDynamicToolBar::CreateTool( wxControl* control )
+wxToolBarToolBase* wxDynamicToolBar::CreateTool( wxControl* WXUNUSED(control) )
{
return NULL;
}