From 19311d4e7c43a3f6243bf805c164fd76cada0386 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=C5=82odzimierz=20Skiba?= Date: Fri, 4 Mar 2005 19:32:40 +0000 Subject: [PATCH] Better wxFile support, warning fixes and minor source cleaning. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32604 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/utils/convertrc/rc2wxr.cpp | 33 ++++------------ contrib/utils/convertrc/rc2wxr.h | 57 ++++++++++++++-------------- contrib/utils/convertrc/rc2xml.cpp | 6 ++- contrib/utils/convertrc/rc2xml.h | 2 +- contrib/utils/wxrcedit/pe_adv.cpp | 8 ++-- contrib/utils/wxrcedit/propframe.cpp | 4 +- 6 files changed, 47 insertions(+), 63 deletions(-) diff --git a/contrib/utils/convertrc/rc2wxr.cpp b/contrib/utils/convertrc/rc2wxr.cpp index 11eb941376..2a923d5445 100644 --- a/contrib/utils/convertrc/rc2wxr.cpp +++ b/contrib/utils/convertrc/rc2wxr.cpp @@ -675,41 +675,24 @@ return phrase; void rc2wxr::ReadChar(int &ch) - { + wxFileOffset result = m_rc.Tell(); - int result; + if ( result >= m_filesize ) + m_done=true; -result=m_rc.Tell(); + result = m_rc.Read(&ch,1); + if ( result==wxInvalidOffset ) + m_done=true; - -if((result>=m_filesize)) - - m_done=true; - - - -result=m_rc.Read(&ch,1); - - - -if((result==-1)) - - m_done=true; - - - -if(ch==EOF) - - m_done=true; - + if(ch==EOF) + m_done=true; } void rc2wxr::ParseComboBox() - { /* COMBOBOX IDC_SCALECOMBO,10,110,48,52,CBS_DROPDOWNLIST | CBS_SORT | diff --git a/contrib/utils/convertrc/rc2wxr.h b/contrib/utils/convertrc/rc2wxr.h index 3250092d7e..d01f76591f 100644 --- a/contrib/utils/convertrc/rc2wxr.h +++ b/contrib/utils/convertrc/rc2wxr.h @@ -11,37 +11,36 @@ class rc2wxr : public wxObject { public: -rc2wxr(); -~rc2wxr(); -void Convert(wxString wxrfile, wxString rcfile); + rc2wxr(); + ~rc2wxr(); + void Convert(wxString wxrfile, wxString rcfile); private: -wxFile m_rc; -FILE *m_wxr; -int m_filesize; -bool m_done; -int m_controlid; -void ParseDialog(wxString dlgname); -void ParseControls(); -void ParseStaticText(); -void ParseTextCtrl(); -void ParsePushButton(); -bool Seperator(int ch); -void ParseGroupBox(); -void ReadRect(int & x, int & y, int & width, int & height); -wxString GetToken(); -wxString GetQuoteField(); -void ReadChar(int &ch); -void ParseComboBox(); -void ParseMenu(wxString name); -void ParsePopupMenu(); -wxString PeekToken(); -void ParseControlMS(); -void ParseSlider(wxString label, wxString varname); -void ParseProgressBar(wxString label, wxString varname); -bool ReadOrs(wxString & w); -void ParseCtrlButton(wxString label, wxString varname); - + wxFile m_rc; + FILE *m_wxr; + wxFileOffset m_filesize; + bool m_done; + int m_controlid; + void ParseDialog(wxString dlgname); + void ParseControls(); + void ParseStaticText(); + void ParseTextCtrl(); + void ParsePushButton(); + bool Seperator(int ch); + void ParseGroupBox(); + void ReadRect(int & x, int & y, int & width, int & height); + wxString GetToken(); + wxString GetQuoteField(); + void ReadChar(int &ch); + void ParseComboBox(); + void ParseMenu(wxString name); + void ParsePopupMenu(); + wxString PeekToken(); + void ParseControlMS(); + void ParseSlider(wxString label, wxString varname); + void ParseProgressBar(wxString label, wxString varname); + bool ReadOrs(wxString & w); + void ParseCtrlButton(wxString label, wxString varname); }; diff --git a/contrib/utils/convertrc/rc2xml.cpp b/contrib/utils/convertrc/rc2xml.cpp index 4279eaef82..386d02a27b 100644 --- a/contrib/utils/convertrc/rc2xml.cpp +++ b/contrib/utils/convertrc/rc2xml.cpp @@ -901,7 +901,8 @@ void rc2xml::FirstPass() void rc2xml::ParseBitmap(wxString varname) { - wxString token,*bitmapfile; + wxString token; + wxString *bitmapfile; token=PeekToken(); //Microsoft notation? @@ -1138,7 +1139,8 @@ void rc2xml::ParseIconStatic() //IDR_MAINFRAME ICON DISCARDABLE "res\\mfcexample.ico" void rc2xml::ParseIcon(wxString varname) { - wxString token,*iconfile; + wxString token; + wxString *iconfile; iconfile=new wxString; token=PeekToken(); diff --git a/contrib/utils/convertrc/rc2xml.h b/contrib/utils/convertrc/rc2xml.h index 0481665f4b..edf6ba9551 100644 --- a/contrib/utils/convertrc/rc2xml.h +++ b/contrib/utils/convertrc/rc2xml.h @@ -87,7 +87,7 @@ protected: wxList * m_resourcelist; wxFile m_rc; wxFFile m_xmlfile; - int m_filesize; + wxFileOffset m_filesize; bool m_done; }; diff --git a/contrib/utils/wxrcedit/pe_adv.cpp b/contrib/utils/wxrcedit/pe_adv.cpp index 7698cf6804..e89206d328 100644 --- a/contrib/utils/wxrcedit/pe_adv.cpp +++ b/contrib/utils/wxrcedit/pe_adv.cpp @@ -115,9 +115,9 @@ void PropEditCtrlColor::OnDetails() if (txt.Length() == 7 && txt[0u] == _T('#') && wxSscanf(txt.c_str(), _T("#%lX"), &tmp) == 1) - clr = wxColour((tmp & 0xFF0000) >> 16, - (tmp & 0x00FF00) >> 8, - (tmp & 0x0000FF)); + clr = wxColour((unsigned char)((tmp & 0xFF0000) >> 16), + (unsigned char)((tmp & 0x00FF00) >> 8), + (unsigned char)((tmp & 0x0000FF))); clr = wxGetColourFromUser(NULL, clr); if (clr.Ok()) @@ -186,7 +186,7 @@ void PropEditCtrlFlags::OnDetails() for (i = 0; i < arr.GetCount(); i++) if (lbox->IsChecked(i)) txt << arr[i] << _T('|'); - if (!txt.IsEmpty()) txt.RemoveLast(); + if (!txt.empty()) txt.RemoveLast(); m_TextCtrl->SetValue(txt); WriteValue(); diff --git a/contrib/utils/wxrcedit/propframe.cpp b/contrib/utils/wxrcedit/propframe.cpp index ee124f4048..b31b83425c 100644 --- a/contrib/utils/wxrcedit/propframe.cpp +++ b/contrib/utils/wxrcedit/propframe.cpp @@ -60,10 +60,10 @@ class PropsTree: public wxRemotelyScrolledTreeCtrl // Reset the device origin since it may have been set dc.SetDeviceOrigin(0, 0); - wxPen pen(wxColour(_T("BLACK")), 1, wxSOLID); + wxPen pen(*wxBLACK, 1, wxSOLID); dc.SetPen(pen); - dc.SetBrush(* wxTRANSPARENT_BRUSH); + dc.SetBrush(*wxTRANSPARENT_BRUSH); wxSize clientSize = GetClientSize(); wxRect itemRect;