Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More cleaning and wxFileOffset usage.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-03-08 20:43:57 +00:00
parent f491ed976a
commit 656dad21d8
1 changed files with 30 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
contrib/utils/convertrc/rc2xml.cpp
View File

@@ -621,25 +621,22 @@ void rc2xml::ParsePopupMenu()
wxString rc2xml::PeekToken() wxString rc2xml::PeekToken()
{ {
wxString token; wxFileOffset p = m_rc.Tell();
int p; wxString token=GetToken();
p=m_rc.Tell();
token=GetToken();
m_rc.Seek(p); m_rc.Seek(p);
return token; return token;
} }
//MS Windows pain in the butt CONTROL //MS Windows pain in the butt CONTROL
void rc2xml::ParseControlMS() void rc2xml::ParseControlMS()
{ {
wxString label,varname,kindctrl,token; wxString token = PeekToken();
token=PeekToken();
if (token.Contains(_T("\""))) if (token.Contains(_T("\"")))
ParseNormalMSControl(); ParseNormalMSControl();
else else
ParseWeirdMSControl(); ParseWeirdMSControl();
} }
/* CONTROL "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_BOTH | /* CONTROL "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_BOTH |
@@ -706,15 +703,14 @@ bool rc2xml::ReadOrs(wxString & orstring)
void rc2xml::ParseCtrlButton(wxString label, wxString varname) void rc2xml::ParseCtrlButton(wxString label, wxString varname)
{ {
wxString token; wxString token;
int p; wxFileOffset p = m_rc.Tell();
p=m_rc.Tell();
ReadOrs(token); ReadOrs(token);
m_rc.Seek(p); m_rc.Seek(p);
if (token.Find(_T("BS_AUTOCHECKBOX"))!=wxNOT_FOUND) if (token.Find(_T("BS_AUTOCHECKBOX"))!=wxNOT_FOUND)
ParseCheckBox(label, varname); ParseCheckBox(label, varname);
else if ((token.Find(_T("BS_AUTORADIOBUTTON"))!=wxNOT_FOUND)|| else if ((token.Find(_T("BS_AUTORADIOBUTTON"))!=wxNOT_FOUND)||
(token.Find(_T("BS_RADIOBUTTON"))!=wxNOT_FOUND)) (token.Find(_T("BS_RADIOBUTTON"))!=wxNOT_FOUND))
ParseRadioButton(label, varname); ParseRadioButton(label, varname);
else if (token.Find(_T("BS_GROUPBOX"))!=wxNOT_FOUND) else if (token.Find(_T("BS_GROUPBOX"))!=wxNOT_FOUND)
ParseGroupBox(label, varname); ParseGroupBox(label, varname);
@@ -1185,70 +1181,63 @@ void rc2xml::ParseStaticBitmap(wxString bitmapname, wxString varname)
void rc2xml::ParseNormalMSControl() void rc2xml::ParseNormalMSControl()
{ {
wxString label,varname,kindctrl; wxString label=GetQuoteField();
wxString varname=GetToken();
label=GetQuoteField(); wxString kindctrl=GetQuoteField();
varname=GetToken(); kindctrl.MakeUpper();
kindctrl=GetQuoteField();
kindctrl.MakeUpper();
if (kindctrl==_T("MSCTLS_UPDOWN32")) if (kindctrl==_T("MSCTLS_UPDOWN32"))
ParseSpinCtrl(label,varname); ParseSpinCtrl(label,varname);
if (kindctrl==_T("MSCTLS_TRACKBAR32")) else if (kindctrl==_T("MSCTLS_TRACKBAR32"))
ParseSlider(label,varname); ParseSlider(label,varname);
if (kindctrl==_T("MSCTLS_PROGRESS32")) else if (kindctrl==_T("MSCTLS_PROGRESS32"))
ParseProgressBar(label,varname); ParseProgressBar(label,varname);
if (kindctrl==_T("SYSTREEVIEW32")) else if (kindctrl==_T("SYSTREEVIEW32"))
ParseTreeCtrl(label,varname); ParseTreeCtrl(label,varname);
if (kindctrl==_T("SYSMONTHCAL32")) else if (kindctrl==_T("SYSMONTHCAL32"))
ParseCalendar(label,varname); ParseCalendar(label,varname);
if (kindctrl==_T("SYSLISTVIEW32")) else if (kindctrl==_T("SYSLISTVIEW32"))
ParseListCtrl(label,varname); ParseListCtrl(label,varname);
if (kindctrl==_T("BUTTON")) else if (kindctrl==_T("BUTTON"))
ParseCtrlButton(label,varname); ParseCtrlButton(label,varname);
if (kindctrl==_T("RICHEDIT")) else if (kindctrl==_T("RICHEDIT"))
ParseRichEdit(label,varname); ParseRichEdit(label,varname);
if (kindctrl==_T("STATIC")) else if (kindctrl==_T("STATIC"))
{ {
wxString token; wxString token;
int p=m_rc.Tell(); wxFileOffset p = m_rc.Tell();
ReadOrs(token); ReadOrs(token);
m_rc.Seek(p); m_rc.Seek(p);
if (token.Find(_T("SS_BITMAP"))!=wxNOT_FOUND) if (token.Find(_T("SS_BITMAP"))!=wxNOT_FOUND)
ParseStaticBitmap(label,varname); ParseStaticBitmap(label,varname);
else else
ParseStaticText(label,varname); ParseStaticText(label,varname);
} }
if (kindctrl==_T("EDIT")) else if (kindctrl==_T("EDIT"))
ParseTextCtrl(varname); ParseTextCtrl(varname);
if (kindctrl==_T("LISTBOX")) else if (kindctrl==_T("LISTBOX"))
ParseListBox(varname); ParseListBox(varname);
if (kindctrl==_T("COMBOBOX")) else if (kindctrl==_T("COMBOBOX"))
ParseComboBox(varname); ParseComboBox(varname);
} }
void rc2xml::ParseWeirdMSControl() void rc2xml::ParseWeirdMSControl()
{ {
wxString kindctrl; wxString id = GetToken();
wxString varname; wxString varname = GetToken();
wxString id; wxString kindctrl = GetQuoteField();
id=GetToken();
varname=GetToken();
kindctrl=GetQuoteField();
kindctrl.MakeUpper(); kindctrl.MakeUpper();
// CONTROL IDB_FACE,IDC_STATIC,"Static",SS_BITMAP,26,62,32,30 // CONTROL IDB_FACE,IDC_STATIC,"Static",SS_BITMAP,26,62,32,30
if (kindctrl==_T("STATIC")) if (kindctrl==_T("STATIC"))
{ {
if (PeekToken()==_T("SS_BITMAP")) if (PeekToken()==_T("SS_BITMAP"))
ParseStaticBitmap(id,varname); ParseStaticBitmap(id,varname);
else else
wxLogError(_T("Unknown MS Control Static token")); 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() void rc2xml::ParseScrollBar()
{ {
wxString token; wxString token;