Browse Source

* On win32, only disable the built-in fonts, not all the font functions.

tags/v0.99.beta14
Sam Hocevar sam 19 years ago
parent
commit
19f1503d76
1 changed files with 4 additions and 2 deletions
  1. +4
    -2
      cucul/font.c

+ 4
- 2
cucul/font.c View File

@@ -18,7 +18,6 @@
#include "config.h" #include "config.h"
#include "common.h" #include "common.h"


#if !defined(USE_WIN32)
#if !defined(__KERNEL__) #if !defined(__KERNEL__)
# if defined(HAVE_ENDIAN_H) # if defined(HAVE_ENDIAN_H)
# include <endian.h> # include <endian.h>
@@ -37,8 +36,10 @@
#include "cucul_internals.h" #include "cucul_internals.h"


/* Internal fonts */ /* Internal fonts */
#if !defined(USE_WIN32)
#include "font_mono9.h" #include "font_mono9.h"
#include "font_monobold12.h" #include "font_monobold12.h"
#endif


/* Helper structures for font loading */ /* Helper structures for font loading */
#if !defined(_DOXYGEN_SKIP_ME) #if !defined(_DOXYGEN_SKIP_ME)
@@ -118,10 +119,12 @@ cucul_font_t *cucul_load_font(void const *data, unsigned int size)


if(size == 0) if(size == 0)
{ {
#if !defined(USE_WIN32)
if(!strcasecmp(data, "Monospace 9")) if(!strcasecmp(data, "Monospace 9"))
return cucul_load_font(mono9_data, mono9_size); return cucul_load_font(mono9_data, mono9_size);
if(!strcasecmp(data, "Monospace Bold 12")) if(!strcasecmp(data, "Monospace Bold 12"))
return cucul_load_font(monobold12_data, monobold12_size); return cucul_load_font(monobold12_data, monobold12_size);
#endif


return NULL; return NULL;
} }
@@ -440,4 +443,3 @@ void cucul_render_canvas(cucul_canvas_t *cv, cucul_font_t *f,
* }; * };
*/ */


#endif

Loading…
Cancel
Save