Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove unneeded wxFindSuitableParent()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-05-09 12:57:00 +00:00
parent e4d531ee8d
commit b6e96faf3e
1 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/common/docview.cpp
View File

@@ -105,13 +105,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxFileHistory, wxObject)
namespace
{
wxWindow *wxFindSuitableParent()
{
wxWindow * const win = wxGetTopLevelParent(wxWindow::FindFocus());
return win ? win : wxTheApp->GetTopWindow();
}
wxString FindExtension(const wxString& path)
{
wxString ext;
@@ -489,8 +482,7 @@ bool wxDocument::OnSaveModified()
GetUserReadableName()
),
wxTheApp->GetAppDisplayName(),
wxYES_NO | wxCANCEL | wxICON_QUESTION | wxCENTRE,
wxFindSuitableParent()
wxYES_NO | wxCANCEL | wxICON_QUESTION | wxCENTRE
) )
{
case wxNO:
@@ -1566,15 +1558,11 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
int FilterIndex = -1;
wxWindow* parent = wxFindSuitableParent();
wxString pathTmp = wxFileSelectorEx(_("Open File"),
GetLastDirectory(),
wxEmptyString,
&FilterIndex,
descrBuf,
0,
parent);
descrBuf);
wxDocTemplate *theTemplate = NULL;
if (!pathTmp.empty())
@@ -1589,8 +1577,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
wxMessageBox(_("Sorry, could not open this file."),
msgTitle,
wxOK | wxICON_EXCLAMATION | wxCENTRE,
parent);
wxOK | wxICON_EXCLAMATION | wxCENTRE);
path = wxEmptyString;
return NULL;
@@ -1613,8 +1600,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
// allowed templates in runtime.
wxMessageBox(_("Sorry, the format for this file is unknown."),
_("Open File"),
wxOK | wxICON_EXCLAMATION | wxCENTRE,
parent);
wxOK | wxICON_EXCLAMATION | wxCENTRE);
}
}
else
@@ -1696,8 +1682,7 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
_("Select a document template"),
_("Templates"),
strings,
(void **)data.get(),
wxFindSuitableParent()
(void **)data.get()
);
}
@@ -1771,8 +1756,7 @@ wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
_("Select a document view"),
_("Views"),
strings,
(void **)data.get(),
wxFindSuitableParent()
(void **)data.get()
);
}