[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi] compilation fix for wxXmlResource::LoadFile() use
From: |
Vaclav Slavik |
Subject: |
[lmi] compilation fix for wxXmlResource::LoadFile() use |
Date: |
Fri, 03 Apr 2009 01:15:58 +0200 |
Hi,
compilation of main_wx.cpp against wx trunk fails with the following
(only one of several identical errors quoted):
../main_wx.cpp:641: error: no matching function for call to
‘wxXmlResource::LoadFile(std::string)’
/home/vasek/devel/wx/include/wx/xrc/xmlres.h:119: note: candidates are:
bool wxXmlResource::LoadFile(const wxFileName&)
This patch fixes it:
=== modified file 'main_wx.cpp'
--- main_wx.cpp 2009-03-31 02:19:26 +0000
+++ main_wx.cpp 2009-04-02 23:14:47 +0000
@@ -638,7 +638,7 @@
DefaultView const v0;
#if wxCHECK_VERSION(2,9,0)
- if(!xml_resources.LoadFile(AddDataDir(v0.ResourceFileName())))
+
if(!xml_resources.LoadFile(wxFileName(AddDataDir(v0.ResourceFileName()))))
#else // !wxCHECK_VERSION(2,9,0)
if(!xml_resources.Load(AddDataDir(v0.ResourceFileName())))
#endif // !wxCHECK_VERSION(2,9,0)
@@ -648,7 +648,7 @@
PreferencesView const v1;
#if wxCHECK_VERSION(2,9,0)
- if(!xml_resources.LoadFile(AddDataDir(v1.ResourceFileName())))
+
if(!xml_resources.LoadFile(wxFileName(AddDataDir(v1.ResourceFileName()))))
#else // !wxCHECK_VERSION(2,9,0)
if(!xml_resources.Load(AddDataDir(v1.ResourceFileName())))
#endif // !wxCHECK_VERSION(2,9,0)
@@ -657,7 +657,7 @@
}
#if wxCHECK_VERSION(2,9,0)
- if(!xml_resources.LoadFile(AddDataDir("menus.xrc")))
+ if(!xml_resources.LoadFile(wxFileName(AddDataDir("menus.xrc"))))
#else // !wxCHECK_VERSION(2,9,0)
if(!xml_resources.Load(AddDataDir("menus.xrc")))
#endif // !wxCHECK_VERSION(2,9,0)
@@ -666,7 +666,7 @@
}
#if wxCHECK_VERSION(2,9,0)
- if(!xml_resources.LoadFile(AddDataDir("toolbar.xrc")))
+ if(!xml_resources.LoadFile(wxFileName(AddDataDir("toolbar.xrc"))))
#else // !wxCHECK_VERSION(2,9,0)
if(!xml_resources.Load(AddDataDir("toolbar.xrc")))
#endif // !wxCHECK_VERSION(2,9,0)
@@ -675,7 +675,7 @@
}
#if wxCHECK_VERSION(2,9,0)
-
if(!xml_resources.LoadFile(AddDataDir(PolicyView::resource_file_name())))
+
if(!xml_resources.LoadFile(wxFileName(AddDataDir(PolicyView::resource_file_name()))))
#else // !wxCHECK_VERSION(2,9,0)
if(!xml_resources.Load(AddDataDir(PolicyView::resource_file_name())))
#endif // !wxCHECK_VERSION(2,9,0)
@@ -684,7 +684,7 @@
}
#if wxCHECK_VERSION(2,9,0)
-
if(!xml_resources.LoadFile(AddDataDir(RoundingView::resource_file_name())))
+
if(!xml_resources.LoadFile(wxFileName(AddDataDir(RoundingView::resource_file_name()))))
#else // !wxCHECK_VERSION(2,9,0)
if(!xml_resources.Load(AddDataDir(RoundingView::resource_file_name())))
#endif // !wxCHECK_VERSION(2,9,0)
- [lmi] compilation fix for wxXmlResource::LoadFile() use,
Vaclav Slavik <=