Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-28 22:28:44 +02:00
Code Issues Releases Wiki Activity

Fix Windows build, and some compilation warnings

Browse Source
This commit is contained in:
Paul Licameli 2016-06-13 09:42:24 -04:00
parent 78e16f6e20
commit c3437b1d6e
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/toolbars/ToolDock.cpp
View File

@ -22,6 +22,7 @@
*//**********************************************************************/
#include "../Audacity.h"
#include <wx/tokenzr.h>
// For compilers that support precompilation, includes "wx/wx.h".
#include <wx/wxprec.h>
@ -33,7 +34,6 @@
#include <wx/intl.h>
#include <wx/panel.h>
#include <wx/settings.h>
#include <wx/tokenzr.h>
#include <wx/window.h>
#endif /* */
@ -232,7 +232,6 @@ bool ToolBarConfiguration::IsRightmost(const ToolBar *bar) const
bool ToolBarConfiguration::Read
(ToolBarConfiguration *pConfiguration,
ToolManager *pManager,
Legacy *pLegacy,
ToolBar *bar, bool &visible, bool defaultVisible)
{
@ -248,7 +247,7 @@ bool ToolBarConfiguration::Read
else if (ord >= 0)
{
// Legacy preferences
while (pLegacy->bars.size() <= ord)
while (pLegacy->bars.size() <= size_t(ord))
pLegacy->bars.push_back(nullptr);
pLegacy->bars[ord] = bar;
}
@ -277,7 +276,7 @@ bool ToolBarConfiguration::Read
void ToolBarConfiguration::RemoveNulls(Forest &forest)
{
for (int ii = 0; ii < forest.size(); ++ii) {
for (size_t ii = 0; ii < forest.size(); ++ii) {
if(forest[ii].pBar == nullptr)
Remove(forest, forest.begin() + ii--);
}
@ -410,7 +409,7 @@ void ToolDock::Dock( ToolBar *bar, bool deflate, ToolBarConfiguration::Position
}
// Initial docking of bars
void ToolDock::LoadConfig(ToolBar *bars[])
void ToolDock::LoadConfig()
{
// Add all ordered toolbars
for(const auto &place : GetConfiguration()) {
@ -431,7 +430,9 @@ public:
ToolBarConfiguration::Position prevPosition,
ToolBarConfiguration::Position position,
wxSize &sz)
{}
{
ct; rect; prevPosition; position; sz;
}
virtual void Visit
(ToolBar *ct, wxPoint point) = 0;
@ -440,7 +441,9 @@ public:
virtual void FinalRect
(const wxRect &rect, ToolBarConfiguration::Position finalPosition)
{}
{
rect; finalPosition;
}
};
void ToolDock::VisitLayout(LayoutVisitor &visitor,
@ -473,7 +476,7 @@ void ToolDock::VisitLayout(LayoutVisitor &visitor,
ToolBar *lastWrappedRoot {};
// Process all docked and visible toolbars
for ( const auto &place : GetConfiguration() )
for ( const auto &place : this->GetConfiguration() )
{
// Cache toolbar pointer
const auto ct = place.pTree->pBar;
@ -550,7 +553,7 @@ void ToolDock::VisitLayout(LayoutVisitor &visitor,
// Record where the toolbar wrapped
ToolBar *& sib = pItem ? pItem->lastWrappedChild : lastWrappedRoot;
ToolBarConfiguration::Position newPosition {
pItem ? mBars[ pItem->myBarID ] : nullptr,
pItem ? this->mBars[ pItem->myBarID ] : nullptr,
sib
};
sib = ct;
@ -596,7 +599,7 @@ void ToolDock::VisitLayout(LayoutVisitor &visitor,
// Let the visitor determine size
wxSize sz {};
ToolBarConfiguration::Position
position { mBars[ item.myBarID ], item.lastWrappedChild },
position { this->mBars[ item.myBarID ], item.lastWrappedChild },
prevPosition {};
visitor.ModifySize(nullptr, globalRect, prevPosition, position, sz);
int tw = sz.GetWidth() + toolbarGap;
@ -763,7 +766,7 @@ ToolBarConfiguration::Position
result, rect, pos, t
};
try { VisitLayout(inserter); } catch (const Inserter::Stop&) {}
try { this->VisitLayout(inserter); } catch (const Inserter::Stop&) {}
// rect is decided
return result;

3
src/toolbars/ToolDock.h
View File

@ -252,7 +252,6 @@ public:
static bool Read
(ToolBarConfiguration *pConfiguration,
ToolManager *pManager,
Legacy *pLegacy,
ToolBar *bar, bool &visible, bool defaultVisible);
void PostRead(Legacy &legacy);
@ -292,7 +291,7 @@ public:
bool AcceptsFocus() const override { return false; };
void LoadConfig(ToolBar *bars[]);
void LoadConfig();
void LayoutToolBars();
void Expose( int type, bool show );
int GetOrder( ToolBar *bar );

3
src/toolbars/ToolManager.cpp
View File

@ -719,7 +719,6 @@ void ToolManager::ReadConfig()
bool ordered = ToolBarConfiguration::Read
(d ? &d->GetConfiguration() : nullptr,
this,
pLegacy,
bar, show[ ndx ], bShownByDefault)
&& found;
@ -832,7 +831,7 @@ void ToolManager::ReadConfig()
{
ToolDock *d = ( dock + 1 == TopDockID ? mTopDock : mBotDock );
d->LoadConfig(mBars);
d->LoadConfig();
// Add all unordered toolbars
for( int ord = 0; ord < (int) unordered[ dock ].GetCount(); ord++ )