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

use filter index first, then the path to find the correct template

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7762 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-07-19 07:14:28 +00:00
parent 8f3299d8ee
commit 3d68c787aa
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/docview.cpp
View File

@@ -1364,7 +1364,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
wxString descrBuf = wxT("*.*"); wxString descrBuf = wxT("*.*");
#endif #endif
int FilterIndex = 0; int FilterIndex = -1;
wxWindow* parent = wxFindSuitableParent(); wxWindow* parent = wxFindSuitableParent();
@@ -1396,13 +1396,13 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
path = pathTmp; path = pathTmp;
// This is dodgy in that we're selecting the template on the // first choose the template using the extension, if this fails (i.e.
// basis of the file extension, which may not be a standard // wxFileSelectorEx() didn't fill it), then use the path
// one. We really want to know exactly which template was wxDocTemplate *theTemplate = (wxDocTemplate *)NULL;
// chosen by using a more advanced file selector. if ( FilterIndex != -1 )
wxDocTemplate *theTemplate = FindTemplateForPath(path);
if ( !theTemplate )
theTemplate = templates[FilterIndex]; theTemplate = templates[FilterIndex];
if ( !theTemplate )
theTemplate = FindTemplateForPath(path);
return theTemplate; return theTemplate;
} }