Changed type of bitmaps. RC of DMC reported 'is not a valid Windows 3.0 or OS/2 1...

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

diff --git a/contrib/utils/convertrc/rc2xml.h b/contrib/utils/convertrc/rc2xml.h
index 6b2fbf85559eb791a8d0b39c5f7e6e83b08f2007..0b53937bff5c523b510ab84f545073c04245ffa2 100644 (file)
--- a/contrib/utils/convertrc/rc2xml.h
+++ b/contrib/utils/convertrc/rc2xml.h
@@ -13,6 +13,8 @@
 class rc2xml : public wxObject  
 {
 public:
+    wxString m_workingpath;
+    wxString m_targetpath;
     void WriteIcon(wxString iconname);
     void ParseNormalMSControl();
     bool Convert(wxString rcfile, wxString xmlfile);
@@ -50,17 +52,20 @@ protected:
     void ParseRichEdit(wxString label, wxString varname);
     void ParseDialog(wxString dlgname);
     void ParseControls();
-    void ParseListBox();
-    void ParseStaticText();
-    void ParseTextCtrl();
-    void ParsePushButton();
+    void ParseListBox(wxString varname);
+    void ParseStaticText(wxString phrase,wxString varname);
+    void ParseTextCtrl(wxString varname);
+    void ParseRadioButton(wxString phrase,wxString varname);
+    void ParseCheckBox(wxString phrase,wxString varname);
+    void ParsePushButton(wxString phrase, wxString varname);
     bool Seperator(int ch);
-    void ParseGroupBox();
-    void ReadRect(int & x, int & y, int & width, int & height);
-    wxString GetToken();
+    void ParseGroupBox(wxString phrase, wxString varname);
+    bool ReadRect(int & x, int & y, int & width, int & height);
+    wxString GetToken(bool *listseperator = 0);
     wxString GetQuoteField();
+    wxString GetStringQuote();
     void ReadChar(int &ch);
-    void ParseComboBox();
+    void ParseComboBox(wxString varname);
     void ParseMenu(wxString varname);
     void ParsePopupMenu();
     wxString PeekToken();
@@ -88,4 +93,4 @@ protected:
 };
 
 
-#endif
\ No newline at end of file
+#endif