X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/92a19c2e7757ba742846f83e56356de0a607bdc2..0966aee3d9eac832fe7dcf66db2eb06e76c51da5:/contrib/utils/convertrc/rc2xml.cpp?ds=inline diff --git a/contrib/utils/convertrc/rc2xml.cpp b/contrib/utils/convertrc/rc2xml.cpp index ee909b0256..9f4246b19a 100644 --- a/contrib/utils/convertrc/rc2xml.cpp +++ b/contrib/utils/convertrc/rc2xml.cpp @@ -28,7 +28,7 @@ cross platform (wxGTK,etc) #endif // for all others, include the necessary headers (this file is usually all you -// need because it includes almost all "standard" wxWindows headers +// need because it includes almost all "standard" wxWidgets headers #ifndef WX_PRECOMP #include #endif @@ -36,7 +36,8 @@ cross platform (wxGTK,etc) #include "rc2xml.h" #include "wx/image.h" -#include "wx/resource.h" +#include "wx/deprecated/setup.h" +#include "wx/deprecated/resource.h" #include #include @@ -48,7 +49,7 @@ cross platform (wxGTK,etc) 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); @@ -67,11 +68,11 @@ bool rc2xml::Convert(wxString rcfile, wxString xmlfile) { m_rc.Open(rcfile.c_str()); m_filesize=m_rc.Length(); - + m_workingpath=wxPathOnly(rcfile); - m_targetpath=wxPathOnly(xmlfile)+"\\"; + m_targetpath=wxPathOnly(xmlfile) + _T("\\"); @@ -79,30 +80,32 @@ bool rc2xml::Convert(wxString rcfile, wxString xmlfile) bool result; - result=m_xmlfile.Open(xmlfile.c_str(),"w+t"); - wxASSERT_MSG(result,"Couldn't create XML file"); + 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 */ - m_xmlfile.Write("\n"); - m_xmlfile.Write("\n"); - + m_xmlfile.Write(_T("\n")); + m_xmlfile.Write(_T("\n")); + //Read resource.h 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(); - m_xmlfile.Write("\n"); + m_xmlfile.Write(_T("\n")); m_xmlfile.Close(); m_rc.Close(); + wxMessageBox(_("Conversion complete."), _("Done"), + wxOK | wxICON_INFORMATION); -return TRUE; +return true; } @@ -111,12 +114,13 @@ void rc2xml::ParseDialog(wxString dlgname) wxString token; static int dlgid=999; dlgid++; -/* Make sure that this really is a dialog +/* Make sure that this really is a dialog microsoft reuses the keyword DIALOG for other things */ token=PeekToken(); //Microsoft notation? - if (token=="DISCARDABLE") + while ((token==_T("DISCARDABLE")) + ||(token==_T("LOADONCALL"))||(token==_T("MOVEABLE"))) { token=GetToken(); token=PeekToken(); @@ -132,43 +136,43 @@ microsoft reuses the keyword DIALOG for other things token=GetToken(); wxString title; wxString ptsize,face; - - m_xmlfile.Write("\t\n"); - m_xmlfile.Write("\t\t\t"+ptsize+"\n"); - m_xmlfile.Write("\t\t\t"+face+"\n"); - m_xmlfile.Write("\t\t\n"); + m_xmlfile.Write(_T("\t\t\n")); + m_xmlfile.Write(_T("\t\t\t")+ptsize+_T("\n")); + m_xmlfile.Write(_T("\t\t\t")+face+_T("\n")); + m_xmlfile.Write(_T("\t\t\n")); } token=GetToken(); } ParseControls(); - m_xmlfile.Write("\t\n"); + m_xmlfile.Write(_T("\t\n")); } /* BEGIN - EDITTEXT IDC_BANDS,36,83,22,14,ES_AUTOHSCROLL | ES_NUMBER | NOT + EDITTEXT IDC_BANDS,36,83,22,14,ES_AUTOHSCROLL | ES_NUMBER | NOT WS_TABSTOP LTEXT "Bands",IDC_STATIC,11,86,21,8 EDITTEXT IDC_NAME,10,3,75,14,ES_AUTOHSCROLL @@ -177,124 +181,164 @@ END void rc2xml::ParseControls() { wxString token; + wxString label,varname; token=GetToken(); - while ((token!="END")&(token!="}")) + while ((token!=_T("END"))&(token!=_T("}"))) { - if (token=="AUTOCHECKBOX") - ParseCheckBox(); + if (token==_T("AUTOCHECKBOX")) + { + label=GetQuoteField(); + varname=GetToken(); + ParseCheckBox(label,varname); + } else - if (token=="AUTORADIOBUTTON") - ParseRadioButton(); + if (token==_T("AUTORADIOBUTTON")) + { + label=GetQuoteField(); + varname=GetToken(); + ParseRadioButton(label,varname); + } else - if (token=="LTEXT") - ParseStaticText(); - else if (token=="EDITTEXT") - ParseTextCtrl(); - else if (token=="PUSHBUTTON") - ParsePushButton(); - else if (token=="DEFPUSHBUTTON") - ParsePushButton(); - else if (token=="GROUPBOX") - ParseGroupBox(); - else if (token=="COMBOBOX") - ParseComboBox(); - else if (token=="CONTROL") + if (token==_T("LTEXT")) + { + label=GetQuoteField(); + varname=GetToken(); + ParseStaticText(label,varname); + } + else if (token==_T("EDITTEXT")) + { + varname=GetToken(); + ParseTextCtrl(varname); + } + else if ((token==_T("PUSHBUTTON"))||(token==_T("DEFPUSHBUTTON"))) + { + label=GetQuoteField(); + varname=GetToken(); + ParsePushButton(label,varname); + } + else if (token==_T("GROUPBOX")) + { + label=GetQuoteField(); + varname=GetToken(); + ParseGroupBox(label,varname); + } + else if (token==_T("COMBOBOX")) + { + varname=GetToken(); + ParseComboBox(varname); + } + else if (token==_T("CONTROL")) ParseControlMS(); - else if (token=="LISTBOX") - ParseListBox(); - else if (token=="ICON") + else if (token==_T("LISTBOX")) + { + varname=GetToken(); + ParseListBox(varname); + } + else if (token==_T("ICON")) ParseIconStatic(); - else if (token=="SCROLLBAR") + else if (token==_T("SCROLLBAR")) ParseScrollBar(); token=GetToken(); } } //LTEXT "Radius",IDC_STATIC,9,67,23,8 -void rc2xml::ParseStaticText() +void rc2xml::ParseStaticText(wxString phrase, wxString varname) { wxString token; - wxString phrase,varname; - phrase=GetQuoteField(); - varname=GetToken(); + token=PeekToken(); + while (!token.IsNumber()) + { + token=GetToken(); + token=PeekToken(); + } int x,y,width,height; ReadRect(x,y,width,height); - m_xmlfile.Write("\t\t\n"); + m_xmlfile.Write(_T("\t\t\n")); } //EDITTEXT IDC_RADIUS,36,65,40,14,ES_AUTOHSCROLL -void rc2xml::ParseTextCtrl() +void rc2xml::ParseTextCtrl(wxString varname) { wxString token; - wxString varname,style; - varname=GetToken(); + wxString style; + token=PeekToken(); + while (!token.IsNumber()) + { + token=GetToken(); + token=PeekToken(); + } int x,y,width,height; ReadRect(x,y,width,height); //TODO //style=GetToken(); - m_xmlfile.Write("\t\t\n"); + m_xmlfile.Write(_T("\t\t\n")); } //AUTOCHECKBOX "&log.", ID_XLOG, 25, 24, 21, 12 -void rc2xml::ParseCheckBox() +void rc2xml::ParseCheckBox(wxString phrase, wxString varname) { wxString token; - wxString phrase,varname; - phrase=GetQuoteField(); - varname=GetToken(); - + token=PeekToken(); + while (!token.IsNumber()) + { + token=GetToken(); + token=PeekToken(); + } int x,y,width,height; ReadRect(x,y,width,height); - m_xmlfile.Write("\t\t\n"); + m_xmlfile.Write(_T("\t\t\n")); } //AUTORADIOBUTTON "&text", ID_SW10, 13, 12, 68, 10, BS_AUTORADIOBUTTON | WS_GROUP -void rc2xml::ParseRadioButton() +void rc2xml::ParseRadioButton(wxString phrase, wxString varname) { wxString token,style; - wxString phrase,varname; - phrase=GetQuoteField(); - varname=GetToken(); - int x,y,width,height; + bool GotOrs; + GotOrs = ReadOrs(token); if (ReadRect(x,y,width,height)) + if (GotOrs==false) ReadOrs(token); - if (token.Find("WS_GROUP") != -1) - style += "wxRB_GROUP"; + if (token.Find(_T("WS_GROUP")) != wxNOT_FOUND) + style += _T("wxRB_GROUP"); - m_xmlfile.Write("\t\t\n"); + m_xmlfile.Write(_T("\t\t\n")); } //PUSHBUTTON "Create/Update",IDC_CREATE,15,25,53,13,NOT WS_TABSTOP -void rc2xml::ParsePushButton() +void rc2xml::ParsePushButton(wxString phrase, wxString varname) { wxString token; - wxString phrase,varname; - phrase=GetQuoteField(); - varname=GetToken(); + token=PeekToken(); + while (!token.IsNumber()) + { + token=GetToken(); + token=PeekToken(); + } int x,y,width,height; ReadRect(x,y,width,height); - m_xmlfile.Write("\t\t\n"); + m_xmlfile.Write(_T("\t\t\n")); } @@ -303,51 +347,54 @@ bool rc2xml::Seperator(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() +void rc2xml::ParseGroupBox(wxString phrase, wxString varname) { // GROUPBOX "Rotate",IDC_STATIC,1,1,71,79 wxString token; - wxString phrase,varname; - phrase=GetQuoteField(); - varname=GetToken(); + token=PeekToken(); + while (!token.IsNumber()) + { + token=GetToken(); + token=PeekToken(); + } int x,y,width,height; ReadRect(x,y,width,height); - m_xmlfile.Write("\t\t\n"); + m_xmlfile.Write(_T("\t\t\n")); } bool rc2xml::ReadRect(int & x, int & y, int & width, int & height) { - x=atoi(GetToken()); - y=atoi(GetToken()); - width=atoi(GetToken()); + x=wxAtoi(GetToken()); + y=wxAtoi(GetToken()); + width=wxAtoi(GetToken()); bool ret; wxString tmp = GetToken(&ret); - height=atoi(tmp); + height=wxAtoi(tmp); return ret; // check for more parameters } wxString rc2xml::GetToken(bool *listseperator) { - wxString token=""; + wxString token=wxEmptyString; if (m_rc.Eof()) { - m_done=TRUE; + m_done=true; return token; } @@ -355,7 +402,7 @@ wxString rc2xml::GetToken(bool *listseperator) ReadChar(ch); if (ch==EOF) { - m_done=TRUE; + m_done=true; return token; } @@ -368,9 +415,9 @@ wxString rc2xml::GetToken(bool *listseperator) if (ch==EOF) { - m_done=TRUE; + m_done=true; } - + while (!Seperator(ch)) { @@ -379,7 +426,7 @@ wxString rc2xml::GetToken(bool *listseperator) } if (ch == EOF) - m_done = TRUE; + m_done = true; if (listseperator) *listseperator = (ch == ','); @@ -391,18 +438,78 @@ wxString rc2xml::GetQuoteField() 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); - + + // found first '"' + while (true) + { + 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; +} + +// string in stringtable may contain embedded quotes +// escape characters retained to allow strings to be rewritten +wxString rc2xml::GetStringQuote() +{ + wxString phrase; + //ASCII code 34 " + bool done=false; + int p,ch=0,lastch=0; ReadChar(ch); while (ch!=34) + ReadChar(ch); + ReadChar(ch); + while (done==false) + { + if ((ch==34)&&(lastch!='\\')) + { + p=m_rc.Tell(); + ReadChar(ch); +// RC supports "", for embedded quote, as well as \" + if (ch==34) + phrase+='\\'; + else { + m_rc.Seek(p); + done = true; + } + } + if (done==true) + break; + if (ch=='\r') + ReadChar(ch); // skip + if ((ch=='\n')&&(lastch=='\\')) // lastch be this + phrase+='n'; // escape + else phrase+=(char)ch; + lastch=ch; ReadChar(ch); } + return phrase; } @@ -412,63 +519,66 @@ void rc2xml::ReadChar(int &ch) result=m_rc.Tell(); if((result>=m_filesize)) - m_done=TRUE; + m_done=true; result=m_rc.Read(&ch,1); if((result==-1)) - m_done=TRUE; + m_done=true; if(ch==EOF) - m_done=TRUE; + m_done=true; } -void rc2xml::ParseComboBox() +void rc2xml::ParseComboBox(wxString varname) { -/* COMBOBOX IDC_SCALECOMBO,10,110,48,52,CBS_DROPDOWNLIST | CBS_SORT | +/* COMBOBOX IDC_SCALECOMBO,10,110,48,52,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP */ wxString token,style; - wxString varname; - varname=GetToken(); int x,y,width,height; + bool GotOrs; + GotOrs = ReadOrs(token); if (ReadRect(x,y,width,height)) + if (GotOrs==false) ReadOrs(token); - m_xmlfile.Write("\t\t\n"); + if (token.Find(_T("CBS_SIMPLE")) != wxNOT_FOUND) + WriteStyle(_T("wxCB_SIMPLE")); + if (token.Find(_T("CBS_SORT")) != wxNOT_FOUND) + WriteStyle(_T("wxCB_SORT")); + if (token.Find(_T("CBS_DISABLENOSCROLL")) != wxNOT_FOUND) + WriteStyle(_T("wxLB_ALWAYS_SB")); + m_xmlfile.Write(_T("\n\t\t\n")); } void rc2xml::ParseMenu(wxString varname) { - wxString token=""; + wxString token=wxEmptyString; //Write menubar to xml file - m_xmlfile.Write("\t\n"); + m_xmlfile.Write(_T(">\n")); - while ((token!="BEGIN")&(token!="{")) + while ((token!=_T("BEGIN"))&(token!=_T("{"))) token=GetToken(); - while ((token!="END")&(token!="}")) + while ((token!=_T("END"))&(token!=_T("}"))) { token=GetToken(); - if (token=="POPUP") + token.MakeUpper(); + + if (token==_T("POPUP")) { ParsePopupMenu(); } } - m_xmlfile.Write("\t\n"); + m_xmlfile.Write(_T("\t\n")); } void rc2xml::ParsePopupMenu() @@ -485,25 +595,27 @@ void rc2xml::ParsePopupMenu() //Write Menu item //Generate a fake name since RC menus don't have one - name<<"Menu_"<\n"); + m_xmlfile.Write(_T(">\n")); WriteLabel(token); - while ((token!="BEGIN")&(token!="{")) + while ((token!=_T("BEGIN"))&(token!=_T("{"))) token=GetToken(); - while ((token!="END")&(token!="}")) + while ((token!=_T("END"))&(token!=_T("}"))) { token=GetToken(); - if (token=="POPUP") + token.MakeUpper(); + + if (token==_T("POPUP")) ParsePopupMenu(); - - if (token=="MENUITEM") + + if (token==_T("MENUITEM")) ParseMenuItem(); } - m_xmlfile.Write("\t\t\t\n"); + m_xmlfile.Write(_T("\t\t\t\n")); } wxString rc2xml::PeekToken() @@ -522,52 +634,52 @@ void rc2xml::ParseControlMS() wxString label,varname,kindctrl,token; token=PeekToken(); - if (token.Contains("\"")) + if (token.Contains(_T("\""))) ParseNormalMSControl(); else ParseWeirdMSControl(); } -/* CONTROL "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_BOTH | +/* CONTROL "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,52,73,100,15 */ -void rc2xml::ParseSlider(wxString label, wxString varname) +void rc2xml::ParseSlider(wxString WXUNUSED(label), wxString varname) { wxString token,style; ReadOrs(token); - if (token.Find("TBS_VERT")!=-1) - style+="wxSL_VERTICAL"; + if (token.Find(_T("TBS_VERT"))!=wxNOT_FOUND) + style+=_T("wxSL_VERTICAL"); //MFC RC Default is horizontal else - style+="wxSL_HORIZONTAL"; + style+=_T("wxSL_HORIZONTAL"); int x,y,width,height; ReadRect(x,y,width,height); - m_xmlfile.Write("\t\t\n"); + m_xmlfile.Write(_T("\n\t\t\n")); } -/* +/* CONTROL "Progress1",CG_IDC_PROGDLG_PROGRESS,"msctls_progress32", WS_BORDER,15,52,154,13 */ -void rc2xml::ParseProgressBar(wxString label, wxString varname) +void rc2xml::ParseProgressBar(wxString WXUNUSED(label), wxString varname) { wxString token,style; ReadOrs(token); - + int x,y,width,height; ReadRect(x,y,width,height); //Always horizontal in MFC - m_xmlfile.Write("\t\t\n"); + m_xmlfile.Write(_T("\t\t\n")); } bool rc2xml::ReadOrs(wxString & orstring) @@ -576,158 +688,158 @@ bool rc2xml::ReadOrs(wxString & orstring) token=PeekToken(); if (token.IsNumber()) - return FALSE; + return false; orstring=GetToken(); while(PeekToken()==_T("|")) { - //Grab | + //Grab | orstring+=GetToken(); //Grab next token orstring+=GetToken(); } - return TRUE; + return true; } -//Is it a check button or a radio button +//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(); ReadOrs(token); - int x,y,width,height; - - if (token.Find("BS_AUTOCHECKBOX")!=-1) - { - ReadRect(x,y,width,height); - m_xmlfile.Write("\t\t\n"); - } - - if (token.Find("BS_AUTORADIOBUTTON")!=-1) - { - ReadRect(x,y,width,height); - m_xmlfile.Write("\t\t\n"); - } + m_rc.Seek(p); + if (token.Find(_T("BS_AUTOCHECKBOX"))!=wxNOT_FOUND) + ParseCheckBox(label, varname); + 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"))!=wxNOT_FOUND) + ParseGroupBox(label, varname); + else // if ((token.Find("BS_PUSHBUTTON")!=wxNOT_FOUND)|| +// (token.Find("BS_DEFPUSHBUTTON")!=wxNOT_FOUND)) + ParsePushButton(label, varname); // make default case } - void rc2xml::WriteSize(int width, int height) { wxString msg; - msg<<" "<"; + msg << _T(" ") << width << _T(",") << height << _T("d"); m_xmlfile.Write(msg); } void rc2xml::WritePosition(int x, int y) { wxString msg; - msg<<" "<"; + msg << _T(" ") << x << _T(",") << y << _T("d"); m_xmlfile.Write(msg); } void rc2xml::WriteTitle(wxString title) { wxString msg; - msg=_T("\t\t"+title+"\n"); + msg=_T("\t\t")+title+_T("\n"); m_xmlfile.Write(msg); } void rc2xml::WriteName(wxString name) { - + //Try to convert any number ids into names name=LookUpId(name); -//Replace common MS ids with wxWindows ids +//Replace common MS ids with wxWidgets ids //I didn't do everyone of them - if (name=="IDOK") - name="wxID_OK"; - else if (name=="IDCANCEL") - name="wxID_CANCEL"; - else if (name=="IDAPPLY") - name="wxID_APPLY"; - else if (name=="ID_FILE_OPEN") - name="wxID_OPEN"; - else if (name=="ID_FILE_CLOSE") - name="wxID_CLOSE"; - else if (name=="ID_FILE_SAVE") - name="wxID_SAVE"; - else if (name=="ID_FILE_SAVE_AS") - name="wxID_SAVEAS"; - else if (name=="ID_APP_EXIT") - name="wxID_EXIT"; - else if (name=="ID_FILE_PRINT") - name="wxID_PRINT"; - else if (name=="ID_FILE_PRINT_PREVIEW") - name="wxID_PREVIEW"; - else if (name=="ID_FILE_PRINT_SETUP") - name="wxID_PRINT_SETUP"; - else if (name=="ID_APP_ABOUT") - name="wxID_ABOUT"; - else if (name=="ID_EDIT_UNDO") - name="wxID_UNDO"; - else if (name=="ID_EDIT_CUT") - name="wxID_CUT"; - else if (name=="ID_EDIT_COPY") - name="wxID_COPY"; - else if (name=="ID_EDIT_PASTE") - name="wxID_PASTE"; - else if (name=="IDYES") - name="wxID_YES"; - else if (name=="IDNO") - name="wxID_NO"; - else if (name=="IDHELP") - name="wxID_HELP"; - - m_xmlfile.Write(" name= \""+name+"\""); + if (name==_T("IDOK")) + name=_T("wxID_OK"); + else if (name==_T("IDCANCEL")) + name=_T("wxID_CANCEL"); + else if (name==_T("IDAPPLY")) + name=_T("wxID_APPLY"); + else if (name==_T("ID_FILE_OPEN")) + name=_T("wxID_OPEN"); + else if (name==_T("ID_FILE_CLOSE")) + name=_T("wxID_CLOSE"); + else if (name==_T("ID_FILE_SAVE")) + name=_T("wxID_SAVE"); + else if (name==_T("ID_FILE_SAVE_AS")) + name=_T("wxID_SAVEAS"); + else if (name==_T("ID_APP_EXIT")) + name=_T("wxID_EXIT"); + else if (name==_T("ID_FILE_PRINT")) + name=_T("wxID_PRINT"); + else if (name==_T("ID_FILE_PRINT_PREVIEW")) + name=_T("wxID_PREVIEW"); + else if (name==_T("ID_FILE_PRINT_SETUP")) + name=_T("wxID_PRINT_SETUP"); + else if (name==_T("ID_APP_ABOUT")) + name=_T("wxID_ABOUT"); + else if (name==_T("ID_EDIT_UNDO")) + name=_T("wxID_UNDO"); + else if (name==_T("ID_EDIT_CUT")) + name=_T("wxID_CUT"); + else if (name==_T("ID_EDIT_COPY")) + name=_T("wxID_COPY"); + else if (name==_T("ID_EDIT_PASTE")) + name=_T("wxID_PASTE"); + else if (name==_T("IDYES")) + name=_T("wxID_YES"); + else if (name==_T("IDNO")) + name=_T("wxID_NO"); + else if (name==_T("IDHELP")) + name=_T("wxID_HELP"); + + m_xmlfile.Write(_T(" name= \"")+name+_T("\"")); } void rc2xml::WriteLabel(wxString label) { - label.Replace("&","$"); - m_xmlfile.Write("\t\t\t\n"); + 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\n")); } void rc2xml::WriteBasicInfo(int x, int y, int width, int height, wxString name) { WriteName(name); - m_xmlfile.Write(">\n"); - m_xmlfile.Write("\t\t\t"); + m_xmlfile.Write(_T(">\n")); + m_xmlfile.Write(_T("\t\t\t")); WritePosition(x,y); WriteSize(width,height); - m_xmlfile.Write("\n"); + m_xmlfile.Write(_T("\n")); } void rc2xml::WriteStyle(wxString style) { if (style.Length()==0) return; - m_xmlfile.Write("\t\t\t\n"); + m_xmlfile.Write(_T("\t\t\t\n")); } /* - LISTBOX IDC_LIST1,16,89,48,40,LBS_SORT | LBS_MULTIPLESEL | + LISTBOX IDC_LIST1,16,89,48,40,LBS_SORT | LBS_MULTIPLESEL | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP */ -void rc2xml::ParseListBox() +void rc2xml::ParseListBox(wxString varname) { wxString token; - wxString varname; - varname=GetToken(); + token=PeekToken(); + while (!token.IsNumber()) + { + token=GetToken(); + token=PeekToken(); + } int x,y,width,height; ReadRect(x,y,width,height); - m_xmlfile.Write("\t\t\n"); + m_xmlfile.Write(_T("\n\t\t\n")); } /* - CONTROL "",IDC_RICHEDIT1,"RICHEDIT",ES_AUTOHSCROLL | WS_BORDER | + CONTROL "",IDC_RICHEDIT1,"RICHEDIT",ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP,103,110,40,14 */ void rc2xml::ParseRichEdit(wxString label, wxString varname) @@ -739,34 +851,34 @@ void rc2xml::ParseRichEdit(wxString label, wxString varname) ReadRect(x,y,width,height); wxString style; //Make it a rich text control - style+="wxTE_MULTILINE "; - m_xmlfile.Write("\t\t\n"); + m_xmlfile.Write(_T("\t\t\n")); } /* CONTROL "Spin1",IDC_SPIN1,"msctls_updown32",UDS_ARROWKEYS,209,72, 19,26 */ -void rc2xml::ParseSpinCtrl(wxString label, wxString varname) +void rc2xml::ParseSpinCtrl(wxString WXUNUSED(label), wxString varname) { wxString token,style; - + ReadOrs(token); - if (token.Find("UDS_HORZ")!=-1) - style="wxSP_HORIZONTAL"; + if (token.Find(_T("UDS_HORZ"))!=wxNOT_FOUND) + style=_T("wxSP_HORIZONTAL"); //MFC default else - style="wxSP_VERTICAL"; + style=_T("wxSP_VERTICAL"); int x,y,width,height; ReadRect(x,y,width,height); - m_xmlfile.Write("\t\t\n"); + m_xmlfile.Write(_T("\n\t\t\n")); } @@ -776,13 +888,13 @@ void rc2xml::FirstPass() while (!m_done) { token=GetToken(); - if (token=="BITMAP") + if (token==_T("BITMAP")) ParseBitmap(prevtok); - else if (token=="STRINGTABLE") + else if (token==_T("STRINGTABLE")) ParseStringTable(prevtok); - else if (token=="ICON") + else if (token==_T("ICON")) ParseIcon(prevtok); - + prevtok=token; } } @@ -790,10 +902,10 @@ void rc2xml::FirstPass() void rc2xml::ParseBitmap(wxString varname) { wxString token,*bitmapfile; - + token=PeekToken(); //Microsoft notation? - if (token=="DISCARDABLE") + if (token==_T("DISCARDABLE")) { token=GetToken(); token=PeekToken(); @@ -811,13 +923,13 @@ void rc2xml::SecondPass() while (!m_done) { token=GetToken(); - if (token=="DIALOG") + if ((token==_T("DIALOG"))||(token==_T("DIALOGEX"))) ParseDialog(prevtok); - else if (token=="MENU") + else if (token==_T("MENU")) ParseMenu(prevtok); - else if (token=="TOOLBAR") + else if (token==_T("TOOLBAR")) ParseToolBar(prevtok); - + prevtok=token; } @@ -825,69 +937,69 @@ void rc2xml::SecondPass() void rc2xml::ParseToolBar(wxString varname) { - wxString token; + wxString token; token=GetToken(); - wxASSERT_MSG(token=="DISCARDABLE","Error in toolbar parsing"); + wxASSERT_MSG(token==_T("DISCARDABLE"),_T("Error in toolbar parsing")); //Look up bitmap for toolbar and load wxNode *node=m_bitmaplist->Find(LookUpId(varname)); wxString *bitmappath; - bitmappath=(wxString *)node->Data(); + bitmappath=(wxString *)node->GetData(); wxBitmap bitmap; if (!bitmap.LoadFile(*bitmappath,wxBITMAP_TYPE_BMP )) - wxLogError("Unable to load bitmap:"+*bitmappath); + wxLogError(_T("Unable to load bitmap:")+*bitmappath); //Write toolbar to xml file - m_xmlfile.Write(" \n"); + m_xmlfile.Write(_T(">\n")); wxString style; - style+="wxTB_FLAT"; + style+=_T("wxTB_FLAT"); WriteStyle(style); //Grab width and height int width,height; - width=atoi(GetToken()); - height=atoi(GetToken()); + width=wxAtoi(GetToken()); + height=wxAtoi(GetToken()); - int c=0; + int c=0; wxString buttonname,msg,tip,longhelp; token=GetToken(); - while ((token!="BEGIN")) + while ((token!=_T("BEGIN"))&(token!=_T("{"))) token=GetToken(); - while ((token!="END")&(token!="}")) + while ((token!=_T("END"))&(token!=_T("}"))) { - if (token=="BUTTON") + if (token==_T("BUTTON")) { buttonname=GetToken(); - m_xmlfile.Write("\t\t\t\n"); + m_xmlfile.Write(_T(">\n")); //Write tool tip if any if (LookUpString(buttonname,msg)) { SplitHelp(msg,tip,longhelp); - m_xmlfile.Write("\t\t\t\t"+tip+"\n"); - m_xmlfile.Write(" "+longhelp+"\n"); + m_xmlfile.Write(_T("\t\t\t\t")+tip+_T("\n")); + m_xmlfile.Write(_T("\t\t")+longhelp+_T("\n")); } //Make a bitmap file name buttonname=CleanName(buttonname); - buttonname+=".bmp"; - m_xmlfile.Write("\t\t\t\t"+buttonname+"\n"); + buttonname+=_T(".bmp"); + m_xmlfile.Write(_T("\t\t\t\t")+buttonname+_T("\n")); WriteToolButton(buttonname,c,width,height,bitmap); - m_xmlfile.Write("\t\t\t\n"); + m_xmlfile.Write(_T("\t\t\t\n")); c++; } - else if (token=="SEPARATOR") + else if (token==_T("SEPARATOR")) { - m_xmlfile.Write("\t\t\t\n"); + m_xmlfile.Write(_T("\t\t\t\n")); } token=GetToken(); } - m_xmlfile.Write("\t\n"); + m_xmlfile.Write(_T("\t\n")); } //Extract bitmaps from larger toolbar bitmap @@ -905,15 +1017,15 @@ void rc2xml::ParseStringTable(wxString varname) { wxString token; token=GetToken(); - while ((token!="BEGIN")) + while ((token!=_T("BEGIN"))&(token!=_T("{"))) token=GetToken(); token=GetToken(); wxString *msg; - while ((token!="END")&(token!="}")) + while ((token!=_T("END"))&(token!=_T("}"))) { msg=new wxString; - *msg=GetQuoteField(); + *msg=GetStringQuote(); m_stringtable->Append(token,msg); token=GetToken(); } @@ -925,19 +1037,19 @@ 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->Data(); + s=(wxString *)node->GetData(); st=*s; - return TRUE; + return true; } bool rc2xml::SplitHelp(wxString msg, wxString &shorthelp, wxString &longhelp) { int spot; - spot=msg.Find("\\n"); - if (spot==-1) + spot=msg.Find(_T("\\n")); + if (spot==wxNOT_FOUND) { shorthelp=msg; longhelp=msg; @@ -946,16 +1058,16 @@ bool rc2xml::SplitHelp(wxString msg, wxString &shorthelp, wxString &longhelp) longhelp=msg.Left(spot); spot=msg.Length()-spot-2; shorthelp=msg.Right(spot); - return TRUE; + return true; } void rc2xml::ParseMenuItem() { wxString token,name,msg,tip,longhelp; //int spot; - if (PeekToken()=="SEPARATOR") + if (PeekToken()==_T("SEPARATOR")) { - m_xmlfile.Write("\t\t\t\n"); + m_xmlfile.Write(_T("\t\t\t\n")); return; } @@ -964,34 +1076,40 @@ void rc2xml::ParseMenuItem() //Remove \t because it causes problems //spot=token.First("\\t"); //token=token.Left(spot); - m_xmlfile.Write("\t\t\t\n"); + m_xmlfile.Write(_T(">\n")); WriteLabel(token); //Look up help if any listed in stringtable - if (LookUpString(name,msg)) +//can't assume numbers correlate, restrict to string identifiers + if ((!name.IsNumber())&&(LookUpString(name,msg))) { SplitHelp(msg,tip,longhelp); - m_xmlfile.Write("\t\t\t" - +longhelp+"\n"); + m_xmlfile.Write(_T("\t\t\t") + +longhelp+_T("\n")); } //look for extra attributes like checked and break wxString ptoken; ptoken=PeekToken(); - while ((ptoken!="MENUITEM")&(ptoken!="POPUP")&(ptoken!="END")) + ptoken.MakeUpper(); + while ((ptoken!=_T("MENUITEM"))&(ptoken!=_T("POPUP"))&(ptoken!=_T("END"))) { token=GetToken(); - if (token=="CHECKED") - m_xmlfile.Write("\t\t\t1\n"); - else if (token=="MENUBREAK"); + ptoken.MakeUpper(); + if (token==_T("CHECKED")) + m_xmlfile.Write(_T("\t\t\t1\n")); + else if (token==_T("MENUBREAK")) + ; //m_xmlfile.Write("\t\t\t\n"); - else if (token=="GRAYED"); + else if (token==_T("GRAYED")) + ; else - wxLogError("Unknown Menu Item token:"+token); - + wxLogError(_T("Unknown Menu Item token:")+token); + ptoken=PeekToken(); + ptoken.MakeUpper(); } - m_xmlfile.Write("\t\t\t\n"); + m_xmlfile.Write(_T("\t\t\t\n")); } @@ -1000,6 +1118,10 @@ void rc2xml::ParseIconStatic() { wxString token; wxString varname,iconname; + token = PeekToken(); + if (token.Contains(_T("\""))) + iconname = GetQuoteField(); + else iconname=GetToken(); //Look up icon varname=GetToken(); @@ -1007,11 +1129,11 @@ void rc2xml::ParseIconStatic() int x,y,width,height; ReadRect(x,y,width,height); - m_xmlfile.Write("\t\t\n"); + m_xmlfile.Write(_T("\t\t\n")); } //IDR_MAINFRAME ICON DISCARDABLE "res\\mfcexample.ico" @@ -1023,21 +1145,21 @@ void rc2xml::ParseIcon(wxString varname) *iconfile=GetQuoteField(); m_iconlist->Append(varname,iconfile); - + } wxString rc2xml::CleanName(wxString name) { name.MakeLower(); - name.Replace("id_",""); - name.Replace("idr_",""); - name.Replace("idb_",""); - name.Replace("idc_",""); + name.Replace(_T("id_"),wxEmptyString); + name.Replace(_T("idr_"),wxEmptyString); + name.Replace(_T("idb_"),wxEmptyString); + name.Replace(_T("idc_"),wxEmptyString); - name.Replace(".ico",""); + name.Replace(_T(".ico"),wxEmptyString); - name.Replace(".bmp",""); + name.Replace(_T(".bmp"),wxEmptyString); return name; } // And the award for most messed up control goes to... @@ -1046,17 +1168,16 @@ void rc2xml::ParseStaticBitmap(wxString bitmapname, wxString varname) { wxString token; //Grab SS_BITMAP - token=GetToken(); - + ReadOrs(token); int x,y,width,height; ReadRect(x,y,width,height); - m_xmlfile.Write("\t\t\n"); + m_xmlfile.Write(_T("\t\t\n")); } @@ -1069,22 +1190,39 @@ varname=GetToken(); kindctrl=GetQuoteField(); kindctrl.MakeUpper(); - if (kindctrl=="MSCTLS_UPDOWN32") + if (kindctrl==_T("MSCTLS_UPDOWN32")) ParseSpinCtrl(label,varname); - if (kindctrl=="MSCTLS_TRACKBAR32") + if (kindctrl==_T("MSCTLS_TRACKBAR32")) ParseSlider(label,varname); - if (kindctrl=="MSCTLS_PROGRESS32") + if (kindctrl==_T("MSCTLS_PROGRESS32")) ParseProgressBar(label,varname); - if (kindctrl=="SYSTREEVIEW32") + if (kindctrl==_T("SYSTREEVIEW32")) ParseTreeCtrl(label,varname); - if (kindctrl=="SYSMONTHCAL32") + if (kindctrl==_T("SYSMONTHCAL32")) ParseCalendar(label,varname); - if (kindctrl=="SYSLISTVIEW32") + if (kindctrl==_T("SYSLISTVIEW32")) ParseListCtrl(label,varname); - if (kindctrl=="BUTTON") + if (kindctrl==_T("BUTTON")) ParseCtrlButton(label,varname); - if (kindctrl=="RICHEDIT") + if (kindctrl==_T("RICHEDIT")) ParseRichEdit(label,varname); + if (kindctrl==_T("STATIC")) + { + wxString token; + int p=m_rc.Tell(); + ReadOrs(token); + m_rc.Seek(p); + if (token.Find(_T("SS_BITMAP"))!=wxNOT_FOUND) + ParseStaticBitmap(label,varname); + else + ParseStaticText(label,varname); + } + if (kindctrl==_T("EDIT")) + ParseTextCtrl(varname); + if (kindctrl==_T("LISTBOX")) + ParseListBox(varname); + if (kindctrl==_T("COMBOBOX")) + ParseComboBox(varname); } @@ -1098,12 +1236,12 @@ void rc2xml::ParseWeirdMSControl() kindctrl=GetQuoteField(); kindctrl.MakeUpper(); // CONTROL IDB_FACE,IDC_STATIC,"Static",SS_BITMAP,26,62,32,30 - if (kindctrl=="STATIC") + if (kindctrl==_T("STATIC")) { - if (PeekToken()=="SS_BITMAP") + if (PeekToken()==_T("SS_BITMAP")) ParseStaticBitmap(id,varname); else - wxLogError("Unknown MS Control Static token"); + wxLogError(_T("Unknown MS Control Static token")); } } @@ -1120,61 +1258,61 @@ void rc2xml::ParseScrollBar() wxString style; ReadOrs(token); - -if (token.Find("SBS_VERT")!=-1) + +if (token.Find(_T("SBS_VERT"))!=wxNOT_FOUND) style=_T("wxSB_VERTICAL"); //Default MFC style is horizontal else style=_T("wxSB_HORIZONTAL"); - m_xmlfile.Write("\t\t\n"); + m_xmlfile.Write(_T("\n\t\t\n")); } // CONTROL "Tree1",IDC_TREE1,"SysTreeView32",WS_BORDER | WS_TABSTOP, // 7,7,66,61 -void rc2xml::ParseTreeCtrl(wxString label, wxString varname) +void rc2xml::ParseTreeCtrl(wxString WXUNUSED(label), wxString varname) { wxString token; //while (ReadOrs(token)); ReadOrs(token); int x,y,width,height; ReadRect(x,y,width,height); - m_xmlfile.Write("\t\t\n"); + m_xmlfile.Write(_T("\t\t\n")); } // CONTROL "MonthCalendar1",IDC_MONTHCALENDAR1,"SysMonthCal32", //MCS_NOTODAY | WS_TABSTOP,105,71,129,89 -void rc2xml::ParseCalendar(wxString label, wxString varname) +void rc2xml::ParseCalendar(wxString WXUNUSED(label), wxString varname) { wxString token; //while (ReadOrs(token)); ReadOrs(token); int x,y,width,height; ReadRect(x,y,width,height); - m_xmlfile.Write("\t\t\n"); + m_xmlfile.Write(_T("\t\t\n")); } // CONTROL "List1",IDC_LIST1,"SysListView32",WS_BORDER | WS_TABSTOP, // 7,89,68,71 -void rc2xml::ParseListCtrl(wxString label, wxString varname) +void rc2xml::ParseListCtrl(wxString WXUNUSED(label), wxString varname) { wxString token; //while (ReadOrs(token)); ReadOrs(token); int x,y,width,height; ReadRect(x,y,width,height); - m_xmlfile.Write("\t\t\n"); + m_xmlfile.Write(_T("\t\t\n")); } @@ -1184,23 +1322,23 @@ void rc2xml::WriteBitmap(wxString bitmapname) wxNode *node=m_bitmaplist->Find(LookUpId(bitmapname)); if (node==NULL) { - m_xmlfile.Write("\t\t\tmissingfile\n"); - wxLogError("Unable to find bitmap:"+bitmapname); + m_xmlfile.Write(_T("\t\t\tmissingfile\n")); + wxLogError(_T("Unable to find bitmap:")+bitmapname); return; } - + wxString *bitmappath; - bitmappath=(wxString *)node->Data(); + bitmappath=(wxString *)node->GetData(); bitmapname=wxFileNameFromPath(*bitmappath); wxBitmap bitmap; if (!bitmap.LoadFile(*bitmappath,wxBITMAP_TYPE_BMP )) - wxLogError("Unable to load bitmap:"+*bitmappath); + wxLogError(_T("Unable to load bitmap:")+*bitmappath); //Make a bitmap file name bitmapname=CleanName(bitmapname); - bitmapname+=".bmp"; - m_xmlfile.Write("\t\t\t"+bitmapname+"\n"); + bitmapname+=_T(".bmp"); + m_xmlfile.Write(_T("\t\t\t")+bitmapname+_T("\n")); bitmap.SaveFile(m_targetpath+bitmapname,wxBITMAP_TYPE_BMP); } @@ -1209,15 +1347,15 @@ void rc2xml::WriteIcon(wxString iconname) wxNode *node=m_iconlist->Find(iconname); if (node==NULL) { - m_xmlfile.Write("\t\t\tmissing_file\n"); - wxLogError("Unable to find icon:"+iconname); + m_xmlfile.Write(_T("\t\t\tmissing_file\n")); + wxLogError(_T("Unable to find icon:")+iconname); } wxString *iconpath; - iconpath=(wxString *)node->Data(); + iconpath=(wxString *)node->GetData(); wxIcon icon; wxBitmap bitmap; if (!icon.LoadFile(*iconpath,wxBITMAP_TYPE_ICO )) - wxLogError("Unable to load icon:"+*iconpath); + wxLogError(_T("Unable to load icon:")+*iconpath); #ifdef __WXMSW__ bitmap.CopyFromIcon(icon); #else @@ -1226,11 +1364,11 @@ wxNode *node=m_iconlist->Find(iconname); iconname=wxFileNameFromPath(*iconpath); //Make a bitmap file name iconname=CleanName(iconname); - iconname+=".bmp"; - m_xmlfile.Write("\t\t\t"+iconname+"\n"); + iconname+=_T(".bmp"); + m_xmlfile.Write(_T("\t\t\t")+iconname+_T("\n")); bitmap.SaveFile(m_targetpath+iconname,wxBITMAP_TYPE_BMP); - + } /*Unfortunately sometimes the great MSVC Resource editor decides to use numbers instead of the word id. I have no idea why they @@ -1243,24 +1381,24 @@ void rc2xml::ParseResourceHeader() { wxTextFile r; //Attempt to load resource.h in current path - if (!r.Open("resource.h")) + if (!r.Open(_T("resource.h"))) { - wxLogError("Warining Unable to load resource.h file"); + wxLogError(_T("Warining Unable to load resource.h file")); return; } - + wxString str; wxString id,v; wxStringTokenizer tok; wxString *varname; - - + + long n; //Read through entire file for ( str = r.GetFirstLine(); !r.Eof(); str = r.GetNextLine() ) { - if (str.Find("#define")!=-1) + if (str.Find(_T("#define"))!=wxNOT_FOUND) { tok.SetString(str); //Just ignore #define token @@ -1277,8 +1415,8 @@ wxTextFile r; } } - - + + } @@ -1295,7 +1433,7 @@ wxNode *node=m_resourcelist->Find(n); if (node==NULL) return id; - s=(wxString *)node->Data(); + s=(wxString *)node->GetData(); st=*s; return st; }