X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1df61962e86618c393188fce545a9d8ffbf8c425..d45318b8b6857ab6159b37c2f3ddce6a5f68be28:/src/xrc/xmlres.cpp diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp index 8f36455918..0e1b2943ab 100644 --- a/src/xrc/xmlres.cpp +++ b/src/xrc/xmlres.cpp @@ -8,7 +8,7 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "xmlres.h" #endif @@ -21,7 +21,9 @@ #if wxUSE_XRC +#ifndef __WXWINCE__ #include +#endif #include "wx/dialog.h" #include "wx/panel.h" @@ -38,6 +40,7 @@ #include "wx/image.h" #include "wx/fontmap.h" #include "wx/artprov.h" +#include "wx/settings.h" #include "wx/xml/xml.h" #include "wx/xrc/xmlres.h" @@ -100,7 +103,7 @@ bool wxXmlResource::Load(const wxString& filemask) fnd = wxXmlFindFirst; else fnd = filemask; - while (!!fnd) + while (!fnd.empty()) { // NB: Load() accepts both filenames and URLs (should probably be // changed to filenames only, but embedded resources currently @@ -795,11 +798,11 @@ wxString wxXmlResourceHandler::GetText(const wxString& param, bool translate) case wxT('n'): str2 << wxT('\n'); break; - + case wxT('t'): str2 << wxT('\t'); break; - + case wxT('r'): str2 << wxT('\r'); break; @@ -812,7 +815,7 @@ wxString wxXmlResourceHandler::GetText(const wxString& param, bool translate) break; } // else fall-through to default: branch below - + default: str2 << wxT('\\') << *dt; break; @@ -838,13 +841,11 @@ wxString wxXmlResourceHandler::GetText(const wxString& param, bool translate) #endif } } - else - { - // If wxXRC_USE_LOCALE is not set, then the string is already in - // system's default encoding in ANSI build, so we don't have to - // do anything special here. - return str2; - } + + // If wxXRC_USE_LOCALE is not set, then the string is already in + // system's default encoding in ANSI build, so we don't have to + // do anything special here. + return str2; } @@ -859,18 +860,22 @@ long wxXmlResourceHandler::GetLong(const wxString& param, long defaultv) return value; } - + float wxXmlResourceHandler::GetFloat(const wxString& param, float defaultv) { double value; wxString str1 = GetParamValue(param); +#ifndef __WXWINCE__ const char *prevlocale = setlocale(LC_NUMERIC, "C"); - +#endif + if (!str1.ToDouble(&value)) value = defaultv; +#ifndef __WXWINCE__ setlocale(LC_NUMERIC, prevlocale); +#endif return value; } @@ -895,7 +900,8 @@ bool wxXmlResourceHandler::GetBool(const wxString& param, bool defaultv) wxString v = GetParamValue(param); v.MakeLower(); if (!v) return defaultv; - else return (v == wxT("1")); + + return (v == wxT("1")); } @@ -963,7 +969,7 @@ wxColour wxXmlResourceHandler::GetColour(const wxString& param) wxColour clr = GetSystemColour(v); if (clr.Ok()) return clr; - + wxLogError(_("XRC resource: Incorrect colour specification '%s' for property '%s'."), v.c_str(), param.c_str()); return wxNullColour; @@ -992,7 +998,7 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param, scl = defaultArtClient; else scl = wxART_MAKE_CLIENT_ID_FROM_STR(scl); - + wxBitmap stockArt = wxArtProvider::GetBitmap(wxART_MAKE_ART_ID_FROM_STR(sid), scl, size); @@ -1003,7 +1009,7 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param, /* ...or load the bitmap from file: */ wxString name = GetParamValue(param); - if (name.IsEmpty()) return wxNullBitmap; + if (name.empty()) return wxNullBitmap; #if wxUSE_FILESYSTEM wxFSFile *fsfile = GetCurFileSystem().OpenFile(name); if (fsfile == NULL) @@ -1078,7 +1084,7 @@ wxString wxXmlResourceHandler::GetNodeContent(wxXmlNode *node) wxString wxXmlResourceHandler::GetParamValue(const wxString& param) { - if (param.IsEmpty()) + if (param.empty()) return GetNodeContent(m_node); else return GetNodeContent(GetParamNode(param)); @@ -1089,7 +1095,7 @@ wxString wxXmlResourceHandler::GetParamValue(const wxString& param) wxSize wxXmlResourceHandler::GetSize(const wxString& param) { wxString s = GetParamValue(param); - if (s.IsEmpty()) s = wxT("-1,-1"); + if (s.empty()) s = wxT("-1,-1"); bool is_dlg; long sx, sy = 0; @@ -1113,7 +1119,8 @@ wxSize wxXmlResourceHandler::GetSize(const wxString& param) return wxDefaultSize; } } - else return wxSize(sx, sy); + + return wxSize(sx, sy); } @@ -1129,7 +1136,7 @@ wxPoint wxXmlResourceHandler::GetPosition(const wxString& param) wxCoord wxXmlResourceHandler::GetDimension(const wxString& param, wxCoord defaultv) { wxString s = GetParamValue(param); - if (s.IsEmpty()) return defaultv; + if (s.empty()) return defaultv; bool is_dlg; long sx; @@ -1152,7 +1159,8 @@ wxCoord wxXmlResourceHandler::GetDimension(const wxString& param, wxCoord defaul return defaultv; } } - else return sx; + + return sx; } @@ -1194,7 +1202,7 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param) // size int isize = wxDEFAULT; bool hasSize = HasParam(wxT("size")); - if (hasSize) + if (hasSize) isize = GetLong(wxT("size"), wxDEFAULT); // style @@ -1203,9 +1211,9 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param) if (hasStyle) { wxString style = GetParamValue(wxT("style")); - if (style == wxT("italic")) + if (style == wxT("italic")) istyle = wxITALIC; - else if (style == wxT("slant")) + else if (style == wxT("slant")) istyle = wxSLANT; } @@ -1215,12 +1223,12 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param) if (hasWeight) { wxString weight = GetParamValue(wxT("weight")); - if (weight == wxT("bold")) + if (weight == wxT("bold")) iweight = wxBOLD; - else if (weight == wxT("light")) + else if (weight == wxT("light")) iweight = wxLIGHT; } - + // underline bool hasUnderlined = HasParam(wxT("underlined")); bool underlined = hasUnderlined ? GetBool(wxT("underlined"), false) : false; @@ -1238,8 +1246,8 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param) else if (family == wxT("modern")) ifamily = wxMODERN; else if (family == wxT("teletype")) ifamily = wxTELETYPE; } - - + + wxString facename; bool hasFacename = HasParam(wxT("face")); if (hasFacename) @@ -1266,7 +1274,7 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param) { wxString encoding = GetParamValue(wxT("encoding")); wxFontMapper mapper; - if (!encoding.IsEmpty()) + if (!encoding.empty()) enc = mapper.CharsetToEncoding(encoding); if (enc == wxFONTENCODING_SYSTEM) enc = wxFONTENCODING_DEFAULT; @@ -1274,7 +1282,7 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param) // is this font based on a system font? wxFont sysfont = GetSystemFont(GetParamValue(wxT("sysfont"))); - + if (sysfont.Ok()) { if (hasSize) @@ -1282,7 +1290,7 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param) else if (HasParam(wxT("relativesize"))) sysfont.SetPointSize(int(sysfont.GetPointSize() * GetFloat(wxT("relativesize")))); - + if (hasStyle) sysfont.SetStyle(istyle); if (hasWeight) @@ -1299,12 +1307,10 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param) m_node = oldnode; return sysfont; } - else - { - m_node = oldnode; - return wxFont(isize, ifamily, istyle, iweight, - underlined, facename, enc); - } + + m_node = oldnode; + return wxFont(isize, ifamily, istyle, iweight, + underlined, facename, enc); } @@ -1464,7 +1470,7 @@ static void AddStdXRCID_Records() stdID(wxID_ANY); stdID(wxID_SEPARATOR); - + stdID(wxID_OPEN); stdID(wxID_CLOSE); stdID(wxID_NEW);