Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-23 17:30:17 +01:00
Code Issues Releases Wiki Activity

Remove second argument of AddWindow(), use Position() instead

Browse Source
This commit is contained in:
Paul Licameli
2017-10-31 19:44:00 -04:00
parent b5ee7676fd
commit 96291c5476
22 changed files with 120 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ShuttleGui.cpp
View File

@@ -271,13 +271,13 @@ void ShuttleGuiBase::AddTitle(const wxString &Prompt)
/// Very generic 'Add' function. We can add anything we like.
/// Useful for unique controls
wxWindow * ShuttleGuiBase::AddWindow(wxWindow * pWindow, int Flags )
wxWindow * ShuttleGuiBase::AddWindow(wxWindow * pWindow)
{
if( mShuttleMode != eIsCreating )
return pWindow;
mpWind = pWindow;
SetProportions( 0 );
UpdateSizersCore(false, Flags);
UpdateSizersCore(false, wxALIGN_CENTRE | wxALL);
return pWindow;
}
@@ -2042,14 +2042,20 @@ void ShuttleGuiBase::UpdateSizersCore(bool bPrepend, int Flags, bool prompt)
{
if( mpWind && mpParent )
{
int useFlags = Flags;
if ( !prompt && mItem.mWindowPositionFlags )
// override the given Flags
useFlags = mItem.mWindowPositionFlags;
if( mpSizer){
if( bPrepend )
{
mpSizer->Prepend(mpWind, miProp, Flags,miBorder);
mpSizer->Prepend(mpWind, miProp, useFlags, miBorder);
}
else
{
mpSizer->Add(mpWind, miProp, Flags,miBorder);
mpSizer->Add(mpWind, miProp, useFlags, miBorder);
}
}