10.2 fixes

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

diff --git a/contrib/utils/convertrc/rc2xml.h b/contrib/utils/convertrc/rc2xml.h
index 04b5e7485a12d8734e173b2f5ee644b61ebbceb2..0481665f4bb3f3ccf5232326fdeedc838105896f 100644 (file)
--- a/contrib/utils/convertrc/rc2xml.h
+++ b/contrib/utils/convertrc/rc2xml.h
@@ -10,7 +10,7 @@
 #include <wx/list.h>
 
 
 #include <wx/list.h>
 
 

-class rc2xml : public wxObject  
+class rc2xml : public wxObject

 {
 public:
     wxString m_workingpath;
 {
 public:
     wxString m_workingpath;


@@ -22,8 +22,8 @@ public:
     ~rc2xml();
 
 protected:
     ~rc2xml();
 
 protected:

-       wxString LookUpId(wxString id);
-       
+    wxString LookUpId(wxString id);
+

     void ParseResourceHeader();
     void WriteBitmap(wxString bitmapname);
     void ParseListCtrl(wxString label,wxString varname);
     void ParseResourceHeader();
     void WriteBitmap(wxString bitmapname);
     void ParseListCtrl(wxString label,wxString varname);


@@ -37,7 +37,7 @@ protected:
     wxList * m_iconlist;
     void ParseIconStatic();
     void ParseMenuItem();
     wxList * m_iconlist;
     void ParseIconStatic();
     void ParseMenuItem();

-       
+

 //Functions
     bool SplitHelp(wxString msg, wxString &shorthelp, wxString &longhelp);
     bool LookUpString(wxString strid,wxString & st);
 //Functions
     bool SplitHelp(wxString msg, wxString &shorthelp, wxString &longhelp);
     bool LookUpString(wxString strid,wxString & st);


@@ -52,17 +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 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 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 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();


@@ -90,4 +93,4 @@ protected:
 };
 
 
 };
 
 

-#endif
\ No newline at end of file
+#endif