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 9f1c18b29efd6527fdf34134aa31fa5034f6bf97..0b53937bff5c523b510ab84f545073c04245ffa2 100644 (file)
--- a/contrib/utils/convertrc/rc2xml.h
+++ b/contrib/utils/convertrc/rc2xml.h
@@ -52,19 +52,20 @@ protected:
     void ParseRichEdit(wxString label, wxString varname);
     void ParseDialog(wxString dlgname);
     void ParseControls();
     void ParseRichEdit(wxString label, wxString varname);
     void ParseDialog(wxString dlgname);
     void ParseControls();

-    void ParseListBox();
-    void ParseStaticText();
-    void ParseTextCtrl();
-    void ParseRadioButton();
-    void ParseCheckBox();
-    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);
     bool Seperator(int ch);

-    void ParseGroupBox();
+    void ParseGroupBox(wxString phrase, wxString varname);

     bool ReadRect(int & x, int & y, int & width, int & height);
     wxString GetToken(bool *listseperator = 0);
     wxString GetQuoteField();
     bool ReadRect(int & x, int & y, int & width, int & height);
     wxString GetToken(bool *listseperator = 0);
     wxString GetQuoteField();

+    wxString GetStringQuote();

     void ReadChar(int &ch);
     void ReadChar(int &ch);

-    void ParseComboBox();
+    void ParseComboBox(wxString varname);

     void ParseMenu(wxString varname);
     void ParsePopupMenu();
     wxString PeekToken();
     void ParseMenu(wxString varname);
     void ParsePopupMenu();
     wxString PeekToken();