[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi] compilation fixes for wx trunk
From: |
Vaclav Slavik |
Subject: |
[lmi] compilation fixes for wx trunk |
Date: |
Fri, 31 Oct 2008 14:23:34 +0100 |
Hi,
are there any objections to committing these changes?
Index: icon_monger.cpp
===================================================================
RCS file: /sources/lmi/lmi/icon_monger.cpp,v
retrieving revision 1.7
diff -u -u -r1.7 icon_monger.cpp
--- icon_monger.cpp 4 Oct 2008 15:16:26 -0000 1.7
+++ icon_monger.cpp 31 Oct 2008 13:19:18 -0000
@@ -103,7 +106,7 @@
,wxSize const& size
)
{
- std::string icon_name = id.c_str();
+ std::string icon_name(id.c_str());
bool is_builtin = 0 == icon_name.find("wxART_");
if(is_builtin)
{
Index: icon_monger.hpp
===================================================================
RCS file: /sources/lmi/lmi/icon_monger.hpp,v
retrieving revision 1.4
diff -u -u -r1.4 icon_monger.hpp
--- icon_monger.hpp 4 Oct 2008 13:47:20 -0000 1.4
+++ icon_monger.hpp 31 Oct 2008 13:19:18 -0000
@@ -51,7 +51,7 @@
,wxSize const&
);
- std::map<std::string,std::string> icon_names_by_wx_id_;
+ std::map<wxArtID,std::string> icon_names_by_wx_id_;
};
#endif // icon_monger_hpp
Without them, compilation against wx trunk fails. I believe the first
thing was already done before in other places. The second part fixes
similar problem with wxString<->std::string conversion by using wxArtID
instead of std::string for ART ids -- arguably, it's better in that the
code doesn't rely on wxArtID type being a string.
thanks,
Vaclav
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [lmi] compilation fixes for wx trunk,
Vaclav Slavik <=