Fixing SetColumnWidth and selection handling, attempt at fixing ClearAll(), and initi...

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

diff --git a/contrib/utils/convertrc/rc2xml.h b/contrib/utils/convertrc/rc2xml.h
index 184a8dadfb216c5801fa0f2374570afb02db6964..e4d458059d8e13b81f797f960fe7768ebe8cc731 100644 (file)
--- a/contrib/utils/convertrc/rc2xml.h
+++ b/contrib/utils/convertrc/rc2xml.h
@@ -6,11 +6,11 @@
 #define RC2XML_H
 
 #include "wx/file.h"
 #define RC2XML_H
 
 #include "wx/file.h"

-#include <wx/ffile.h>
-#include <wx/list.h>
+#include "wx/ffile.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,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();
-    bool Seperator(int ch);
-    void ParseGroupBox();
+    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 Separator(int ch);
+    void ParseGroupBox(wxString phrase, wxString varname);

     bool ReadRect(int & x, int & y, int & width, int & height);
     bool ReadRect(int & x, int & y, int & width, int & height);

-    wxString GetToken(bool *listseperator = 0);
+    wxString GetToken(bool *listseparator = 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();


@@ -86,10 +87,10 @@ protected:
     wxList * m_resourcelist;
     wxFile m_rc;
     wxFFile m_xmlfile;
     wxList * m_resourcelist;
     wxFile m_rc;
     wxFFile m_xmlfile;

-    int m_filesize;
+    wxFileOffset m_filesize;

     bool m_done;
 
 };
 
 
     bool m_done;
 
 };
 
 

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