compilation/build fixes for wxUniv

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

diff --git a/contrib/utils/convertrc/rc2xml.h b/contrib/utils/convertrc/rc2xml.h
index 697efea0854a656e4cdad57b6c571a18f1ac1aa0..184a8dadfb216c5801fa0f2374570afb02db6964 100644 (file)
--- a/contrib/utils/convertrc/rc2xml.h
+++ b/contrib/utils/convertrc/rc2xml.h
@@ -10,74 +10,84 @@
 #include <wx/list.h>
 
 
-class wxRC2XML : public wxObject  
+class rc2xml : public wxObject  
 {
 public:
-       void ParseNormalMSControl();
-bool Convert(wxString rcfile, wxString xmlfile);
-wxRC2XML();
-~wxRC2XML();
+    wxString m_workingpath;
+    wxString m_targetpath;
+    void WriteIcon(wxString iconname);
+    void ParseNormalMSControl();
+    bool Convert(wxString rcfile, wxString xmlfile);
+    rc2xml();
+    ~rc2xml();
 
 protected:
-       void ParseListCtrl(wxString label,wxString varname);
-       void ParseCalendar(wxString label,wxString varname);
-       void ParseTreeCtrl(wxString label,wxString varname);
-       void ParseScrollBar();
-       void ParseWeirdMSControl();
-       void ParseStaticBitmap(wxString label,wxString varname);
-       wxString CleanName(wxString name);
-       void ParseIcon(wxString varname);
-       wxList * m_iconlist;
-       void ParseIconStatic();
-       void ParseMenuItem();
+       wxString LookUpId(wxString id);
+       
+    void ParseResourceHeader();
+    void WriteBitmap(wxString bitmapname);
+    void ParseListCtrl(wxString label,wxString varname);
+    void ParseCalendar(wxString label,wxString varname);
+    void ParseTreeCtrl(wxString label,wxString varname);
+    void ParseScrollBar();
+    void ParseWeirdMSControl();
+    void ParseStaticBitmap(wxString label,wxString varname);
+    wxString CleanName(wxString name);
+    void ParseIcon(wxString varname);
+    wxList * m_iconlist;
+    void ParseIconStatic();
+    void ParseMenuItem();
        
 //Functions
-bool SplitHelp(wxString msg, wxString &shorthelp, wxString &longhelp);
-bool LookUpString(wxString strid,wxString & st);
-void ParseStringTable(wxString varname);
-void WriteToolButton(wxString name,int index,int width,int height,wxBitmap bitmap);
-wxString LookupString(wxString varname,wxStringList id,wxStringList msg);
-void ParseToolBar(wxString varname);
-void SecondPass();
-void FirstPass();
-void ParseBitmap(wxString varname);
-void ParseSpinCtrl(wxString label,wxString varname);
-void ParseRichEdit(wxString label, wxString varname);
-void ParseDialog(wxString dlgname);
-void ParseControls();
-void ParseListBox();
-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 varname);
-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);
-void WriteStyle(wxString style);
-void WriteBasicInfo(int x,int y,int width,int height,wxString name);
-void WriteName(wxString name);
-void WriteTitle(wxString title);
-void WritePosition(int x,int y);
-void WriteSize(int width,int height);
-void WriteLabel(wxString label);
+    bool SplitHelp(wxString msg, wxString &shorthelp, wxString &longhelp);
+    bool LookUpString(wxString strid,wxString & st);
+    void ParseStringTable(wxString varname);
+    void WriteToolButton(wxString name,int index,int width,int height,wxBitmap bitmap);
+    wxString LookupString(wxString varname,wxStringList id,wxStringList msg);
+    void ParseToolBar(wxString varname);
+    void SecondPass();
+    void FirstPass();
+    void ParseBitmap(wxString varname);
+    void ParseSpinCtrl(wxString label,wxString varname);
+    void ParseRichEdit(wxString label, wxString varname);
+    void ParseDialog(wxString dlgname);
+    void ParseControls();
+    void ParseListBox();
+    void ParseStaticText();
+    void ParseTextCtrl();
+    void ParseRadioButton();
+    void ParseCheckBox();
+    void ParsePushButton();
+    bool Seperator(int ch);
+    void ParseGroupBox();
+    bool ReadRect(int & x, int & y, int & width, int & height);
+    wxString GetToken(bool *listseperator = 0);
+    wxString GetQuoteField();
+    void ReadChar(int &ch);
+    void ParseComboBox();
+    void ParseMenu(wxString varname);
+    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);
+    void WriteStyle(wxString style);
+    void WriteBasicInfo(int x,int y,int width,int height,wxString name);
+    void WriteName(wxString name);
+    void WriteTitle(wxString title);
+    void WritePosition(int x,int y);
+    void WriteSize(int width,int height);
+    void WriteLabel(wxString label);
 //variables
-wxList * m_stringtable;
-wxList *m_bitmaplist;
-wxFile m_rc;
-wxFFile m_xmlfile;
-int m_filesize;
-bool m_done;
+    wxList * m_stringtable;
+    wxList *m_bitmaplist;
+    wxList * m_resourcelist;
+    wxFile m_rc;
+    wxFFile m_xmlfile;
+    int m_filesize;
+    bool m_done;
 
 };