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

Efficiency measures; file loading bug fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-10-20 12:55:53 +00:00
parent 3811368401
commit 1e967276d8
5 changed files with 230 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
samples/richtext/richtext.cpp
View File

@@ -698,14 +698,15 @@ bool MyFrame::ProcessEvent(wxEvent& event)
void MyFrame::OnOpen(wxCommandEvent& WXUNUSED(event))
{
wxString filter = wxRichTextBuffer::GetExtWildcard(false, false);
wxString path = wxEmptyString;
wxString filename = wxEmptyString;
wxArrayInt fileTypes;
wxString filter = wxRichTextBuffer::GetExtWildcard(false, false, & fileTypes);
if (!filter.IsEmpty())
filter += wxT("|");
filter += wxT("All files (*.*)|*.*");
wxString path = wxEmptyString;
wxString filename = wxEmptyString;
wxFileDialog dialog(this,
_("Choose a filename"),
path,
@@ -719,7 +720,13 @@ void MyFrame::OnOpen(wxCommandEvent& WXUNUSED(event))
if (!path.IsEmpty())
{
m_richTextCtrl->LoadFile(path);
int fileType = 0;
int filterIndex = dialog.GetFilterIndex();
if (filterIndex < (int) fileTypes.GetCount())
fileType = fileTypes[filterIndex];
else
fileType = wxRICHTEXT_TYPE_TEXT;
m_richTextCtrl->LoadFile(path, fileType);
}
}
}