From 936d5729e2db0a5ca53bfadd3885fd163925e856 Mon Sep 17 00:00:00 2001 From: Michael Wetherell Date: Thu, 15 Jun 2006 10:20:32 +0000 Subject: [PATCH] Compile fix after wxFileDialog::SetStyle removal git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39737 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/utils/convertrc/convert.cpp | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/contrib/utils/convertrc/convert.cpp b/contrib/utils/convertrc/convert.cpp index 55cb0a878c..078c29d5e5 100644 --- a/contrib/utils/convertrc/convert.cpp +++ b/contrib/utils/convertrc/convert.cpp @@ -124,17 +124,16 @@ void wxMainFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) void wxMainFrame::OnRc2Wxr(wxCommandEvent& WXUNUSED(event)) { #if wxUSE_FILEDLG - wxFileDialog filed(this); - filed.SetWildcard(_T("*.rc")); - filed.SetStyle(wxFD_OPEN); + wxFileDialog filed(this, wxEmptyString, + wxEmptyString, wxEmptyString, + _T("*.rc"), wxFD_OPEN); if (filed.ShowModal()!=wxID_OK) return; - wxFileDialog wxrfile(this,_T("Enter Desired WXR file name")); - wxrfile.SetWildcard(_T("*.wxr")); - wxrfile.SetStyle(wxFD_OPEN); - wxrfile.SetFilename(_T("resource.wxr")); + wxFileDialog wxrfile(this, _T("Enter Desired WXR file name"), + wxEmptyString, _T("resource.wxr"), + _T("*.wxr"), wxFD_OPEN); if (wxrfile.ShowModal()!=wxID_OK) return; @@ -153,10 +152,9 @@ void wxMainFrame::OnWXR2XML(wxCommandEvent& WXUNUSED(event)) return; - wxFileDialog xmlfile(this,_T("Enter Desired XML file name")); - xmlfile.SetWildcard(_T("*.xml")); - xmlfile.SetStyle(wxFD_OPEN); - xmlfile.SetFilename(_T("resource.xml")); + wxFileDialog xmlfile(this,_T("Enter Desired XML file name"), + wxEmptyString, _T("resource.xml"), + _T("*.xml"), wxFD_OPEN); if (xmlfile.ShowModal()!=wxID_OK) return; @@ -174,10 +172,9 @@ void wxMainFrame::OnRC2XML(wxCommandEvent& WXUNUSED(event)) if (f.ShowModal()!=wxID_OK) return; - wxFileDialog xmlfile(this,_T("Enter Desired XML file name")); - xmlfile.SetWildcard(_T("*.xml")); - xmlfile.SetStyle(wxFD_OPEN); - xmlfile.SetFilename(_T("resource.xml")); + wxFileDialog xmlfile(this,_T("Enter Desired XML file name"), + wxEmptyString, _T("resource.xml"), + _T("*.xml"), wxFD_OPEN); if (xmlfile.ShowModal()!=wxID_OK) return;