Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv31024
Modified Files:
ShuttleGui.h ShuttleGui.cpp
Log Message:
Allow positioning flags
Index: ShuttleGui.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/ShuttleGui.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- ShuttleGui.h 8 Apr 2007 09:11:26 -0000 1.18
+++ ShuttleGui.h 21 Apr 2007 19:36:18 -0000 1.19
@@ -74,7 +74,7 @@
wxRadioButton * AddRadioButtonToGroup( const wxString & Prompt);
wxButton * AddButton( const wxString & Text, int PositionFlags =
wxALIGN_CENTRE );
wxBitmapButton * AddBitmapButton(const wxBitmap &Bitmap, int PositionFlags
= wxALIGN_CENTRE);
- wxStaticText * AddVariableText(const wxString &Str, bool bCenter = false);
+ wxStaticText * AddVariableText(const wxString &Str, bool bCenter = false,
int PositionFlags = 0);
wxTextCtrl * AddTextBox(const wxString &Caption, const wxString &Value,
const int nChars);
wxTextCtrl * AddTextWindow(const wxString &Value);
wxListCtrl * AddListControl();
Index: ShuttleGui.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/ShuttleGui.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- ShuttleGui.cpp 8 Apr 2007 09:11:26 -0000 1.27
+++ ShuttleGui.cpp 21 Apr 2007 19:36:18 -0000 1.28
@@ -362,7 +362,7 @@
UpdateSizers();
}
-wxStaticText * ShuttleGuiBase::AddVariableText(const wxString &Str, bool
bCenter)
+wxStaticText * ShuttleGuiBase::AddVariableText(const wxString &Str, bool
bCenter, int PositionFlags)
{
UseUpId();
if( mShuttleMode != eIsCreating )
@@ -374,10 +374,16 @@
if( bCenter )
{
miProp=1;
- UpdateSizersC();
+ if( PositionFlags )
+ UpdateSizersCore( false, PositionFlags );
+ else
+ UpdateSizersC();
}
else
- UpdateSizers();
+ if( PositionFlags )
+ UpdateSizersCore( false, PositionFlags );
+ else
+ UpdateSizers();
return pStatic;
}
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
