X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be5a51fb592f3fa2ba38ac6cd1e488d6d806058c..0daf5e6be21cf6e491447adff8f3c1aad440c456:/contrib/utils/convertrc/convert.cpp

diff --git a/contrib/utils/convertrc/convert.cpp b/contrib/utils/convertrc/convert.cpp
index 93d3626de0..078c29d5e5 100644
--- a/contrib/utils/convertrc/convert.cpp
+++ b/contrib/utils/convertrc/convert.cpp
@@ -5,11 +5,6 @@
 3.  Converts portions of an .RC file into a wxr file
 */
 
-#ifdef __GNUG__
-#pragma implementation "convert.cpp"
-#pragma interface "convert.cpp"
-#endif
-
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
@@ -20,10 +15,10 @@
 // for all others, include the necessary headers (this file is usually all you
 // need because it includes almost all "standard" wxWidgets headers
 #ifndef WX_PRECOMP
-#include <wx/wx.h>
+#include "wx/wx.h"
 #endif
 
-#include <wx/image.h>
+#include "wx/image.h"
 
 #include "wx/deprecated/setup.h"
 #include "wx/deprecated/resource.h"
@@ -58,17 +53,17 @@ bool wxConvertApp::OnInit()
     SetAppName(_T("wxConvertApp"));
 
     if (HandleCommandLine())
-        return TRUE;
+        return true;
 
 
 // Create the main frame window
-    m_pFrame = new wxMainFrame(NULL, -1, _T("wxConvertApp"), wxPoint(0, 0), wxSize(500, 400),
+    m_pFrame = new wxMainFrame(NULL, wxID_ANY, _T("wxConvertApp"), wxPoint(0, 0), wxSize(500, 400),
         wxDEFAULT_FRAME_STYLE | wxHSCROLL | wxVSCROLL);
 
     InitMenu();
-    m_pFrame->Show(TRUE);
+    m_pFrame->Show(true);
     SetTopWindow(m_pFrame);
-    return TRUE;
+    return true;
 }
 
 void wxConvertApp::InitMenu()
@@ -122,77 +117,78 @@ wxMainFrame::~wxMainFrame()
 
 void wxMainFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
-    Close(TRUE);
+    Close(true);
 }
 
 
 void wxMainFrame::OnRc2Wxr(wxCommandEvent& WXUNUSED(event))
 {
-    wxFileDialog filed(this);
-    filed.SetWildcard(_T("*.rc"));
-    filed.SetStyle(wxOPEN);
+#if wxUSE_FILEDLG
+    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(wxOPEN);
-    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;
 
     rc2wxr convert;
     convert.Convert(wxrfile.GetPath(),filed.GetPath());
+#endif // wxUSE_FILEDLG
 }
 
 void wxMainFrame::OnWXR2XML(wxCommandEvent& WXUNUSED(event))
 {
+#if wxUSE_FILEDLG
     wxFileDialog f(this);
     f.SetWildcard(_T("*.wxr"));
     if (f.ShowModal()!=wxID_OK)
         return;
 
 
-    wxFileDialog xmlfile(this,_T("Enter Desired XML file name"));
-    xmlfile.SetWildcard(_T("*.xml"));
-    xmlfile.SetStyle(wxOPEN);
-    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;
 
     wxr2xml XMLCon;
     XMLCon.Convert(f.GetPath(),xmlfile.GetPath());
-
+#endif // wxUSE_FILEDLG
 }
 
 void wxMainFrame::OnRC2XML(wxCommandEvent& WXUNUSED(event))
 {
+#if wxUSE_FILEDLG
     wxFileDialog f(this);
     f.SetWildcard(_T("*.rc"));
     if (f.ShowModal()!=wxID_OK)
         return;
 
-    wxFileDialog xmlfile(this,_T("Enter Desired XML file name"));
-    xmlfile.SetWildcard(_T("*.xml"));
-    xmlfile.SetStyle(wxOPEN);
-    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;
 
     rc2xml XMLCon;
     XMLCon.Convert(f.GetPath(),xmlfile.GetPath());
-
+#endif // wxUSE_FILEDLG
 }
 
 bool wxConvertApp::HandleCommandLine()
 {
 
    if (argc != 2)
-       return FALSE;
+       return false;
 
 //Figure out kind of conversion
     wxString source,target;
@@ -208,18 +204,18 @@ bool wxConvertApp::HandleCommandLine()
     if ((source.Find(_T(".wxr"))>0)&&(target.Find(_T(".xml"))>0))
         {
         trans_wxr2xml.Convert(source,target);
-        return TRUE;
+        return true;
         }
-    else if ((source.Find(_T(".rc"))!=-1)&(target.Find(_T(".wxr"))!=-1))
+    else if ((source.Find(_T(".rc"))!=wxNOT_FOUND)&(target.Find(_T(".wxr"))!=wxNOT_FOUND))
         {
         trans_rc2wxr.Convert(source,target);
-        return TRUE;
+        return true;
         }
-    else if ((source.Find(_T(".rc"))!=-1)&(target.Find(_T(".xml"))!=-1))
+    else if ((source.Find(_T(".rc"))!=wxNOT_FOUND)&(target.Find(_T(".xml"))!=wxNOT_FOUND))
         {
         trans_rc2xml.Convert(source,target);
-        return TRUE;
+        return true;
         }
 
-    return FALSE;
+    return false;
 }