X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/159933045eb704d37c152a1af1041ee59da004cc..dcb39c53303d1ec6884f7bcd7bc9dc101e560e62:/contrib/utils/convertrc/rc2wxr.cpp diff --git a/contrib/utils/convertrc/rc2wxr.cpp b/contrib/utils/convertrc/rc2wxr.cpp index 4d141c7edd..af389830d1 100644 --- a/contrib/utils/convertrc/rc2wxr.cpp +++ b/contrib/utils/convertrc/rc2wxr.cpp @@ -9,547 +9,794 @@ I don't plan to fix them since I feel that wxr files will not be used much longer. This code was used as a starting point for my rc2xml converter */ + #ifdef __GNUG__ -#pragma implementation "rc2wxr.cpp" -#pragma interface "rc2wxr.cpp" +#pragma implementation "rc2wxr.h" #endif // For compilers that support precompilation, includes "wx/wx.h". -#include +#include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #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 + #include "wx/wx.h" #endif +#include "wx/image.h" +#include "wx/deprecated/setup.h" +#include "wx/deprecated/resource.h" #include "rc2wxr.h" -#include "wx/image.h" -#include "wx/resource.h" + ////////////////////////////////////////////////////////////////////// // Construction/Destruction ////////////////////////////////////////////////////////////////////// rc2wxr::rc2wxr() { -m_done=FALSE; -m_controlid=6000; + m_done=false; + m_controlid=6000; } rc2wxr::~rc2wxr() { - } void rc2wxr::Convert(wxString wxrfile, wxString rcfile) { -m_rc.Open(rcfile); -m_filesize=m_rc.Length(); -if( (m_wxr = fopen( wxrfile, "wt" )) == NULL ) -{ - return; -} + m_rc.Open(rcfile); + m_filesize=m_rc.Length(); + if( (m_wxr = wxFopen( wxrfile, _T("wt") )) == NULL ) + { + return; + } + wxString tok,prevtok; -wxString tok,prevtok; + while (!m_done) + { + tok=GetToken(); + if (tok==_T("DIALOG")) + { + ParseDialog(prevtok); + } -while (!m_done) -{ + if (tok==_T("MENU")) + { + ParseMenu(prevtok); + } -tok=GetToken(); + prevtok=tok; + } -if (tok=="DIALOG") -{ -ParseDialog(prevtok); -} - + fclose(m_wxr); -if (tok=="MENU") -{ -ParseMenu(prevtok); -} - -prevtok=tok; + m_rc.Close(); } -fclose(m_wxr); -//fclose(m_rc); -m_rc.Close(); -} +/* +Example .rc -/* -Example .rc Microsoft style as of v5.0 + IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 217, 55 + STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU + CAPTION "About Funimator" + FONT 8, "MS Sans Serif" Borland 4.5 style rc + IDD_DIBATTR DIALOG 7, 16, 172, 119 + STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU + CAPTION "DIB Attributes" + FONT 8, "MS Sans Serif" + { - DEFPUSHBUTTON "Ok", IDOK, 114, 8, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 114, 28, 50, 14 + DEFPUSHBUTTON "Ok", IDOK, 114, 8, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 114, 28, 50, 14 */ + void rc2wxr::ParseDialog(wxString dlgname) + { + wxString tok; + 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 + */ + tok=PeekToken(); + //Microsoft notation? -if (tok=="DISCARDABLE") + +if (tok==_T("DISCARDABLE")) + { + tok=GetToken(); + tok=PeekToken(); + } + //This isn't a Dialog resource eject eject + if (!tok.IsNumber()) + return; + //Generate Dialog text -fprintf(m_wxr,"static char *dialog%i = \"dialog(name = '%s',\\\n",dlgid,dlgname); + +wxFprintf(m_wxr,_T("static char *dialog%i = \"dialog(name = '%s',\\\n"),dlgid,dlgname.c_str()); + //be lazy about style for now. add it later -fprintf(m_wxr,"style = 'wxRAISED_BORDER | wxCAPTION | wxTHICK_FRAME | wxSYSTEM_MENU',\\\n"); -fprintf(m_wxr,"id = %i,\\\n",dlgid); +wxFprintf(m_wxr,_T("style = 'wxRAISED_BORDER | wxCAPTION | wxTHICK_FRAME | wxSYSTEM_MENU',\\\n")); +wxFprintf(m_wxr,_T("id = %i,\\\n"),dlgid); //Record x,y,width,height + int x,y,width,height; + ReadRect(x,y,width,height); -fprintf(m_wxr,"x = %i, y = %i, width = %i, height = %i,\\\n",x,y,width,height); + +wxFprintf(m_wxr,_T("x = %i, y = %i, width = %i, height = %i,\\\n"),x,y,width,height); //CAPTION "About Funimator" + //Get Title + tok=GetToken(); + wxString title; -while ((tok!="BEGIN")&(tok!="{")) + + +while ((tok!=_T("BEGIN"))&(tok!=_T("{"))) + { -if (tok=="CAPTION") + +if (tok==_T("CAPTION")) + { + title=GetQuoteField(); -fprintf(m_wxr,"title = '%s',\\\n",title); + +wxFprintf(m_wxr,_T("title = '%s',\\\n"),title.c_str()); + } + tok=GetToken(); + } -fprintf(m_wxr,"use_dialog_units = 1,\\\n"); -fprintf(m_wxr,"use_system_defaults = 0,\\\n"); -fprintf(m_wxr,"font = [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif'],\\\n"); +wxFprintf(m_wxr,_T("use_dialog_units = 1,\\\n")); + +wxFprintf(m_wxr,_T("use_system_defaults = 0,\\\n")); + + + +wxFprintf(m_wxr,_T("font = [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif'],\\\n")); + ParseControls(); -fprintf(m_wxr,").\";\n\n"); + +wxFprintf(m_wxr,_T(").\";\n\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 + END + */ + void rc2wxr::ParseControls() + { + wxString tok; + + tok=GetToken(); -while ((tok!="END")&(tok!="}")) + +while ((tok!=_T("END"))&(tok!=_T("}"))) + { -if (tok=="LTEXT") + +if (tok==_T("LTEXT")) + ParseStaticText(); -if (tok=="EDITTEXT") + +if (tok==_T("EDITTEXT")) + ParseTextCtrl(); -if (tok=="PUSHBUTTON") + +if (tok==_T("PUSHBUTTON")) + ParsePushButton(); -if (tok=="DEFPUSHBUTTON") + +if (tok==_T("DEFPUSHBUTTON")) + ParsePushButton(); -if (tok=="GROUPBOX") + +if (tok==_T("GROUPBOX")) + ParseGroupBox(); -if (tok=="COMBOBOX") + +if (tok==_T("COMBOBOX")) + ParseComboBox(); -if (tok=="CONTROL") + +if (tok==_T("CONTROL")) + ParseControlMS(); + + tok=GetToken(); + } + + } + //LTEXT "Radius",IDC_STATIC,9,67,23,8 + void rc2wxr::ParseStaticText() + { + wxString tok; + wxString phrase,varname; + phrase=GetQuoteField(); + varname=GetToken(); + m_controlid++; + int x,y,width,height; + ReadRect(x,y,width,height); -fprintf(m_wxr," control = [%i,wxStaticText,'%s','0','%s',",m_controlid,phrase,varname); -fprintf(m_wxr,"%i,%i,%i,%i,'',\\\n",x,y,width,height); -fprintf(m_wxr,"[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n"); + +wxFprintf(m_wxr,_T(" control = [%i,wxStaticText,'%s','0','%s',"),m_controlid,phrase.c_str(),varname.c_str()); + +wxFprintf(m_wxr,_T("%i,%i,%i,%i,'',\\\n"),x,y,width,height); + +wxFprintf(m_wxr,_T("[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n")); + } + //EDITTEXT IDC_RADIUS,36,65,40,14,ES_AUTOHSCROLL + void rc2wxr::ParseTextCtrl() + { + wxString tok; + wxString varname; + varname=GetToken(); + m_controlid++; + int x,y,width,height; + ReadRect(x,y,width,height); -fprintf(m_wxr," control = [%i,wxTextCtrl,'','0','%s',",m_controlid,varname); -fprintf(m_wxr,"%i,%i,%i,%i,'',\\\n",x,y,width,height); -fprintf(m_wxr,"[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n"); + +wxFprintf(m_wxr,_T(" control = [%i,wxTextCtrl,'','0','%s',"),m_controlid,varname.c_str()); + +wxFprintf(m_wxr,_T("%i,%i,%i,%i,'',\\\n"),x,y,width,height); + +wxFprintf(m_wxr,_T("[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n")); + + } + //PUSHBUTTON "Create/Update",IDC_CREATE,15,25,53,13,NOT WS_TABSTOP + void rc2wxr::ParsePushButton() + { + wxString tok; + wxString phrase,varname; + phrase=GetQuoteField(); + varname=GetToken(); + int c; + m_controlid++; + c=m_controlid; -if (varname=="IDOK") + +if (varname==_T("IDOK")) + c=wxID_OK; -if (varname=="IDCANCEL") + + +if (varname==_T("IDCANCEL")) + c=wxID_CANCEL; -if (varname=="IDAPPLY") + + +if (varname==_T("IDAPPLY")) + c=wxID_APPLY; + + int x,y,width,height; + ReadRect(x,y,width,height); -fprintf(m_wxr," control = [%i,wxButton,'%s','0','%s',",c,phrase,varname); -fprintf(m_wxr,"%i,%i,%i,%i,'',\\\n",x,y,width,height); -fprintf(m_wxr,"[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n"); + +wxFprintf(m_wxr,_T(" control = [%i,wxButton,'%s','0','%s',"),c,phrase.c_str(),varname.c_str()); + +wxFprintf(m_wxr,_T("%i,%i,%i,%i,'',\\\n"),x,y,width,height); + +wxFprintf(m_wxr,_T("[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n")); + + } + + + bool rc2wxr::Seperator(int ch) + { + if ((ch==' ')|(ch==',')|(ch==13)|(ch==10)|(ch=='|')) - return TRUE; + + return true; + + if (ch==EOF) + { -m_done=TRUE; -return TRUE; + +m_done=true; + +return true; + } -return FALSE; + +return false; + } + + void rc2wxr::ParseGroupBox() + { + // GROUPBOX "Rotate",IDC_STATIC,1,1,71,79 + wxString tok; + wxString phrase,varname; + phrase=GetQuoteField(); + varname=GetToken(); + m_controlid++; + int x,y,width,height; + ReadRect(x,y,width,height); -fprintf(m_wxr," control = [%i,wxStaticBox,'%s','0','%s',",m_controlid,phrase,varname); -fprintf(m_wxr,"%i,%i,%i,%i,'',\\\n",x,y,width,height); -fprintf(m_wxr,"[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n"); + +wxFprintf(m_wxr,_T(" control = [%i,wxStaticBox,'%s','0','%s',"),m_controlid,phrase.c_str(),varname.c_str()); + +wxFprintf(m_wxr,_T("%i,%i,%i,%i,'',\\\n"),x,y,width,height); + +wxFprintf(m_wxr,_T("[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n")); + + + } + + void rc2wxr::ReadRect(int & x, int & y, int & width, int & height) + { -x=atoi(GetToken()); -y=atoi(GetToken()); -width=atoi(GetToken()); -height=atoi(GetToken()); + +x=wxAtoi(GetToken()); + +y=wxAtoi(GetToken()); + +width=wxAtoi(GetToken()); + +height=wxAtoi(GetToken()); + + } + + wxString rc2wxr::GetToken() + { -wxString tok=""; + +wxString tok=wxEmptyString; + + if (m_rc.Eof()) + { -m_done=TRUE; + +m_done=true; + return tok; + } + + int ch=0; + ReadChar(ch); + if (ch==EOF) + { -m_done=TRUE; + +m_done=true; + return tok; + } + + while (Seperator(ch)) + { + ReadChar(ch); + if (m_done) + return tok; + } + + if (ch==EOF) + { -m_done=TRUE; + +m_done=true; + + } - + + + + while (!Seperator(ch)) + { + tok+=(char)ch; + ReadChar(ch); + + } + + if (ch==EOF) - m_done=TRUE; + + m_done=true; + + + return tok; + } + + wxString rc2wxr::GetQuoteField() { -wxString phrase; -//ASCII code 34 " -int ch=0; -ReadChar(ch); + wxString phrase; -while (ch!=34) - ReadChar(ch); - - ReadChar(ch); + //ASCII code 34 " + int ch=0; + ReadChar(ch); -while (ch!=34) -{ - phrase+=(char)ch; - ReadChar(ch); -} -return phrase; + while (ch!=34) + ReadChar(ch); + + ReadChar(ch); + + while (ch!=34) + { + phrase+=(char)ch; + ReadChar(ch); + } + + return phrase; } + + void rc2wxr::ReadChar(int &ch) { - int result; -result=m_rc.Tell(); + wxFileOffset result = m_rc.Tell(); -if((result>=m_filesize)) - m_done=TRUE; + if ( result >= m_filesize ) + 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; + if(ch==EOF) + m_done=true; } + +/* COMBOBOX IDC_SCALECOMBO,10,110,48,52,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP */ void rc2wxr::ParseComboBox() { -/* COMBOBOX IDC_SCALECOMBO,10,110,48,52,CBS_DROPDOWNLIST | CBS_SORT | - WS_VSCROLL | WS_TABSTOP */ -wxString tok; -wxString varname; -varname=GetToken(); -m_controlid++; -int x,y,width,height; -ReadRect(x,y,width,height); - -fprintf(m_wxr," control = [%i,wxChoice,'','0','%s',",m_controlid,varname); -fprintf(m_wxr,"%i,%i,%i,%i,[],\\\n",x,y,width,height); -fprintf(m_wxr,"[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n"); + int x,y,width,height; + wxString tok; + wxString varname = GetToken(); + m_controlid++; + ReadRect(x,y,width,height); + wxFprintf(m_wxr,_T(" control = [%i,wxChoice,'','0','%s',"),m_controlid,varname.c_str()); + wxFprintf(m_wxr,_T("%i,%i,%i,%i,[],\\\n"),x,y,width,height); + wxFprintf(m_wxr,_T("[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n")); } + void rc2wxr::ParseMenu(wxString name) { -wxString tok=""; -static int menuid=0; -menuid++; -fprintf(m_wxr,"static char *MenuBar%i = \"menu(name = '%s',\\\n",menuid,name); -fprintf(m_wxr,"menu = \\\n"); -fprintf(m_wxr,"[\\\n"); + wxString tok; + static int menuid=0; + menuid++; + wxFprintf(m_wxr,_T("static char *MenuBar%i = \"menu(name = '%s',\\\n"),menuid,name.c_str()); + wxFprintf(m_wxr,_T("menu = \\\n")); + wxFprintf(m_wxr,_T("[\\\n")); -while ((tok!="BEGIN")&(tok!="{")) - tok=GetToken(); + while ((tok!=_T("BEGIN"))&(tok!=_T("{"))) + tok=GetToken(); -while ((tok!="END")&(tok!="}")) -{ - tok=GetToken(); -if (tok=="POPUP") - { - ParsePopupMenu(); - fprintf(m_wxr," ],\\\n"); - } -} + while ((tok!=_T("END"))&(tok!=_T("}"))) + { + tok=GetToken(); -fprintf(m_wxr,"]).\";\n\n"); + if (tok==_T("POPUP")) + { + ParsePopupMenu(); + wxFprintf(m_wxr,_T(" ],\\\n")); + } + } + + wxFprintf(m_wxr,_T("]).\";\n\n")); } + void rc2wxr::ParsePopupMenu() { -static int menuitem=99; -menuitem++; + static int menuitem=99; -wxString tok; -tok=GetQuoteField(); -int spot; -//Remove /t because it causes problems -spot=tok.First("\\t"); -tok=tok.Left(spot); -fprintf(m_wxr," ['%s',%i,'',\\\n",tok,menuitem); -while ((tok!="BEGIN")&(tok!="{")) - tok=GetToken(); + menuitem++; -while ((tok!="END")&(tok!="}")) -{ - tok=GetToken(); -if (tok=="MENUITEM") -{ -if (PeekToken()=="SEPARATOR") -fprintf(m_wxr," [],\\\n"); -else -{ -tok=GetQuoteField(); -//Remove /t because it causes problems -spot=tok.First("\\t"); -tok=tok.Left(spot); -menuitem++; -fprintf(m_wxr," ['%s',%i,''],\\\n",tok,menuitem); -} -} + wxString tok = GetQuoteField(); + int spot; -} + //Remove /t because it causes problems + spot=tok.First(_T("\\t")); + tok=tok.Left(spot); + + wxFprintf(m_wxr,_T(" ['%s',%i,'',\\\n"),tok.c_str(),menuitem); - + while ((tok!=_T("BEGIN"))&(tok!=_T("{"))) + tok=GetToken(); + + while ((tok!=_T("END"))&(tok!=_T("}"))) + { + tok=GetToken(); + + if (tok==_T("MENUITEM")) + { + if (PeekToken()==_T("SEPARATOR")) + { + wxFprintf(m_wxr,_T(" [],\\\n")); + } + else + { + tok=GetQuoteField(); + //Remove /t because it causes problems + spot=tok.First(_T("\\t")); + tok=tok.Left(spot); + menuitem++; + wxFprintf(m_wxr,_T(" ['%s',%i,''],\\\n"),tok.c_str(),menuitem); + } + } + } } + + wxString rc2wxr::PeekToken() { -wxString tok; -int p; -p=m_rc.Tell(); -tok=GetToken(); - -m_rc.Seek(p); -return tok; + wxFileOffset p = m_rc.Tell(); + wxString tok = GetToken(); + m_rc.Seek(p); + return tok; } + //Windows pain in the butt CONTROL void rc2wxr::ParseControlMS() { -wxString label,varname,kindctrl,tok; -label=GetQuoteField(); -varname=GetToken(); -kindctrl=GetQuoteField(); -kindctrl.MakeUpper(); - + wxString tok; + wxString label=GetQuoteField(); + wxString varname=GetToken(); + wxString kindctrl=GetQuoteField(); -if (kindctrl=="MSCTLS_TRACKBAR32") - ParseSlider(label,varname); -if (kindctrl=="MSCTLS_PROGRESS32") - ParseProgressBar(label,varname); -if (kindctrl=="BUTTON") - ParseCtrlButton(label,varname); + kindctrl.MakeUpper(); + if (kindctrl==_T("MSCTLS_TRACKBAR32")) + ParseSlider(label,varname); + if (kindctrl==_T("MSCTLS_PROGRESS32")) + ParseProgressBar(label,varname); + if (kindctrl==_T("BUTTON")) + ParseCtrlButton(label,varname); } -/* 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 rc2wxr::ParseSlider(wxString label, wxString varname) +void rc2wxr::ParseSlider(wxString WXUNUSED(label), wxString varname) { -wxString tok; -while (ReadOrs(tok)); -fprintf(m_wxr," control = [%i,wxSlider,'','wxSL_HORIZONTAL','%s',",m_controlid,varname); -int x,y,width,height; -ReadRect(x,y,width,height); -fprintf(m_wxr,"%i,%i,%i,%i,",x,y,width,height); -fprintf(m_wxr," 1, 1, 10,\\\n"); -fprintf(m_wxr,"[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n"); + int x,y,width,height; + wxString tok; + + while (ReadOrs(tok)) + ; + wxFprintf(m_wxr,_T(" control = [%i,wxSlider,'','wxSL_HORIZONTAL','%s',"),m_controlid,varname.c_str()); + ReadRect(x,y,width,height); + wxFprintf(m_wxr,_T("%i,%i,%i,%i,"),x,y,width,height); + wxFprintf(m_wxr,_T(" 1, 1, 10,\\\n")); + wxFprintf(m_wxr,_T("[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n")); } -/* + +/* CONTROL "Progress1",CG_IDC_PROGDLG_PROGRESS,"msctls_progress32", WS_BORDER,15,52,154,13 */ -void rc2wxr::ParseProgressBar(wxString label, wxString varname) +void rc2wxr::ParseProgressBar(wxString WXUNUSED(label), wxString varname) { -wxString tok; -while (ReadOrs(tok)); -fprintf(m_wxr," control = [%i,wxGauge,'','wxGA_HORIZONTAL','%s',",m_controlid,varname); -int x,y,width,height; -ReadRect(x,y,width,height); -fprintf(m_wxr,"%i,%i,%i,%i,",x,y,width,height); -fprintf(m_wxr," 0, 10,\\\n"); -fprintf(m_wxr,"[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n"); + int x,y,width,height; + wxString tok; + + while (ReadOrs(tok)) + ; + + wxFprintf(m_wxr,_T(" control = [%i,wxGauge,'','wxGA_HORIZONTAL','%s',"),m_controlid,varname.c_str()); + ReadRect(x,y,width,height); + wxFprintf(m_wxr,_T("%i,%i,%i,%i,"),x,y,width,height); + wxFprintf(m_wxr,_T(" 0, 10,\\\n")); + wxFprintf(m_wxr,_T("[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n")); } + bool rc2wxr::ReadOrs(wxString & w) { -wxString tok; -tok=PeekToken(); -if (tok.IsNumber()) - return false; -w=GetToken(); -return TRUE; + wxString tok = PeekToken(); + if (tok.IsNumber()) + return false; + w=GetToken(); + return true; } + //Is it a check button or a radio button void rc2wxr::ParseCtrlButton(wxString label, wxString varname) { -wxString tok; -tok=GetToken(); + int x,y,width,height; + wxString tok = GetToken(); -m_controlid++; -int x,y,width,height; - -if (tok=="BS_AUTOCHECKBOX") -{ - fprintf(m_wxr," control = [%i,wxCheckBox,'%s','0','%s',",m_controlid,label,varname); - while (ReadOrs(tok)); - ReadRect(x,y,width,height); - fprintf(m_wxr,"%i,%i,%i,%i,0,\\\n",x,y,width,height); - fprintf(m_wxr,"[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n"); -} + m_controlid++; -if (tok=="BS_AUTORADIOBUTTON") -{ - fprintf(m_wxr," control = [%i,wxRadioButton,'%s','0','%s',",m_controlid,label,varname); - while(ReadOrs(tok)); - ReadRect(x,y,width,height); - fprintf(m_wxr,"%i,%i,%i,%i,0,\\\n",x,y,width,height); - fprintf(m_wxr,"[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n"); -} + if (tok==_T("BS_AUTOCHECKBOX")) + { + wxFprintf(m_wxr,_T(" control = [%i,wxCheckBox,'%s','0','%s',"),m_controlid,label.c_str(),varname.c_str()); + while (ReadOrs(tok)) + ; + ReadRect(x,y,width,height); + wxFprintf(m_wxr,_T("%i,%i,%i,%i,0,\\\n"),x,y,width,height); + wxFprintf(m_wxr,_T("[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n")); + } + if (tok==_T("BS_AUTORADIOBUTTON")) + { + wxFprintf(m_wxr,_T(" control = [%i,wxRadioButton,'%s','0','%s',"),m_controlid,label.c_str(),varname.c_str()); + while(ReadOrs(tok)) + ; + ReadRect(x,y,width,height); + wxFprintf(m_wxr,_T("%i,%i,%i,%i,0,\\\n"),x,y,width,height); + wxFprintf(m_wxr,_T("[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n")); + } }