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

WinCE fix. IsEmpty() -> empty().

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-11-16 13:56:18 +00:00
parent e207252560
commit e7a3a5a51b
1 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/xrc/xmlres.cpp
View File

@@ -21,7 +21,9 @@
#if wxUSE_XRC #if wxUSE_XRC
#ifndef __WXWINCE__
#include <locale.h> #include <locale.h>
#endif
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/panel.h" #include "wx/panel.h"
@@ -796,11 +798,11 @@ wxString wxXmlResourceHandler::GetText(const wxString& param, bool translate)
case wxT('n'): case wxT('n'):
str2 << wxT('\n'); str2 << wxT('\n');
break; break;
case wxT('t'): case wxT('t'):
str2 << wxT('\t'); str2 << wxT('\t');
break; break;
case wxT('r'): case wxT('r'):
str2 << wxT('\r'); str2 << wxT('\r');
break; break;
@@ -813,7 +815,7 @@ wxString wxXmlResourceHandler::GetText(const wxString& param, bool translate)
break; break;
} }
// else fall-through to default: branch below // else fall-through to default: branch below
default: default:
str2 << wxT('\\') << *dt; str2 << wxT('\\') << *dt;
break; break;
@@ -860,18 +862,22 @@ long wxXmlResourceHandler::GetLong(const wxString& param, long defaultv)
return value; return value;
} }
float wxXmlResourceHandler::GetFloat(const wxString& param, float defaultv) float wxXmlResourceHandler::GetFloat(const wxString& param, float defaultv)
{ {
double value; double value;
wxString str1 = GetParamValue(param); wxString str1 = GetParamValue(param);
#ifndef __WXWINCE__
const char *prevlocale = setlocale(LC_NUMERIC, "C"); const char *prevlocale = setlocale(LC_NUMERIC, "C");
#endif
if (!str1.ToDouble(&value)) if (!str1.ToDouble(&value))
value = defaultv; value = defaultv;
#ifndef __WXWINCE__
setlocale(LC_NUMERIC, prevlocale); setlocale(LC_NUMERIC, prevlocale);
#endif
return value; return value;
} }
@@ -964,7 +970,7 @@ wxColour wxXmlResourceHandler::GetColour(const wxString& param)
wxColour clr = GetSystemColour(v); wxColour clr = GetSystemColour(v);
if (clr.Ok()) if (clr.Ok())
return clr; return clr;
wxLogError(_("XRC resource: Incorrect colour specification '%s' for property '%s'."), wxLogError(_("XRC resource: Incorrect colour specification '%s' for property '%s'."),
v.c_str(), param.c_str()); v.c_str(), param.c_str());
return wxNullColour; return wxNullColour;
@@ -993,7 +999,7 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param,
scl = defaultArtClient; scl = defaultArtClient;
else else
scl = wxART_MAKE_CLIENT_ID_FROM_STR(scl); scl = wxART_MAKE_CLIENT_ID_FROM_STR(scl);
wxBitmap stockArt = wxBitmap stockArt =
wxArtProvider::GetBitmap(wxART_MAKE_ART_ID_FROM_STR(sid), wxArtProvider::GetBitmap(wxART_MAKE_ART_ID_FROM_STR(sid),
scl, size); scl, size);
@@ -1004,7 +1010,7 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param,
/* ...or load the bitmap from file: */ /* ...or load the bitmap from file: */
wxString name = GetParamValue(param); wxString name = GetParamValue(param);
if (name.IsEmpty()) return wxNullBitmap; if (name.empty()) return wxNullBitmap;
#if wxUSE_FILESYSTEM #if wxUSE_FILESYSTEM
wxFSFile *fsfile = GetCurFileSystem().OpenFile(name); wxFSFile *fsfile = GetCurFileSystem().OpenFile(name);
if (fsfile == NULL) if (fsfile == NULL)
@@ -1079,7 +1085,7 @@ wxString wxXmlResourceHandler::GetNodeContent(wxXmlNode *node)
wxString wxXmlResourceHandler::GetParamValue(const wxString& param) wxString wxXmlResourceHandler::GetParamValue(const wxString& param)
{ {
if (param.IsEmpty()) if (param.empty())
return GetNodeContent(m_node); return GetNodeContent(m_node);
else else
return GetNodeContent(GetParamNode(param)); return GetNodeContent(GetParamNode(param));
@@ -1090,7 +1096,7 @@ wxString wxXmlResourceHandler::GetParamValue(const wxString& param)
wxSize wxXmlResourceHandler::GetSize(const wxString& param) wxSize wxXmlResourceHandler::GetSize(const wxString& param)
{ {
wxString s = GetParamValue(param); wxString s = GetParamValue(param);
if (s.IsEmpty()) s = wxT("-1,-1"); if (s.empty()) s = wxT("-1,-1");
bool is_dlg; bool is_dlg;
long sx, sy = 0; long sx, sy = 0;
@@ -1130,7 +1136,7 @@ wxPoint wxXmlResourceHandler::GetPosition(const wxString& param)
wxCoord wxXmlResourceHandler::GetDimension(const wxString& param, wxCoord defaultv) wxCoord wxXmlResourceHandler::GetDimension(const wxString& param, wxCoord defaultv)
{ {
wxString s = GetParamValue(param); wxString s = GetParamValue(param);
if (s.IsEmpty()) return defaultv; if (s.empty()) return defaultv;
bool is_dlg; bool is_dlg;
long sx; long sx;
@@ -1195,7 +1201,7 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param)
// size // size
int isize = wxDEFAULT; int isize = wxDEFAULT;
bool hasSize = HasParam(wxT("size")); bool hasSize = HasParam(wxT("size"));
if (hasSize) if (hasSize)
isize = GetLong(wxT("size"), wxDEFAULT); isize = GetLong(wxT("size"), wxDEFAULT);
// style // style
@@ -1204,9 +1210,9 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param)
if (hasStyle) if (hasStyle)
{ {
wxString style = GetParamValue(wxT("style")); wxString style = GetParamValue(wxT("style"));
if (style == wxT("italic")) if (style == wxT("italic"))
istyle = wxITALIC; istyle = wxITALIC;
else if (style == wxT("slant")) else if (style == wxT("slant"))
istyle = wxSLANT; istyle = wxSLANT;
} }
@@ -1216,12 +1222,12 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param)
if (hasWeight) if (hasWeight)
{ {
wxString weight = GetParamValue(wxT("weight")); wxString weight = GetParamValue(wxT("weight"));
if (weight == wxT("bold")) if (weight == wxT("bold"))
iweight = wxBOLD; iweight = wxBOLD;
else if (weight == wxT("light")) else if (weight == wxT("light"))
iweight = wxLIGHT; iweight = wxLIGHT;
} }
// underline // underline
bool hasUnderlined = HasParam(wxT("underlined")); bool hasUnderlined = HasParam(wxT("underlined"));
bool underlined = hasUnderlined ? GetBool(wxT("underlined"), false) : false; bool underlined = hasUnderlined ? GetBool(wxT("underlined"), false) : false;
@@ -1239,8 +1245,8 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param)
else if (family == wxT("modern")) ifamily = wxMODERN; else if (family == wxT("modern")) ifamily = wxMODERN;
else if (family == wxT("teletype")) ifamily = wxTELETYPE; else if (family == wxT("teletype")) ifamily = wxTELETYPE;
} }
wxString facename; wxString facename;
bool hasFacename = HasParam(wxT("face")); bool hasFacename = HasParam(wxT("face"));
if (hasFacename) if (hasFacename)
@@ -1267,7 +1273,7 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param)
{ {
wxString encoding = GetParamValue(wxT("encoding")); wxString encoding = GetParamValue(wxT("encoding"));
wxFontMapper mapper; wxFontMapper mapper;
if (!encoding.IsEmpty()) if (!encoding.empty())
enc = mapper.CharsetToEncoding(encoding); enc = mapper.CharsetToEncoding(encoding);
if (enc == wxFONTENCODING_SYSTEM) if (enc == wxFONTENCODING_SYSTEM)
enc = wxFONTENCODING_DEFAULT; enc = wxFONTENCODING_DEFAULT;
@@ -1275,7 +1281,7 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param)
// is this font based on a system font? // is this font based on a system font?
wxFont sysfont = GetSystemFont(GetParamValue(wxT("sysfont"))); wxFont sysfont = GetSystemFont(GetParamValue(wxT("sysfont")));
if (sysfont.Ok()) if (sysfont.Ok())
{ {
if (hasSize) if (hasSize)
@@ -1283,7 +1289,7 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param)
else if (HasParam(wxT("relativesize"))) else if (HasParam(wxT("relativesize")))
sysfont.SetPointSize(int(sysfont.GetPointSize() * sysfont.SetPointSize(int(sysfont.GetPointSize() *
GetFloat(wxT("relativesize")))); GetFloat(wxT("relativesize"))));
if (hasStyle) if (hasStyle)
sysfont.SetStyle(istyle); sysfont.SetStyle(istyle);
if (hasWeight) if (hasWeight)
@@ -1465,7 +1471,7 @@ static void AddStdXRCID_Records()
stdID(wxID_ANY); stdID(wxID_ANY);
stdID(wxID_SEPARATOR); stdID(wxID_SEPARATOR);
stdID(wxID_OPEN); stdID(wxID_OPEN);
stdID(wxID_CLOSE); stdID(wxID_CLOSE);
stdID(wxID_NEW); stdID(wxID_NEW);