Better wxFile support, warning fixes and minor source cleaning.

[wxWidgets.git] / contrib / utils / convertrc / rc2wxr.h

diff --git a/contrib/utils/convertrc/rc2wxr.h b/contrib/utils/convertrc/rc2wxr.h
index 35aeb28bc2fa0d18f31f47994df2c2429ebfdc8b..d01f76591ffb28e3e0bf62b07d9cae7d8ffab9ef 100644 (file)
--- a/contrib/utils/convertrc/rc2wxr.h
+++ b/contrib/utils/convertrc/rc2wxr.h
@@ -8,64 +8,40 @@
 #include "wx/file.h"
 #include "stdio.h"
 
-class wxRC2WXR : public wxObject  
+class rc2wxr : public wxObject
 {
 public:
-wxRC2WXR();
-~wxRC2WXR();
-void Open(wxString wxrfile, wxString rcfile);
+    rc2wxr();
+    ~rc2wxr();
+    void Convert(wxString wxrfile, wxString rcfile);
 
 private:
-wxFile m_rc;
-FILE *m_wxr;
-int m_filesize;
-bool m_done;
-int m_controlid;
-void ParseDialog(wxString dlgname);
-void ParseControls();
-void ParseStaticText();
-void ParseTextCtrl();
-void ParsePushButton();
-bool Seperator(int ch);
-void ParseGroupBox();
-void ReadRect(int & x, int & y, int & width, int & height);
-wxString GetToken();
-wxString GetQuoteField();
-void ReadChar(int &ch);
-void ParseComboBox();
-void ParseMenu(wxString name);
-void ParsePopupMenu();
-wxString PeekToken();
-void ParseControlMS();
-void ParseSlider(wxString label, wxString varname);
-void ParseProgressBar(wxString label, wxString varname);
-bool ReadOrs(wxString & w);
-void ParseCtrlButton(wxString label, wxString varname);
-
-};
-
-class wxFileProgressDlg : public wxDialog
-{
-public:
-       void UpdateProgress(wxFile *f);
-
-wxFileProgressDlg();
-virtual ~wxFileProgressDlg();
-
-protected:
-wxGauge *m_pProgress;
-wxStaticText *m_pCompleteLabel;
-
-  DECLARE_EVENT_TABLE()
-
+    wxFile m_rc;
+    FILE *m_wxr;
+    wxFileOffset m_filesize;
+    bool m_done;
+    int m_controlid;
+    void ParseDialog(wxString dlgname);
+    void ParseControls();
+    void ParseStaticText();
+    void ParseTextCtrl();
+    void ParsePushButton();
+    bool Seperator(int ch);
+    void ParseGroupBox();
+    void ReadRect(int & x, int & y, int & width, int & height);
+    wxString GetToken();
+    wxString GetQuoteField();
+    void ReadChar(int &ch);
+    void ParseComboBox();
+    void ParseMenu(wxString name);
+    void ParsePopupMenu();
+    wxString PeekToken();
+    void ParseControlMS();
+    void ParseSlider(wxString label, wxString varname);
+    void ParseProgressBar(wxString label, wxString varname);
+    bool ReadOrs(wxString & w);
+    void ParseCtrlButton(wxString label, wxString varname);
 };
-class GenerateBitmapSrc : public wxObject  
-{
-public:
-       bool Create(wxString imfile, wxString srcfile,wxString varname);
-       GenerateBitmapSrc();
-       virtual ~GenerateBitmapSrc();
 
-};
 
-#endif
\ No newline at end of file
+#endif