Update of /cvsroot/audacity/audacity-src/src/import
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv3293/import
Modified Files:
ImportRaw.cpp
Log Message:
Layout 'effects' OK/Cancel buttons consistently on all platforms.
Index: ImportRaw.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/import/ImportRaw.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- ImportRaw.cpp 12 Mar 2007 09:23:14 -0000 1.29
+++ ImportRaw.cpp 29 Jul 2007 19:52:09 -0000 1.30
@@ -282,7 +282,6 @@
{
wxBoxSizer *mainSizer, *hSizer, *vSizer;
wxFlexGridSizer *gridSizer;
- wxButton *button;
int selection, i;
mainSizer = new wxBoxSizer(wxVERTICAL);
@@ -327,7 +326,7 @@
wxDefaultPosition, wxDefaultSize,
mNumEncodings, mEncodingString);
mEncodingChoice->SetSelection(selection);
- vSizer->Add(mEncodingChoice, 0, wxALIGN_LEFT | wxALL, 5);
+ vSizer->Add(mEncodingChoice, 0, wxALIGN_CENTER | wxALL, 5);
// Endian choice
@@ -362,7 +361,7 @@
mEndianChoice->SetSelection(3);
break;
}
- vSizer->Add(mEndianChoice, 0, wxALIGN_LEFT | wxALL, 5);
+ vSizer->Add(mEndianChoice, 0, wxALIGN_CENTER | wxALL, 5);
// Channels choice
@@ -377,7 +376,7 @@
wxDefaultPosition, wxDefaultSize,
16, channelStrings);
mChannelChoice->SetSelection(mChannels-1);
- vSizer->Add(mChannelChoice, 0, wxALIGN_LEFT | wxALL, 5);
+ vSizer->Add(mChannelChoice, 0, wxALIGN_CENTER | wxALL, 5);
// Offset text
@@ -424,8 +423,8 @@
// Preview Pane goes here
//
- wxPanel *p = new wxPanel(this, 0, wxDefaultPosition, wxSize(100, 100));
- hSizer->Add(p, 0, wxALIGN_TOP | wxALL, 5);
+// wxPanel *p = new wxPanel(this, 0, wxDefaultPosition, wxSize(100, 100));
+// hSizer->Add(p, 0, wxALIGN_TOP | wxALL, 5);
mainSizer->Add(hSizer, 0, wxALIGN_CENTER | wxALL, 5);
@@ -433,21 +432,16 @@
// Button row
//
- hSizer = new wxBoxSizer(wxHORIZONTAL);
/*
button = new wxButton(this, PlayID, _("Play"));
hSizer->Add(button, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5);
*/
- button = new wxButton(this, wxID_CANCEL, _("&Cancel"));
- hSizer->Add(button, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5);
-
- mOK = new wxButton(this, wxID_OK, _("Import"));
- mOK->SetDefault();
- hSizer->Add(mOK, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5);
-
- mainSizer->Add(hSizer, 0, wxALIGN_CENTER | wxALL, 5);
+ mainSizer->Add(CreateStdButtonSizer(this, eCancelButton|eOkButton), 0,
wxEXPAND);
+ wxButton * OKButton;
+ OKButton = (wxButton *)wxWindow::FindWindowById(wxID_OK, this);
+ OKButton->SetLabel(_("&Import"));
SetAutoLayout(true);
SetSizer(mainSizer);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
