#pragma hdrstop
#endif
+#if wxUSE_XRC
+
+#ifndef __WXWINCE__
+#include <locale.h>
+#endif
+
#include "wx/dialog.h"
#include "wx/panel.h"
#include "wx/frame.h"
#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"
wxXmlResource::wxXmlResource(int flags)
{
- m_handlers.DeleteContents(TRUE);
m_flags = flags;
m_version = -1;
}
{
m_flags = flags;
m_version = -1;
- m_handlers.DeleteContents(TRUE);
Load(filemask);
}
wxString fnd;
wxXmlResourceDataRecord *drec;
bool iswild = wxIsWild(filemask);
- bool rt = TRUE;
+ bool rt = true;
#if wxUSE_FILESYSTEM
wxFileSystem fsys;
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
// filename and not URL:
if (wxFileName::FileExists(fnd))
{
- // Make the name absolute filename, because the app may
+ // Make the name absolute filename, because the app may
// change working directory later:
wxFileName fn(fnd);
if (fn.IsRelative())
fnd = wxFileSystem::FileNameToURL(fnd);
#endif
}
-
+
#if wxUSE_FILESYSTEM
if (fnd.Lower().Matches(wxT("*.zip")) ||
fnd.Lower().Matches(wxT("*.xrs")))
{
- wxString url(wxFileSystem::FileNameToURL(fnd));
- rt = rt && Load(url + wxT("#zip:*.xrc"));
+ rt = rt && Load(fnd + wxT("#zip:*.xrc"));
}
else
#endif
}
# undef wxXmlFindFirst
# undef wxXmlFindNext
- return rt;
+ return rt && UpdateResources();
}
void wxXmlResource::ClearHandlers()
{
- m_handlers.Clear();
+ WX_CLEAR_LIST(wxList, m_handlers);
}
if (!container)
{
wxLogError(_("Cannot find container for unknown control '%s'."), name.c_str());
- return FALSE;
+ return false;
}
return control->Reparent(container);
}
wxXmlNode *c = node->GetChildren();
while (c)
{
- isok = FALSE;
+ isok = false;
if (!c->GetPropVal(wxT("platform"), &s))
- isok = TRUE;
+ isok = true;
else
{
wxStringTokenizer tkn(s, wxT(" |"));
#ifdef __WINDOWS__
if (s == wxT("win")) isok = true;
#endif
-#ifdef __UNIX__
- if (s == wxT("unix")) isok = true;
-#endif
-#ifdef __MAC__
+#if defined(__MAC__) || defined(__APPLE__)
if (s == wxT("mac")) isok = true;
+#elif defined(__UNIX__)
+ if (s == wxT("unix")) isok = true;
#endif
#ifdef __OS2__
if (s == wxT("os2")) isok = true;
-void wxXmlResource::UpdateResources()
+bool wxXmlResource::UpdateResources()
{
+ bool rt = true;
bool modif;
# if wxUSE_FILESYSTEM
wxFSFile *file = NULL;
+ wxUnusedVar(file);
wxFileSystem fsys;
# endif
{
modif = (m_data[i].Doc == NULL);
- if (!modif)
+ if (!modif && !(m_flags & wxXRC_NO_RELOADING))
{
# if wxUSE_FILESYSTEM
file = fsys.OpenFile(m_data[i].File);
modif = file && file->GetModificationTime() > m_data[i].Time;
if (!file)
+ {
wxLogError(_("Cannot open file '%s'."), m_data[i].File.c_str());
+ rt = false;
+ }
wxDELETE(file);
+ wxUnusedVar(file);
# else
modif = wxDateTime(wxFileModificationTime(m_data[i].File)) > m_data[i].Time;
# endif
if (modif)
{
+ wxLogTrace(_T("xrc"),
+ _T("opening file '%s'"), m_data[i].File.c_str());
+
wxInputStream *stream = NULL;
# if wxUSE_FILESYSTEM
file = fsys.OpenFile(m_data[i].File);
- if (file)
- stream = file->GetStream();
+ if (file)
+ stream = file->GetStream();
# else
stream = new wxFileInputStream(m_data[i].File);
# endif
wxLogError(_("Cannot load resources from file '%s'."),
m_data[i].File.c_str());
wxDELETE(m_data[i].Doc);
+ rt = false;
}
else if (m_data[i].Doc->GetRoot()->GetName() != wxT("resource"))
{
wxLogError(_("Invalid XRC resource '%s': doesn't have root node 'resource'."), m_data[i].File.c_str());
wxDELETE(m_data[i].Doc);
+ rt = false;
}
else
- {
+ {
long version;
int v1, v2, v3, v4;
wxString verstr = m_data[i].Doc->GetRoot()->GetPropVal(
if (m_version == -1)
m_version = version;
if (m_version != version)
+ {
wxLogError(_("Resource files must have same version number!"));
+ rt = false;
+ }
ProcessPlatformProperty(m_data[i].Doc->GetRoot());
- m_data[i].Time = file->GetModificationTime();
- }
+#if wxUSE_FILESYSTEM
+ m_data[i].Time = file->GetModificationTime();
+#else
+ m_data[i].Time = wxDateTime(wxFileModificationTime(m_data[i].File));
+#endif
+ }
# if wxUSE_FILESYSTEM
- wxDELETE(file);
+ wxDELETE(file);
+ wxUnusedVar(file);
# else
- wxDELETE(stream);
+ wxDELETE(stream);
# endif
}
}
+
+ return rt;
}
wxString refName = node->GetPropVal(wxT("ref"), wxEmptyString);
if (refName.empty())
continue;
- wxXmlNode* refNode = FindResource(refName, wxEmptyString, TRUE);
+ wxXmlNode* refNode = FindResource(refName, wxEmptyString, true);
if (refNode &&
refNode->GetPropVal(wxT("class"), wxEmptyString) == classname)
{
(node->GetName() == wxT("object") ||
node->GetName() == wxT("object_ref")) )
{
- wxXmlNode* found = DoFindResource(node, name, classname, TRUE);
+ wxXmlNode* found = DoFindResource(node, name, classname, true);
if ( found )
return found;
}
if ( node->GetName() == wxT("object_ref") )
{
wxString refName = node->GetPropVal(wxT("ref"), wxEmptyString);
- wxXmlNode* refNode = FindResource(refName, wxEmptyString, TRUE);
+ wxXmlNode* refNode = FindResource(refName, wxEmptyString, true);
if ( !refNode )
{
wxXmlResourceHandler *handler;
if (handlerToUse)
- {
+ {
if (handlerToUse->CanHandle(node))
{
return handlerToUse->CreateResource(node, parent, instance);
}
}
else if (node->GetName() == wxT("object"))
- {
- wxNode *ND = m_handlers.GetFirst();
+ {
+ wxList::compatibility_iterator ND = m_handlers.GetFirst();
while (ND)
{
handler = (wxXmlResourceHandler*)ND->GetData();
if (!ms_subclassFactories)
{
ms_subclassFactories = new wxXmlSubclassFactoriesList;
- ms_subclassFactories->DeleteContents(TRUE);
}
ms_subclassFactories->Append(factory);
}
-
wxXmlResourceHandler::wxXmlResourceHandler()
: m_node(NULL), m_parent(NULL), m_instance(NULL),
- m_parentAsWindow(NULL), m_instanceAsWindow(NULL)
+ m_parentAsWindow(NULL)
{}
wxXmlNode *myNode = m_node;
wxString myClass = m_class;
wxObject *myParent = m_parent, *myInstance = m_instance;
- wxWindow *myParentAW = m_parentAsWindow, *myInstanceAW = m_instanceAsWindow;
+ wxWindow *myParentAW = m_parentAsWindow;
m_instance = instance;
if (!m_instance && node->HasProp(wxT("subclass")) &&
wxString subclass = node->GetPropVal(wxT("subclass"), wxEmptyString);
if (!subclass.empty())
{
- for (wxXmlSubclassFactoriesList::Node *i = wxXmlResource::ms_subclassFactories->GetFirst();
+ for (wxXmlSubclassFactoriesList::compatibility_iterator i = wxXmlResource::ms_subclassFactories->GetFirst();
i; i = i->GetNext())
{
m_instance = i->GetData()->Create(subclass);
m_class = node->GetPropVal(wxT("class"), wxEmptyString);
m_parent = parent;
m_parentAsWindow = wxDynamicCast(m_parent, wxWindow);
- m_instanceAsWindow = wxDynamicCast(m_instance, wxWindow);
wxObject *returned = DoCreateResource();
m_node = myNode;
m_class = myClass;
m_parent = myParent; m_parentAsWindow = myParentAW;
- m_instance = myInstance; m_instanceAsWindow = myInstanceAW;
+ m_instance = myInstance;
return returned;
}
void wxXmlResourceHandler::AddWindowStyles()
{
+ XRC_ADD_STYLE(wxCLIP_CHILDREN);
XRC_ADD_STYLE(wxSIMPLE_BORDER);
XRC_ADD_STYLE(wxSUNKEN_BORDER);
XRC_ADD_STYLE(wxDOUBLE_BORDER);
XRC_ADD_STYLE(wxTRANSPARENT_WINDOW);
XRC_ADD_STYLE(wxWANTS_CHARS);
XRC_ADD_STYLE(wxNO_FULL_REPAINT_ON_RESIZE);
+ XRC_ADD_STYLE(wxFULL_REPAINT_ON_RESIZE);
+ XRC_ADD_STYLE(wxWS_EX_BLOCK_EVENTS);
}
wxString wxXmlResourceHandler::GetText(const wxString& param, bool translate)
{
- wxString str1(GetParamValue(param));
+ wxXmlNode *parNode = GetParamNode(param);
+ wxString str1(GetNodeContent(parNode));
wxString str2;
const wxChar *dt;
wxChar amp_char;
else
str2 << wxT('&') << *dt;
}
- // Remap \n to CR, \r to LF, \t to TAB:
+ // Remap \n to CR, \r to LF, \t to TAB, \\ to \:
else if (*dt == wxT('\\'))
switch (*(++dt))
{
- case wxT('n') : str2 << wxT('\n'); break;
- case wxT('t') : str2 << wxT('\t'); break;
- case wxT('r') : str2 << wxT('\r'); break;
- default : str2 << wxT('\\') << *dt; break;
+ case wxT('n'):
+ str2 << wxT('\n');
+ break;
+
+ case wxT('t'):
+ str2 << wxT('\t');
+ break;
+
+ case wxT('r'):
+ str2 << wxT('\r');
+ break;
+
+ case wxT('\\') :
+ // "\\" wasn't translated to "\" prior to 2.5.3.0:
+ if (m_resource->CompareVersion(2,5,3,0) >= 0)
+ {
+ str2 << wxT('\\');
+ break;
+ }
+ // else fall-through to default: branch below
+
+ default:
+ str2 << wxT('\\') << *dt;
+ break;
}
else str2 << *dt;
}
- if (translate && m_resource->GetFlags() & wxXRC_USE_LOCALE)
- return wxGetTranslation(str2);
+ if (m_resource->GetFlags() & wxXRC_USE_LOCALE)
+ {
+ if (translate && parNode &&
+ parNode->GetPropVal(wxT("translate"), wxEmptyString) != wxT("0"))
+ {
+ return wxGetTranslation(str2);
+ }
+ else
+ {
+#if wxUSE_UNICODE
+ return str2;
+#else
+ // The string is internally stored as UTF-8, we have to convert
+ // it into system's default encoding so that it can be displayed:
+ return wxString(str2.mb_str(wxConvUTF8), wxConvLocal);
+#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;
-
+ }
}
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;
+}
int wxXmlResourceHandler::GetID()
}
+static wxColour GetSystemColour(const wxString& name)
+{
+ if (!name.empty())
+ {
+ #define SYSCLR(clr) \
+ if (name == _T(#clr)) return wxSystemSettings::GetColour(clr);
+ SYSCLR(wxSYS_COLOUR_SCROLLBAR)
+ SYSCLR(wxSYS_COLOUR_BACKGROUND)
+ SYSCLR(wxSYS_COLOUR_DESKTOP)
+ SYSCLR(wxSYS_COLOUR_ACTIVECAPTION)
+ SYSCLR(wxSYS_COLOUR_INACTIVECAPTION)
+ SYSCLR(wxSYS_COLOUR_MENU)
+ SYSCLR(wxSYS_COLOUR_WINDOW)
+ SYSCLR(wxSYS_COLOUR_WINDOWFRAME)
+ SYSCLR(wxSYS_COLOUR_MENUTEXT)
+ SYSCLR(wxSYS_COLOUR_WINDOWTEXT)
+ SYSCLR(wxSYS_COLOUR_CAPTIONTEXT)
+ SYSCLR(wxSYS_COLOUR_ACTIVEBORDER)
+ SYSCLR(wxSYS_COLOUR_INACTIVEBORDER)
+ SYSCLR(wxSYS_COLOUR_APPWORKSPACE)
+ SYSCLR(wxSYS_COLOUR_HIGHLIGHT)
+ SYSCLR(wxSYS_COLOUR_HIGHLIGHTTEXT)
+ SYSCLR(wxSYS_COLOUR_BTNFACE)
+ SYSCLR(wxSYS_COLOUR_3DFACE)
+ SYSCLR(wxSYS_COLOUR_BTNSHADOW)
+ SYSCLR(wxSYS_COLOUR_3DSHADOW)
+ SYSCLR(wxSYS_COLOUR_GRAYTEXT)
+ SYSCLR(wxSYS_COLOUR_BTNTEXT)
+ SYSCLR(wxSYS_COLOUR_INACTIVECAPTIONTEXT)
+ SYSCLR(wxSYS_COLOUR_BTNHIGHLIGHT)
+ SYSCLR(wxSYS_COLOUR_BTNHILIGHT)
+ SYSCLR(wxSYS_COLOUR_3DHIGHLIGHT)
+ SYSCLR(wxSYS_COLOUR_3DHILIGHT)
+ SYSCLR(wxSYS_COLOUR_3DDKSHADOW)
+ SYSCLR(wxSYS_COLOUR_3DLIGHT)
+ SYSCLR(wxSYS_COLOUR_INFOTEXT)
+ SYSCLR(wxSYS_COLOUR_INFOBK)
+ SYSCLR(wxSYS_COLOUR_LISTBOX)
+ SYSCLR(wxSYS_COLOUR_HOTLIGHT)
+ SYSCLR(wxSYS_COLOUR_GRADIENTACTIVECAPTION)
+ SYSCLR(wxSYS_COLOUR_GRADIENTINACTIVECAPTION)
+ SYSCLR(wxSYS_COLOUR_MENUHILIGHT)
+ SYSCLR(wxSYS_COLOUR_MENUBAR)
+ #undef SYSCLR
+ }
+
+ return wxNullColour;
+}
wxColour wxXmlResourceHandler::GetColour(const wxString& param)
{
wxString v = GetParamValue(param);
+
+ // find colour using HTML syntax (#RRGGBB)
unsigned long tmp = 0;
if (v.Length() != 7 || v[0u] != wxT('#') ||
wxSscanf(v.c_str(), wxT("#%lX"), &tmp) != 1)
{
+ // the colour doesn't use #RRGGBB format, check if it is symbolic
+ // colour name:
+ 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;
wxString sid = bmpNode->GetPropVal(wxT("stock_id"), wxEmptyString);
if ( !sid.empty() )
{
- wxString scl = bmpNode->GetPropVal(wxT("stock_client"), defaultArtClient);
+ wxString scl = bmpNode->GetPropVal(wxT("stock_client"), wxEmptyString);
+ if (scl.empty())
+ scl = defaultArtClient;
+ else
+ scl = wxART_MAKE_CLIENT_ID_FROM_STR(scl);
+
wxBitmap stockArt =
wxArtProvider::GetBitmap(wxART_MAKE_ART_ID_FROM_STR(sid),
- wxART_MAKE_CLIENT_ID_FROM_STR(scl),
- size);
+ scl, size);
if ( stockArt.Ok() )
return stockArt;
}
/* ...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)
if (!img.Ok())
{
- wxLogError(_("XRC resource: Cannot create bitmap from '%s'."), param.c_str());
+ wxLogError(_("XRC resource: Cannot create bitmap from '%s'."),
+ param.c_str());
return wxNullBitmap;
}
if (!(size == wxDefaultSize)) img.Rescale(size.x, size.y);
wxString wxXmlResourceHandler::GetParamValue(const wxString& param)
{
- if (param.IsEmpty())
+ if (param.empty())
return GetNodeContent(m_node);
else
return GetNodeContent(GetParamNode(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;
+ long sx, sy = 0;
is_dlg = s[s.Length()-1] == wxT('d');
if (is_dlg) s.RemoveLast();
if (is_dlg)
{
- if (m_instanceAsWindow)
- return wxDLG_UNIT(m_instanceAsWindow, wxSize(sx, sy));
- else if (m_parentAsWindow)
+ if (m_parentAsWindow)
return wxDLG_UNIT(m_parentAsWindow, wxSize(sx, sy));
else
{
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;
if (is_dlg)
{
- if (m_instanceAsWindow)
- return wxDLG_UNIT(m_instanceAsWindow, wxSize(sx, 0)).x;
- else if (m_parentAsWindow)
+ if (m_parentAsWindow)
return wxDLG_UNIT(m_parentAsWindow, wxSize(sx, 0)).x;
else
{
}
+// Get system font index using indexname
+static wxFont GetSystemFont(const wxString& name)
+{
+ if (!name.empty())
+ {
+ #define SYSFNT(fnt) \
+ if (name == _T(#fnt)) return wxSystemSettings::GetFont(fnt);
+ SYSFNT(wxSYS_OEM_FIXED_FONT)
+ SYSFNT(wxSYS_ANSI_FIXED_FONT)
+ SYSFNT(wxSYS_ANSI_VAR_FONT)
+ SYSFNT(wxSYS_SYSTEM_FONT)
+ SYSFNT(wxSYS_DEVICE_DEFAULT_FONT)
+ SYSFNT(wxSYS_DEFAULT_PALETTE)
+ SYSFNT(wxSYS_SYSTEM_FIXED_FONT)
+ SYSFNT(wxSYS_DEFAULT_GUI_FONT)
+ #undef SYSFNT
+ }
+
+ return wxNullFont;
+}
wxFont wxXmlResourceHandler::GetFont(const wxString& param)
{
wxXmlNode *oldnode = m_node;
m_node = font_node;
- long size = GetLong(wxT("size"), 12);
+ // font attributes:
+
+ // size
+ int isize = wxDEFAULT;
+ bool hasSize = HasParam(wxT("size"));
+ if (hasSize)
+ isize = GetLong(wxT("size"), wxDEFAULT);
- wxString style = GetParamValue(wxT("style"));
- wxString weight = GetParamValue(wxT("weight"));
- int istyle = wxNORMAL, iweight = wxNORMAL;
- if (style == wxT("italic")) istyle = wxITALIC;
- else if (style == wxT("slant")) istyle = wxSLANT;
- if (weight == wxT("bold")) iweight = wxBOLD;
- else if (weight == wxT("light")) iweight = wxLIGHT;
+ // style
+ int istyle = wxNORMAL;
+ bool hasStyle = HasParam(wxT("style"));
+ if (hasStyle)
+ {
+ wxString style = GetParamValue(wxT("style"));
+ if (style == wxT("italic"))
+ istyle = wxITALIC;
+ else if (style == wxT("slant"))
+ istyle = wxSLANT;
+ }
- wxString family = GetParamValue(wxT("family"));
+ // weight
+ int iweight = wxNORMAL;
+ bool hasWeight = HasParam(wxT("weight"));
+ if (hasWeight)
+ {
+ wxString weight = GetParamValue(wxT("weight"));
+ if (weight == wxT("bold"))
+ iweight = wxBOLD;
+ else if (weight == wxT("light"))
+ iweight = wxLIGHT;
+ }
+
+ // underline
+ bool hasUnderlined = HasParam(wxT("underlined"));
+ bool underlined = hasUnderlined ? GetBool(wxT("underlined"), false) : false;
+
+ // family and facename
int ifamily = wxDEFAULT;
- if (family == wxT("decorative")) ifamily = wxDECORATIVE;
- else if (family == wxT("roman")) ifamily = wxROMAN;
- else if (family == wxT("script")) ifamily = wxSCRIPT;
- else if (family == wxT("swiss")) ifamily = wxSWISS;
- else if (family == wxT("modern")) ifamily = wxMODERN;
+ bool hasFamily = HasParam(wxT("family"));
+ if (hasFamily)
+ {
+ wxString family = GetParamValue(wxT("family"));
+ if (family == wxT("decorative")) ifamily = wxDECORATIVE;
+ else if (family == wxT("roman")) ifamily = wxROMAN;
+ else if (family == wxT("script")) ifamily = wxSCRIPT;
+ else if (family == wxT("swiss")) ifamily = wxSWISS;
+ else if (family == wxT("modern")) ifamily = wxMODERN;
+ else if (family == wxT("teletype")) ifamily = wxTELETYPE;
+ }
- bool underlined = GetBool(wxT("underlined"), FALSE);
- wxString encoding = GetParamValue(wxT("encoding"));
- wxFontMapper mapper;
- wxFontEncoding enc = wxFONTENCODING_DEFAULT;
- if (!encoding.IsEmpty())
- enc = mapper.CharsetToEncoding(encoding);
- if (enc == wxFONTENCODING_SYSTEM)
- enc = wxFONTENCODING_DEFAULT;
-
- wxString faces = GetParamValue(wxT("face"));
- wxString facename = wxEmptyString;
- wxFontEnumerator enu;
- enu.EnumerateFacenames();
- wxStringTokenizer tk(faces, wxT(","));
- while (tk.HasMoreTokens())
+ wxString facename;
+ bool hasFacename = HasParam(wxT("face"));
+ if (hasFacename)
{
- int index = enu.GetFacenames()->Index(tk.GetNextToken(), FALSE);
- if (index != wxNOT_FOUND)
+ wxString faces = GetParamValue(wxT("face"));
+ wxFontEnumerator enu;
+ enu.EnumerateFacenames();
+ wxStringTokenizer tk(faces, wxT(","));
+ while (tk.HasMoreTokens())
{
- facename = (*enu.GetFacenames())[index];
- break;
+ int index = enu.GetFacenames()->Index(tk.GetNextToken(), false);
+ if (index != wxNOT_FOUND)
+ {
+ facename = (*enu.GetFacenames())[index];
+ break;
+ }
}
}
- m_node = oldnode;
+ // encoding
+ wxFontEncoding enc = wxFONTENCODING_DEFAULT;
+ bool hasEncoding = HasParam(wxT("encoding"));
+ if (hasEncoding)
+ {
+ wxString encoding = GetParamValue(wxT("encoding"));
+ wxFontMapper mapper;
+ if (!encoding.empty())
+ enc = mapper.CharsetToEncoding(encoding);
+ if (enc == wxFONTENCODING_SYSTEM)
+ enc = wxFONTENCODING_DEFAULT;
+ }
+
+ // is this font based on a system font?
+ wxFont sysfont = GetSystemFont(GetParamValue(wxT("sysfont")));
- wxFont font(size, ifamily, istyle, iweight, underlined, facename, enc);
- return font;
+ if (sysfont.Ok())
+ {
+ if (hasSize)
+ sysfont.SetPointSize(isize);
+ else if (HasParam(wxT("relativesize")))
+ sysfont.SetPointSize(int(sysfont.GetPointSize() *
+ GetFloat(wxT("relativesize"))));
+
+ if (hasStyle)
+ sysfont.SetStyle(istyle);
+ if (hasWeight)
+ sysfont.SetWeight(iweight);
+ if (hasUnderlined)
+ sysfont.SetUnderlined(underlined);
+ if (hasFamily)
+ sysfont.SetFamily(ifamily);
+ if (hasFacename)
+ sysfont.SetFaceName(facename);
+ if (hasEncoding)
+ sysfont.SetDefaultEncoding(enc);
+
+ m_node = oldnode;
+ return sysfont;
+ }
+ else
+ {
+ m_node = oldnode;
+ return wxFont(isize, ifamily, istyle, iweight,
+ underlined, facename, enc);
+ }
}
//FIXME : add cursor
if (HasParam(wxT("exstyle")))
- wnd->SetExtraStyle(GetStyle(wxT("exstyle")));
+ // Have to OR it with existing style, since
+ // some implementations (e.g. wxGTK) use the extra style
+ // during creation
+ wnd->SetExtraStyle(wnd->GetExtraStyle() | GetStyle(wxT("exstyle")));
if (HasParam(wxT("bg")))
wnd->SetBackgroundColour(GetColour(wxT("bg")));
if (HasParam(wxT("fg")))
wnd->SetForegroundColour(GetColour(wxT("fg")));
if (GetBool(wxT("enabled"), 1) == 0)
- wnd->Enable(FALSE);
+ wnd->Enable(false);
if (GetBool(wxT("focused"), 0) == 1)
wnd->SetFocus();
if (GetBool(wxT("hidden"), 0) == 1)
- wnd->Show(FALSE);
+ wnd->Show(false);
#if wxUSE_TOOLTIPS
if (HasParam(wxT("tooltip")))
wnd->SetToolTip(GetText(wxT("tooltip")));
static int XRCID_Lookup(const wxChar *str_id, int value_if_not_found = -2)
{
- static int XRCID_LastID = wxID_HIGHEST;
-
int index = 0;
for (const wxChar *c = str_id; *c != wxT('\0'); c++) index += (int)*c;
index %= XRCID_TABLE_SIZE;
XRCID_record *oldrec = NULL;
- int matchcnt = 0;
for (XRCID_record *rec = XRCID_Records[index]; rec; rec = rec->next)
{
if (wxStrcmp(rec->key, str_id) == 0)
{
return rec->id;
}
- matchcnt++;
oldrec = rec;
}
}
else
{
- (*rec_var)->id = ++XRCID_LastID;
+ (*rec_var)->id = wxNewId();
}
}
{
#define stdID(id) XRCID_Lookup(wxT(#id), id)
stdID(-1);
- stdID(wxID_OPEN); stdID(wxID_CLOSE); stdID(wxID_NEW);
- stdID(wxID_SAVE); stdID(wxID_SAVEAS); stdID(wxID_REVERT);
- stdID(wxID_EXIT); stdID(wxID_UNDO); stdID(wxID_REDO);
- stdID(wxID_HELP); stdID(wxID_PRINT); stdID(wxID_PRINT_SETUP);
- stdID(wxID_PREVIEW); stdID(wxID_ABOUT); stdID(wxID_HELP_CONTENTS);
- stdID(wxID_HELP_COMMANDS); stdID(wxID_HELP_PROCEDURES);
- stdID(wxID_CUT); stdID(wxID_COPY); stdID(wxID_PASTE);
- stdID(wxID_CLEAR); stdID(wxID_FIND); stdID(wxID_DUPLICATE);
- stdID(wxID_SELECTALL); stdID(wxID_OK); stdID(wxID_CANCEL);
- stdID(wxID_APPLY); stdID(wxID_YES); stdID(wxID_NO);
- stdID(wxID_STATIC); stdID(wxID_FORWARD); stdID(wxID_BACKWARD);
- stdID(wxID_DEFAULT); stdID(wxID_MORE); stdID(wxID_SETUP);
- stdID(wxID_RESET); stdID(wxID_HELP_CONTEXT);
+
+ stdID(wxID_ANY);
+ stdID(wxID_SEPARATOR);
+
+ stdID(wxID_OPEN);
+ stdID(wxID_CLOSE);
+ stdID(wxID_NEW);
+ stdID(wxID_SAVE);
+ stdID(wxID_SAVEAS);
+ stdID(wxID_REVERT);
+ stdID(wxID_EXIT);
+ stdID(wxID_UNDO);
+ stdID(wxID_REDO);
+ stdID(wxID_HELP);
+ stdID(wxID_PRINT);
+ stdID(wxID_PRINT_SETUP);
+ stdID(wxID_PREVIEW);
+ stdID(wxID_ABOUT);
+ stdID(wxID_HELP_CONTENTS);
+ stdID(wxID_HELP_COMMANDS);
+ stdID(wxID_HELP_PROCEDURES);
+ stdID(wxID_HELP_CONTEXT);
stdID(wxID_CLOSE_ALL);
+ stdID(wxID_PREFERENCES);
+ stdID(wxID_CUT);
+ stdID(wxID_COPY);
+ stdID(wxID_PASTE);
+ stdID(wxID_CLEAR);
+ stdID(wxID_FIND);
+ stdID(wxID_DUPLICATE);
+ stdID(wxID_SELECTALL);
+ stdID(wxID_DELETE);
+ stdID(wxID_REPLACE);
+ stdID(wxID_REPLACE_ALL);
+ stdID(wxID_PROPERTIES);
+ stdID(wxID_VIEW_DETAILS);
+ stdID(wxID_VIEW_LARGEICONS);
+ stdID(wxID_VIEW_SMALLICONS);
+ stdID(wxID_VIEW_LIST);
+ stdID(wxID_VIEW_SORTDATE);
+ stdID(wxID_VIEW_SORTNAME);
+ stdID(wxID_VIEW_SORTSIZE);
+ stdID(wxID_VIEW_SORTTYPE);
+ stdID(wxID_FILE1);
+ stdID(wxID_FILE2);
+ stdID(wxID_FILE3);
+ stdID(wxID_FILE4);
+ stdID(wxID_FILE5);
+ stdID(wxID_FILE6);
+ stdID(wxID_FILE7);
+ stdID(wxID_FILE8);
+ stdID(wxID_FILE9);
+ stdID(wxID_OK);
+ stdID(wxID_CANCEL);
+ stdID(wxID_APPLY);
+ stdID(wxID_YES);
+ stdID(wxID_NO);
+ stdID(wxID_STATIC);
+ stdID(wxID_FORWARD);
+ stdID(wxID_BACKWARD);
+ stdID(wxID_DEFAULT);
+ stdID(wxID_MORE);
+ stdID(wxID_SETUP);
+ stdID(wxID_RESET);
+ stdID(wxID_CONTEXT_HELP);
+ stdID(wxID_YESTOALL);
+ stdID(wxID_NOTOALL);
+ stdID(wxID_ABORT);
+ stdID(wxID_RETRY);
+ stdID(wxID_IGNORE);
+ stdID(wxID_ADD);
+ stdID(wxID_REMOVE);
+ stdID(wxID_UP);
+ stdID(wxID_DOWN);
+ stdID(wxID_HOME);
+ stdID(wxID_REFRESH);
+ stdID(wxID_STOP);
+ stdID(wxID_INDEX);
+ stdID(wxID_BOLD);
+ stdID(wxID_ITALIC);
+ stdID(wxID_JUSTIFY_CENTER);
+ stdID(wxID_JUSTIFY_FILL);
+ stdID(wxID_JUSTIFY_RIGHT);
+ stdID(wxID_JUSTIFY_LEFT);
+ stdID(wxID_UNDERLINE);
+ stdID(wxID_INDENT);
+ stdID(wxID_UNINDENT);
+ stdID(wxID_ZOOM_100);
+ stdID(wxID_ZOOM_FIT);
+ stdID(wxID_ZOOM_IN);
+ stdID(wxID_ZOOM_OUT);
+ stdID(wxID_UNDELETE);
+ stdID(wxID_REVERT_TO_SAVED);
+ stdID(wxID_SYSTEM_MENU);
+ stdID(wxID_CLOSE_FRAME);
+ stdID(wxID_MOVE_FRAME);
+ stdID(wxID_RESIZE_FRAME);
+ stdID(wxID_MAXIMIZE_FRAME);
+ stdID(wxID_ICONIZE_FRAME);
+ stdID(wxID_RESTORE_FRAME);
+
#undef stdID
}
{
AddStdXRCID_Records();
wxXmlResource::AddSubclassFactory(new wxXmlSubclassFactoryCXX);
- return TRUE;
+ return true;
}
void OnExit()
{
delete wxXmlResource::Set(NULL);
+ if(wxXmlResource::ms_subclassFactories)
+ WX_CLEAR_LIST(wxXmlSubclassFactoriesList, *wxXmlResource::ms_subclassFactories);
wxDELETE(wxXmlResource::ms_subclassFactories);
CleanXRCID_Records();
}
module->Init();
wxModule::RegisterModule(module);
}
+
+#endif // wxUSE_XRC
projects / wxWidgets.git / blobdiff