removed SetAutoLayout(true) calls when a corresponding SetSizer() was also called (the latter already calls SetAutoLayout(true) in case of a non-NULL window); usual cleanup: removing tabs and end of line whitespace, TRUE->true, FALSE->false, -1->wxID_ANY, Enable(false)->Disable(), ""->wxEmptyString
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -255,7 +255,6 @@ EditorFrame::EditorFrame(wxFrame *parent, const wxString& filename)
|
||||
m_TreeCtrl->AssignImageList(imgList);
|
||||
sizer->Add(m_TreeCtrl, 1, wxEXPAND);
|
||||
|
||||
SetAutoLayout(true);
|
||||
SetSizer(sizer);
|
||||
|
||||
// Load file:
|
||||
@@ -533,7 +532,7 @@ void EditorFrame::OnToolbar(wxCommandEvent& event)
|
||||
case ID_OPEN :
|
||||
{
|
||||
wxString cwd = wxGetCwd(); // workaround for 2.2
|
||||
wxString name = wxFileSelector(_("Open XML resource"), _T(""), _T(""), _T(""), _("XML resources (*.xrc)|*.xrc"), wxOPEN | wxFILE_MUST_EXIST);
|
||||
wxString name = wxFileSelector(_("Open XML resource"), wxEmptyString, wxEmptyString, wxEmptyString, _("XML resources (*.xrc)|*.xrc"), wxOPEN | wxFILE_MUST_EXIST);
|
||||
wxSetWorkingDirectory(cwd);
|
||||
if (!name.IsEmpty())
|
||||
LoadFile(name);
|
||||
@@ -547,7 +546,7 @@ void EditorFrame::OnToolbar(wxCommandEvent& event)
|
||||
case ID_SAVEAS :
|
||||
{
|
||||
wxString cwd = wxGetCwd(); // workaround for 2.2
|
||||
wxString name = wxFileSelector(_("Save as"), _T(""), m_FileName, _T(""), _("XML resources (*.xrc)|*.xrc"), wxSAVE | wxOVERWRITE_PROMPT);
|
||||
wxString name = wxFileSelector(_("Save as"), wxEmptyString, m_FileName, wxEmptyString, _("XML resources (*.xrc)|*.xrc"), wxSAVE | wxOVERWRITE_PROMPT);
|
||||
wxSetWorkingDirectory(cwd);
|
||||
if (!name.IsEmpty())
|
||||
SaveFile((m_FileName = name));
|
||||
|
Reference in New Issue
Block a user