3. Be able to abort incorrectly formated files without crashing
*/
-#ifdef __GNUG__
-#pragma implementation "rc2xml.cpp"
-#pragma interface "rc2xml.cpp"
-#endif
-
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
// for all others, include the necessary headers (this file is usually all you
// need because it includes almost all "standard" wxWidgets headers
#ifndef WX_PRECOMP
-#include <wx/wx.h>
+#include "wx/wx.h"
#endif
#include "wx/image.h"
#include "wx/deprecated/setup.h"
#include "wx/deprecated/resource.h"
-#include <wx/textfile.h>
-#include <wx/tokenzr.h>
+#include "wx/textfile.h"
+#include "wx/tokenzr.h"
rc2xml::rc2xml()
{
- m_done=FALSE;
+ m_done=false;
m_bitmaplist=new wxList(wxKEY_STRING);
m_stringtable=new wxList(wxKEY_STRING);
m_iconlist = new wxList(wxKEY_STRING);
result=m_xmlfile.Open(xmlfile.c_str(),_T("w+t"));
wxASSERT_MSG(result,_T("Couldn't create XML file"));
if (!result)
- return FALSE;
+ return false;
/* Write Basic header for XML file */
ParseResourceHeader();
//Gather all the resource we need for toolbars,menus, and etc
FirstPass();
- m_done=FALSE;
+ m_done=false;
m_rc.Seek(0);
//Read in dialogs, toolbars,menus
SecondPass();
wxMessageBox(_("Conversion complete."), _("Done"),
wxOK | wxICON_INFORMATION);
-return TRUE;
+return true;
}
while ((token!=_T("BEGIN"))&(token!=_T("{")))
{
- if (token==_T("CAPTION"))
+ if (token==_T("CAPTION"))
{
- title=GetQuoteField();
+ title=GetQuoteField();
}
//TODO fix face name so that it is cross platform name
// FONT 8, "MS Sans Serif"
if (token==_T("FONT"))
- {
+ {
ptsize=GetToken();
face=GetQuoteField();
m_xmlfile.Write(_T("\t\t<font>\n"));
m_xmlfile.Write(_T("\t\t\t<size>")+ptsize+_T("</size>\n"));
m_xmlfile.Write(_T("\t\t\t<face>")+face+_T("</face>\n"));
m_xmlfile.Write(_T("\t\t</font>\n"));
- }
+ }
token=GetToken();
}
bool GotOrs;
GotOrs = ReadOrs(token);
if (ReadRect(x,y,width,height))
- if (GotOrs==FALSE)
+ if (GotOrs==false)
ReadOrs(token);
- if (token.Find(_T("WS_GROUP")) != -1)
+ if (token.Find(_T("WS_GROUP")) != wxNOT_FOUND)
style += _T("wxRB_GROUP");
m_xmlfile.Write(_T("\t\t<object class=\"wxRadioButton\""));
}
-bool rc2xml::Seperator(int ch)
+bool rc2xml::Separator(int ch)
{
//if ((ch==' ')|(ch==',')|(ch==13)|(ch==10)|(ch=='|')|(ch=='\t'))
if ((ch==' ')|(ch==',')|(ch==13)|(ch==10)|(ch=='\t'))
- return TRUE;
+ return true;
if (ch==EOF)
- {
- m_done=TRUE;
- return TRUE;
- }
+ {
+ m_done=true;
+ return true;
+ }
- return FALSE;
+ return false;
}
void rc2xml::ParseGroupBox(wxString phrase, wxString varname)
return ret; // check for more parameters
}
-wxString rc2xml::GetToken(bool *listseperator)
+wxString rc2xml::GetToken(bool *listseparator)
{
wxString token=wxEmptyString;
if (m_rc.Eof())
{
- m_done=TRUE;
+ m_done=true;
return token;
}
ReadChar(ch);
if (ch==EOF)
{
- m_done=TRUE;
+ m_done=true;
return token;
}
- while (Seperator(ch))
+ while (Separator(ch))
{
ReadChar(ch);
if (m_done)
if (ch==EOF)
{
- m_done=TRUE;
+ m_done=true;
}
- while (!Seperator(ch))
+ while (!Separator(ch))
{
token += (char)ch;
ReadChar(ch);
}
if (ch == EOF)
- m_done = TRUE;
+ m_done = true;
- if (listseperator)
- *listseperator = (ch == ',');
+ if (listseparator)
+ *listseparator = (ch == ',');
return token;
}
wxString phrase;
//ASCII code 34 "
int ch=0;
+ int ch1=0;
+
ReadChar(ch);
+ // !! Changed by MS, 15th/11/04. Can now read strings such as
+ // """Catapult"" - blah blah", ...
+
while (ch!=34)
ReadChar(ch);
- ReadChar(ch);
- while (ch!=34)
+ // found first '"'
+ while (true)
{
- phrase+=(char)ch;
- ReadChar(ch);
+ ReadChar(ch);
+ if (ch == 34)
+ {
+ // another quote?
+ ReadChar(ch1);
+ if (ch1 != 34)
+ {
+ // real end of string..
+ break;
+ }
+
+ // add a single quote - fall through
+ }
+ phrase+=(char)ch;
}
+
return phrase;
}
{
wxString phrase;
//ASCII code 34 "
- bool done=FALSE;
- int p,ch=0,lastch=0;
+ bool done=false;
+ int ch=0,lastch=0;
ReadChar(ch);
while (ch!=34)
ReadChar(ch);
+
ReadChar(ch);
- while (done==FALSE)
- {
+ while (done==false)
+ {
if ((ch==34)&&(lastch!='\\'))
- {
- p=m_rc.Tell();
+ {
+ wxFileOffset p = m_rc.Tell();
ReadChar(ch);
-// RC supports "", for embedded quote, as well as \"
+ // RC supports "", for embedded quote, as well as \"
if (ch==34)
phrase+='\\';
else
- {
+ {
m_rc.Seek(p);
- done = TRUE;
+ done = true;
}
}
- if (done==TRUE)
+ if (done==true)
break;
if (ch=='\r')
ReadChar(ch); // skip
if ((ch=='\n')&&(lastch=='\\')) // lastch <should> be this
phrase+='n'; // escape
else
- phrase+=(char)ch;
+ phrase+=(char)ch;
+
lastch=ch;
- ReadChar(ch);
+ ReadChar(ch);
}
return phrase;
void rc2xml::ReadChar(int &ch)
{
- int result;
- result=m_rc.Tell();
+ wxFileOffset result = m_rc.Tell();
if((result>=m_filesize))
- m_done=TRUE;
+ m_done=true;
- result=m_rc.Read(&ch,1);
+ result = m_rc.Read(&ch,1);
- if((result==-1))
- m_done=TRUE;
+ if( result == wxInvalidOffset )
+ m_done=true;
if(ch==EOF)
- m_done=TRUE;
+ m_done=true;
}
void rc2xml::ParseComboBox(wxString varname)
bool GotOrs;
GotOrs = ReadOrs(token);
if (ReadRect(x,y,width,height))
- if (GotOrs==FALSE)
+ if (GotOrs==false)
ReadOrs(token);
m_xmlfile.Write(_T("\t\t<object class=\"wxComboBox\""));
WriteBasicInfo(x,y,width,height,varname);
- if (token.Find(_T("CBS_SIMPLE")) != -1)
+ if (token.Find(_T("CBS_SIMPLE")) != wxNOT_FOUND)
WriteStyle(_T("wxCB_SIMPLE"));
- if (token.Find(_T("CBS_SORT")) != -1)
+ if (token.Find(_T("CBS_SORT")) != wxNOT_FOUND)
WriteStyle(_T("wxCB_SORT"));
- if (token.Find(_T("CBS_DISABLENOSCROLL")) != -1)
+ if (token.Find(_T("CBS_DISABLENOSCROLL")) != wxNOT_FOUND)
WriteStyle(_T("wxLB_ALWAYS_SB"));
m_xmlfile.Write(_T("\n\t\t</object>\n"));
wxString rc2xml::PeekToken()
{
- wxString token;
- int p;
- p=m_rc.Tell();
- token=GetToken();
+ wxFileOffset p = m_rc.Tell();
+ wxString token=GetToken();
m_rc.Seek(p);
return token;
}
+
//MS Windows pain in the butt CONTROL
void rc2xml::ParseControlMS()
{
- wxString label,varname,kindctrl,token;
- token=PeekToken();
+ wxString token = PeekToken();
if (token.Contains(_T("\"")))
ParseNormalMSControl();
else
ParseWeirdMSControl();
-
}
/* CONTROL "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_BOTH |
{
wxString token,style;
ReadOrs(token);
- if (token.Find(_T("TBS_VERT"))!=-1)
+ if (token.Find(_T("TBS_VERT"))!=wxNOT_FOUND)
style+=_T("wxSL_VERTICAL");
//MFC RC Default is horizontal
else
token=PeekToken();
if (token.IsNumber())
- return FALSE;
+ return false;
orstring=GetToken();
while(PeekToken()==_T("|"))
//Grab next token
orstring+=GetToken();
}
- return TRUE;
+ return true;
}
//Is it a checkbutton or a radiobutton or a pushbutton or a groupbox
void rc2xml::ParseCtrlButton(wxString label, wxString varname)
{
wxString token;
- int p;
- p=m_rc.Tell();
+ wxFileOffset p = m_rc.Tell();
ReadOrs(token);
m_rc.Seek(p);
- if (token.Find(_T("BS_AUTOCHECKBOX"))!=-1)
+ if (token.Find(_T("BS_AUTOCHECKBOX"))!=wxNOT_FOUND)
ParseCheckBox(label, varname);
- else if ((token.Find(_T("BS_AUTORADIOBUTTON"))!=-1)||
- (token.Find(_T("BS_RADIOBUTTON"))!=-1))
+ else if ((token.Find(_T("BS_AUTORADIOBUTTON"))!=wxNOT_FOUND)||
+ (token.Find(_T("BS_RADIOBUTTON"))!=wxNOT_FOUND))
ParseRadioButton(label, varname);
- else if (token.Find(_T("BS_GROUPBOX"))!=-1)
+ else if (token.Find(_T("BS_GROUPBOX"))!=wxNOT_FOUND)
ParseGroupBox(label, varname);
- else // if ((token.Find("BS_PUSHBUTTON")!=-1)||
-// (token.Find("BS_DEFPUSHBUTTON")!=-1))
+ else // if ((token.Find("BS_PUSHBUTTON")!=wxNOT_FOUND)||
+// (token.Find("BS_DEFPUSHBUTTON")!=wxNOT_FOUND))
ParsePushButton(label, varname); // make default case
}
void rc2xml::WriteLabel(wxString label)
{
label.Replace(_T("&"),_T("$"));
+ // changes by MS, handle '<' '>' characters within a label.
+ label.Replace(_T("<"),_T("<"));
+ label.Replace(_T(">"),_T(">"));
m_xmlfile.Write(_T("\t\t\t<label>")+label+_T("</label>\n"));
}
CONTROL "",IDC_RICHEDIT1,"RICHEDIT",ES_AUTOHSCROLL | WS_BORDER |
WS_TABSTOP,103,110,40,14
*/
-void rc2xml::ParseRichEdit(wxString label, wxString varname)
+void rc2xml::ParseRichEdit(wxString WXUNUSED(label), wxString varname)
{
wxString token;
//while (ReadOrs(token));
wxString token,style;
ReadOrs(token);
- if (token.Find(_T("UDS_HORZ"))!=-1)
+ if (token.Find(_T("UDS_HORZ"))!=wxNOT_FOUND)
style=_T("wxSP_HORIZONTAL");
//MFC default
else
void rc2xml::ParseBitmap(wxString varname)
{
- wxString token,*bitmapfile;
+ wxString token;
+ wxString *bitmapfile;
token=PeekToken();
//Microsoft notation?
wxLogError(_T("Unable to load bitmap:")+*bitmappath);
//Write toolbar to xml file
- m_xmlfile.Write(_T(" <object class=\"wxToolBar\""));
+ m_xmlfile.Write(_T("\t<object class=\"wxToolBar\""));
//Avoid duplicate names this way
varname.Replace(_T("IDR_"),_T("TB_"));
WriteName(varname);
{
SplitHelp(msg,tip,longhelp);
m_xmlfile.Write(_T("\t\t\t\t<tooltip>")+tip+_T("</tooltip>\n"));
- m_xmlfile.Write(_T(" <longhelp>")+longhelp+_T("</longhelp>\n"));
+ m_xmlfile.Write(_T("\t\t<longhelp>")+longhelp+_T("</longhelp>\n"));
}
//Make a bitmap file name
buttonname=CleanName(buttonname);
little.SaveFile(m_targetpath+name,wxBITMAP_TYPE_BMP);
}
-void rc2xml::ParseStringTable(wxString varname)
+void rc2xml::ParseStringTable(wxString WXUNUSED(varname))
{
wxString token;
token=GetToken();
wxString *msg;
while ((token!=_T("END"))&(token!=_T("}")))
- {
+ {
msg=new wxString;
*msg=GetStringQuote();
m_stringtable->Append(token,msg);
token=GetToken();
- }
-
+ }
}
bool rc2xml::LookUpString(wxString strid,wxString & st)
wxNode *node=m_stringtable->Find(strid);
wxString *s;
if (node==NULL)
- return FALSE;
+ return false;
s=(wxString *)node->GetData();
st=*s;
- return TRUE;
+ return true;
}
bool rc2xml::SplitHelp(wxString msg, wxString &shorthelp, wxString &longhelp)
{
int spot;
spot=msg.Find(_T("\\n"));
- if (spot==-1)
+ if (spot==wxNOT_FOUND)
{
shorthelp=msg;
longhelp=msg;
longhelp=msg.Left(spot);
spot=msg.Length()-spot-2;
shorthelp=msg.Right(spot);
- return TRUE;
+ return true;
}
void rc2xml::ParseMenuItem()
//IDR_MAINFRAME ICON DISCARDABLE "res\\mfcexample.ico"
void rc2xml::ParseIcon(wxString varname)
{
- wxString token,*iconfile;
+ wxString token;
+ wxString *iconfile;
iconfile=new wxString;
token=PeekToken();
void rc2xml::ParseNormalMSControl()
{
-wxString label,varname,kindctrl;
-
-label=GetQuoteField();
-varname=GetToken();
-kindctrl=GetQuoteField();
-kindctrl.MakeUpper();
+ wxString label=GetQuoteField();
+ wxString varname=GetToken();
+ wxString kindctrl=GetQuoteField();
+ kindctrl.MakeUpper();
if (kindctrl==_T("MSCTLS_UPDOWN32"))
ParseSpinCtrl(label,varname);
- if (kindctrl==_T("MSCTLS_TRACKBAR32"))
+ else if (kindctrl==_T("MSCTLS_TRACKBAR32"))
ParseSlider(label,varname);
- if (kindctrl==_T("MSCTLS_PROGRESS32"))
+ else if (kindctrl==_T("MSCTLS_PROGRESS32"))
ParseProgressBar(label,varname);
- if (kindctrl==_T("SYSTREEVIEW32"))
+ else if (kindctrl==_T("SYSTREEVIEW32"))
ParseTreeCtrl(label,varname);
- if (kindctrl==_T("SYSMONTHCAL32"))
+ else if (kindctrl==_T("SYSMONTHCAL32"))
ParseCalendar(label,varname);
- if (kindctrl==_T("SYSLISTVIEW32"))
+ else if (kindctrl==_T("SYSLISTVIEW32"))
ParseListCtrl(label,varname);
- if (kindctrl==_T("BUTTON"))
+ else if (kindctrl==_T("BUTTON"))
ParseCtrlButton(label,varname);
- if (kindctrl==_T("RICHEDIT"))
+ else if (kindctrl==_T("RICHEDIT"))
ParseRichEdit(label,varname);
- if (kindctrl==_T("STATIC"))
- {
+ else if (kindctrl==_T("STATIC"))
+ {
wxString token;
- int p=m_rc.Tell();
+ wxFileOffset p = m_rc.Tell();
ReadOrs(token);
m_rc.Seek(p);
- if (token.Find(_T("SS_BITMAP"))!=-1)
+ if (token.Find(_T("SS_BITMAP"))!=wxNOT_FOUND)
ParseStaticBitmap(label,varname);
else
ParseStaticText(label,varname);
- }
- if (kindctrl==_T("EDIT"))
+ }
+ else if (kindctrl==_T("EDIT"))
ParseTextCtrl(varname);
- if (kindctrl==_T("LISTBOX"))
+ else if (kindctrl==_T("LISTBOX"))
ParseListBox(varname);
- if (kindctrl==_T("COMBOBOX"))
+ else if (kindctrl==_T("COMBOBOX"))
ParseComboBox(varname);
-
}
void rc2xml::ParseWeirdMSControl()
{
- wxString kindctrl;
- wxString varname;
- wxString id;
- id=GetToken();
- varname=GetToken();
- kindctrl=GetQuoteField();
+ wxString id = GetToken();
+ wxString varname = GetToken();
+ wxString kindctrl = GetQuoteField();
kindctrl.MakeUpper();
// CONTROL IDB_FACE,IDC_STATIC,"Static",SS_BITMAP,26,62,32,30
if (kindctrl==_T("STATIC"))
- {
+ {
if (PeekToken()==_T("SS_BITMAP"))
ParseStaticBitmap(id,varname);
else
wxLogError(_T("Unknown MS Control Static token"));
- }
-
+ }
}
-//SCROLLBAR IDC_SCROLLBAR1,219,56,10,40,SBS_VERT
+//SCROLLBAR IDC_SCROLLBAR1,219,56,10,40,SBS_VERT
void rc2xml::ParseScrollBar()
{
wxString token;
ReadOrs(token);
-if (token.Find(_T("SBS_VERT"))!=-1)
+if (token.Find(_T("SBS_VERT"))!=wxNOT_FOUND)
style=_T("wxSB_VERTICAL");
//Default MFC style is horizontal
else
//Read through entire file
for ( str = r.GetFirstLine(); !r.Eof(); str = r.GetNextLine() )
{
- if (str.Find(_T("#define"))!=-1)
+ if (str.Find(_T("#define"))!=wxNOT_FOUND)
{
tok.SetString(str);
//Just ignore #define token
projects / wxWidgets.git / blobdiff