From 6d1ed67e54edb37b65a78fcb0471f9286e39322e Mon Sep 17 00:00:00 2001 From: fluxgen <fluxgen> Date: Tue, 10 Feb 2004 19:03:42 +0000 Subject: minor fix --- src/FbTk/ThemeItems.hh | 9 +++++---- src/FbTk/XmbFontImp.cc | 10 +++++----- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/FbTk/ThemeItems.hh b/src/FbTk/ThemeItems.hh index 4d4d081..63c17df 100644 --- a/src/FbTk/ThemeItems.hh +++ b/src/FbTk/ThemeItems.hh @@ -19,7 +19,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: ThemeItems.hh,v 1.4 2004/01/02 21:59:52 fluxgen Exp $ +// $Id: ThemeItems.hh,v 1.5 2004/02/10 19:03:04 fluxgen Exp $ /// @file implements common theme items @@ -132,8 +132,9 @@ void ThemeItem<FbTk::Texture>::load() { m_value.pixmap() = 0; return; } - std::auto_ptr<PixmapWithMask> pm(Image::load(pixmap_name, - m_tm.screenNum())); + + std::auto_ptr<FbTk::PixmapWithMask> pm(FbTk::Image::load(pixmap_name, + m_tm.screenNum())); if (pm.get() == 0) { if (FbTk::ThemeManager::instance().verbose()) { cerr<<"Resource("<<name()+".pixmap" @@ -212,6 +213,6 @@ void ThemeItem<FbTk::Color>::setFromString(const char *str) { template <> void ThemeItem<FbTk::Color>::load() { } -}; +} // end namespace FbTk #endif // THEMEITEMS_HH diff --git a/src/FbTk/XmbFontImp.cc b/src/FbTk/XmbFontImp.cc index 6a3ffed..9f47d6e 100644 --- a/src/FbTk/XmbFontImp.cc +++ b/src/FbTk/XmbFontImp.cc @@ -19,7 +19,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: XmbFontImp.cc,v 1.6 2003/04/26 18:57:51 fluxgen Exp $ +// $Id: XmbFontImp.cc,v 1.7 2004/02/10 19:03:42 fluxgen Exp $ #include "XmbFontImp.hh" @@ -104,7 +104,7 @@ const char *getFontElement(const char *pattern, char *buf, int bufsiz, ...) { while((v = va_arg(va, char *)) != 0) { p = FbTk::StringUtil::strcasestr(pattern, v); if (p) { - std::strncpy(buf, p+1, bufsiz-2); + strncpy(buf, p+1, bufsiz-2); p2 = strchr(buf, '-'); if (p2) *p2=0; va_end(va); @@ -112,7 +112,7 @@ const char *getFontElement(const char *pattern, char *buf, int bufsiz, ...) { } } va_end(va); - std::strncpy(buf, "*", bufsiz); + strncpy(buf, "*", bufsiz); return 0; } @@ -153,9 +153,9 @@ XFontSet createFontSet(const char *fontname) { getFontSize(fontname, &pixel_size); if (! strcmp(weight, "*")) - std::strncpy(weight, "medium", FONT_ELEMENT_SIZE); + strncpy(weight, "medium", FONT_ELEMENT_SIZE); if (! strcmp(slant, "*")) - std::strncpy(slant, "r", FONT_ELEMENT_SIZE); + strncpy(slant, "r", FONT_ELEMENT_SIZE); if (pixel_size < 3) pixel_size = 3; else if (pixel_size > 97) -- cgit v0.11.2