// Created: ??/10/98
// RCS-ID: $Id$
// Copyright: (c) Aleksandras Gluchovas
-// Licence: wxWindows license
+// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
- #pragma implementation "dyntbar.h"
-#endif
-
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
#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 )
END_EVENT_TABLE()
/***** Implementation for class wxToolLayoutItem *****/
-
+
IMPLEMENT_DYNAMIC_CLASS(wxToolLayoutItem, wxObject)
/***** Implementation for class wxDynToolInfo *****/
-
+
IMPLEMENT_DYNAMIC_CLASS(wxDynToolInfo, wxToolLayoutItem)
/***** Implementation for class wxDynamicToolBar *****/
{
}
-wxDynamicToolBar::wxDynamicToolBar(wxWindow *parent, const wxWindowID id,
+wxDynamicToolBar::wxDynamicToolBar(wxWindow *parent, const wxWindowID id,
const wxPoint& pos, const wxSize& size,
const long style, const int orientation,
const int RowsOrColumns, const wxString& name )
SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE) );
}
-bool wxDynamicToolBar::Create(wxWindow *parent, const wxWindowID id,
- const wxPoint& pos,
+bool wxDynamicToolBar::Create(wxWindow *parent, const wxWindowID id,
+ const wxPoint& pos,
const wxSize& size,
- const long style,
- const int orientation, const int RowsOrColumns,
+ const long style,
+ 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
+void wxDynamicToolBar::AddTool( int toolIndex,
+ wxWindow* pToolWindow,
+ 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 );
mTools.Add( pInfo );
}
-void wxDynamicToolBar::AddTool( int toolIndex,
+void wxDynamicToolBar::AddTool( int toolIndex,
const wxString& imageFileName,
- wxBitmapType imageFileType,
+ wxBitmapType imageFileType,
const wxString& labelText, bool alignTextRight,
bool isFlat )
{
wxNewBitmapButton* pBtn =
new wxNewBitmapButton( imageFileName, imageFileType,
- labelText,
- ( alignTextRight )
- ? NB_ALIGN_TEXT_RIGHT
+ labelText,
+ ( alignTextRight )
+ ? NB_ALIGN_TEXT_RIGHT
: NB_ALIGN_TEXT_BOTTOM,
isFlat
);
pBtn->Create( this, toolIndex );
pBtn->Reshape();
-
+
AddTool( toolIndex, pBtn );
}
void wxDynamicToolBar::AddTool( int toolIndex, wxBitmap labelBmp,
wxNewBitmapButton* pBtn =
new wxNewBitmapButton( labelBmp,
- labelText,
- ( alignTextRight )
- ? NB_ALIGN_TEXT_RIGHT
+ labelText,
+ ( alignTextRight )
+ ? NB_ALIGN_TEXT_RIGHT
: NB_ALIGN_TEXT_BOTTOM,
isFlat
);
pBtn->Create( this, toolIndex );
pBtn->Reshape();
-
+
AddTool( toolIndex, pBtn );
}
-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)
+wxToolBarToolBase*
+ wxDynamicToolBar::AddTool(const int toolIndex, const wxBitmap& bitmap,
+ 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 );
#if wxUSE_TOOLTIPS
pBmpBtn->SetToolTip( helpString1 );
+#else
+ wxUnusedVar( helpString1 );
#endif // wxUSE_TOOLTIPS
AddTool( toolIndex, pBmpBtn );
size_t i;
for( i = 0; i != mTools.Count(); ++i )
{
- if ( mTools[i]->mIndex == toolIndex )
+ if ( mTools[i]->mIndex == toolIndex )
{
if ( mTools[i]->mpToolWnd )
{
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);
size_t i;
for( i = 0; i != mTools.Count(); ++i )
{
- if ( mTools[i]->mIsSeparator )
+ if ( mTools[i]->mIsSeparator )
{
// check if separator doesn't have it's own window
// if so, then draw it using built-in drawing method
void wxDynamicToolBar::SizeToolWindows()
{
- bool bStateCheckDone = FALSE;
- bool bHorzSeparator = FALSE;
+ bool bStateCheckDone = false;
+ bool bHorzSeparator = false;
int maxWidth = 0;
int maxHeight = 0;
{
wxDynToolInfo& info = *mTools[i];
- if ( !info.mIsSeparator )
+ if ( !info.mIsSeparator )
{
- // center real rectangle within the rectangle
+ // center real rectangle within the rectangle
// provided by the layout manager
int x = info.mRect.x;
// FOR NOW FOR NOW:: quick & dirty fix
if ( info.mpToolWnd->IsKindOf( CLASSINFO( wxChoice ) ) )
{
- info.mpToolWnd->SetSize( x, y,
- info.mRealSize.x - 3,
+ info.mpToolWnd->SetSize( x, y,
+ info.mRealSize.x - 3,
info.mRealSize.y);
}
else
{
- info.mpToolWnd->SetSize( x, y,
- info.mRealSize.x,
+ info.mpToolWnd->SetSize( x, y,
+ info.mRealSize.x,
info.mRealSize.y );
}
}
else
{
- // We performer this code here, so we only execute it when we have
+ // We performer this code here, so we only execute it when we have
// 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;
for( j = 0; j != mTools.Count(); ++j )
{
pInfo = mTools[j];
-
+
// Count all Vert Separators.
- if ( pInfo->mIsSeparator )
+ if ( pInfo->mIsSeparator )
nVertSeparators++;
// Check if the new row starts with a Separator.
// pPrevInfo->mRect.x >= pInfo->mRect.x &&
pPrevInfo->mRect.y < pInfo->mRect.y)
{
- // If the Separator is shown on the next row and it's
- // the only object on the row it would mean that the
+ // If the Separator is shown on the next row and it's
+ // the only object on the row it would mean that the
// Separator should be shown as Horizontal one.
if (j+1 != mTools.Count())
{
maxWidth = wxMax(pInfo->mRect.width, maxWidth);
maxHeight = wxMax(pInfo->mRect.height, maxHeight);
}
-
+
bHorzSeparator = nVertSeparators == 0;
}
-
+
// Check if we should draw Horz or Vert...
if ( !bHorzSeparator )
{
info.mRect.height = mSepartorSize;
}
- // Do we need to set a new size to a seperator object?
+ // Do we need to set a new size to a separator object?
if ( info.mpToolWnd )
{
info.mpToolWnd->SetSize( info.mRect.x,
- info.mRect.y,
- info.mRect.width,
+ info.mRect.y,
+ info.mRect.width,
info.mRect.height);
}
for( i = 0; i != mTools.Count(); ++i )
{
pInfo = mTools[i];
-
- if ( pInfo->mIsSeparator )
+
+ if ( pInfo->mIsSeparator )
{
pInfo->mRect.width = mSepartorSize;
pInfo->mRect.height = mSepartorSize;
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 );
/***** Implementation for class BagLayout *****/
-void BagLayout::Layout( const wxSize& parentDim,
+void BagLayout::Layout( const wxSize& parentDim,
wxSize& resultingDim,
wxLayoutItemArrayT& items,
int horizGap,
- int vertGap
+ int vertGap
)
{
int maxWidth = 0;
if ( curX + r.width > parentDim.x )
{
- if ( itemsInRow > 0 )
+ if ( itemsInRow > 0 )
break;
}
r.x = curX;
//////// 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;
}
projects / wxWidgets.git / blobdiff