Fixed toolbar crash for MinGW/Cygwin

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

diff --git a/contrib/utils/convertrc/rc2xml.h b/contrib/utils/convertrc/rc2xml.h
index 6b2fbf85559eb791a8d0b39c5f7e6e83b08f2007..184a8dadfb216c5801fa0f2374570afb02db6964 100644 (file)
--- a/contrib/utils/convertrc/rc2xml.h
+++ b/contrib/utils/convertrc/rc2xml.h
@@ -13,6 +13,8 @@
 class rc2xml : public wxObject  
 {
 public:
 class rc2xml : public wxObject  
 {
 public:

+    wxString m_workingpath;
+    wxString m_targetpath;

     void WriteIcon(wxString iconname);
     void ParseNormalMSControl();
     bool Convert(wxString rcfile, wxString xmlfile);
     void WriteIcon(wxString iconname);
     void ParseNormalMSControl();
     bool Convert(wxString rcfile, wxString xmlfile);


@@ -53,11 +55,13 @@ protected:
     void ParseListBox();
     void ParseStaticText();
     void ParseTextCtrl();
     void ParseListBox();
     void ParseStaticText();
     void ParseTextCtrl();

+    void ParseRadioButton();
+    void ParseCheckBox();

     void ParsePushButton();
     bool Seperator(int ch);
     void ParseGroupBox();
     void ParsePushButton();
     bool Seperator(int ch);
     void ParseGroupBox();

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

     wxString GetQuoteField();
     void ReadChar(int &ch);
     void ParseComboBox();
     wxString GetQuoteField();
     void ReadChar(int &ch);
     void ParseComboBox();