// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
- #pragma implementation "dyntbar.h"
-#endif
-
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
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 WXUNUSED(orientation), const int WXUNUSED(RowsOrColumns),
+ const long style,
+ const int WXUNUSED(orientation), const int WXUNUSED(RowsOrColumns),
const wxString& name)
{
// cut&pasted from wxtbatsmpl.h
}
}
-void wxDynamicToolBar::AddTool( int toolIndex,
- wxWindow* pToolWindow,
+void wxDynamicToolBar::AddTool( int toolIndex,
+ wxWindow* pToolWindow,
const wxSize& WXUNUSED(size)
)
{
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,
+wxToolBarToolBase*
+ wxDynamicToolBar::AddTool(const int toolIndex, const wxBitmap& bitmap,
const wxBitmap& WXUNUSED(pushedBitmap),
- const bool WXUNUSED(toggle), const long WXUNUSED(xPos),
+ const bool WXUNUSED(toggle), const long WXUNUSED(xPos),
const long WXUNUSED(yPos), wxObject *WXUNUSED(clientData),
const wxString& helpString1, const wxString& WXUNUSED(helpString2))
{
#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 )
{
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
{
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;
-
+
size_t j;
wxDynToolInfo *pInfo;
wxDynToolInfo *pPrevInfo = NULL;
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 )
{
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;
/***** 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;
{
}
-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),
+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)
)
{
projects / wxWidgets.git / blobdiff