Skip to content

Commit

Permalink
Compile fix after wxFileDialog::SetStyle removal
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39737 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
  • Loading branch information
Michael Wetherell committed Jun 15, 2006
1 parent 063708f commit 936d572
Showing 1 changed file with 12 additions and 15 deletions.
27 changes: 12 additions & 15 deletions contrib/utils/convertrc/convert.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down

0 comments on commit 936d572

Please sign in to comment.