M src/FbTk/ThemeItems.hh → src/FbTk/ThemeItems.hh

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // 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 @@ if (pixmap_name.empty()) {
         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 @@ // does nothing
 template <>
 void ThemeItem<FbTk::Color>::load() { }
 
-};
+} // end namespace FbTk
 
 #endif // THEMEITEMS_HH

M src/FbTk/XmbFontImp.cc → src/FbTk/XmbFontImp.cc

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // 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 @@ buf[bufsiz-2] = '*';
     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 @@ return p;
         }
     }
     va_end(va);
-    std::strncpy(buf, "*", bufsiz);
+    strncpy(buf, "*", bufsiz);
     return 0;
 }
 
@@ -153,9 +153,9 @@ "-r-", "-i-", "-o-", "-ri-", "-ro-", 0);
     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)