diff options
| author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2008-10-19 10:57:03 +0000 |
|---|---|---|
| committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2008-10-19 10:57:03 +0000 |
| commit | a7daa827f6f71cc6857705718006ac97c771e1bd (patch) | |
| tree | 45c6463ed91232e592628e9ecf9bedcf8efc3275 | |
| parent | da5d4cf63171cb88c0d4022149a024998e704a6f (diff) | |
| download | navit-a7daa827f6f71cc6857705718006ac97c771e1bd.tar.gz | |
Fix:graphics_win32:Fixed a few compile problems
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@1507 ffa7fe5e-494d-0410-b361-a75ebd5db220
| -rw-r--r-- | navit/graphics/win32/graphics_win32.c | 2 | ||||
| -rw-r--r-- | navit/graphics/win32/win32_gui.h | 2 | ||||
| -rw-r--r-- | navit/graphics/win32/xpm2bmp.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/navit/graphics/win32/graphics_win32.c b/navit/graphics/win32/graphics_win32.c index a9112ad85..502bdaf4e 100644 --- a/navit/graphics/win32/graphics_win32.c +++ b/navit/graphics/win32/graphics_win32.c @@ -641,12 +641,14 @@ static void draw_text(struct graphics_priv *gr, struct graphics_gc_priv *fg, str font->hfont = CreateFontIndirect (&font->lf); HFONT hOldFont = SelectObject(hMemDC, font->hfont ); +#ifdef HAVE_GLIB gunichar2* utf16 = NULL; glong utf16_len = 0; utf16 = g_utf8_to_utf16( text, -1, NULL, &utf16_len, NULL ); TextOutW(hMemDC, 0,0, utf16, (size_t)utf16_len ); g_free( utf16 ); +#endif SelectObject(hMemDC, hOldFont); diff --git a/navit/graphics/win32/win32_gui.h b/navit/graphics/win32/win32_gui.h index aa8f61ab1..f9fb7e231 100644 --- a/navit/graphics/win32/win32_gui.h +++ b/navit/graphics/win32/win32_gui.h @@ -1,7 +1,7 @@ #ifndef WIN32_GUI_INCLUDED #define WIN32_GUI_INCLUDED -#include "resources\resource.h" +#include "resources/resource.h" #include "coord.h" #include "point.h" #include "graphics.h" diff --git a/navit/graphics/win32/xpm2bmp.c b/navit/graphics/win32/xpm2bmp.c index 3c60c1550..f88aa9166 100644 --- a/navit/graphics/win32/xpm2bmp.c +++ b/navit/graphics/win32/xpm2bmp.c @@ -2,7 +2,7 @@ #include <stdlib.h> #include <windows.h> #include <wingdi.h> -#include "Xpm2bmp.h" +#include "xpm2bmp.h" #define _DBG |