summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Font.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Font.cc b/src/Font.cc
index 38aad9d..5203ccb 100644
--- a/src/Font.cc
+++ b/src/Font.cc
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22//$Id: Font.cc,v 1.9 2002/08/20 15:19:25 fluxgen Exp $ 22//$Id: Font.cc,v 1.10 2002/09/03 12:05:01 fluxgen Exp $
23 23
24 24
25#include "Font.hh" 25#include "Font.hh"
@@ -48,6 +48,8 @@
48#include <locale.h> 48#include <locale.h>
49#endif //HAVE_SETLOCALE 49#endif //HAVE_SETLOCALE
50 50
51#include "StringUtil.hh"
52
51namespace FbTk 53namespace FbTk
52{ 54{
53 55
@@ -219,7 +221,7 @@ const char *Font::getFontElement(const char *pattern, char *buf, int bufsiz, ...
219 buf[bufsiz-1] = 0; 221 buf[bufsiz-1] = 0;
220 buf[bufsiz-2] = '*'; 222 buf[bufsiz-2] = '*';
221 while((v = va_arg(va, char *)) != 0) { 223 while((v = va_arg(va, char *)) != 0) {
222 p = strcasestr(pattern, v); 224 p = StringUtil::strcasestr(pattern, v);
223 if (p) { 225 if (p) {
224 std::strncpy(buf, p+1, bufsiz-2); 226 std::strncpy(buf, p+1, bufsiz-2);
225 p2 = strchr(buf, '-'); 227 p2 = strchr(buf, '-');