* reverted my previous commit: cannot work as expected

[vlc] / modules / gui / skins / os_font.h

diff --git a/modules/gui/skins/os_font.h b/modules/gui/skins/os_font.h
index be37b3c1e5ce86f07bd0329b2ee10ab4c5b832ff..196d8337cc3ae8998c5a43334a732819fe38da37 100644 (file)
--- a/modules/gui/skins/os_font.h
+++ b/modules/gui/skins/os_font.h
@@ -2,7 +2,7 @@
  * os_font.h: Wrapper for the OSFont class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: os_font.h,v 1.1 2003/03/18 02:21:47 ipkiss Exp $
+ * $Id: os_font.h,v 1.6 2003/04/28 14:12:32 asmax Exp $
  *
  * Authors: Olivier Teulière <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -25,6 +25,27 @@
 
 
 #if defined( WIN32 )
-    #include "win32_font.h"
+    #include "win32/win32_font.h"
     #define OSFont Win32Font
+
+    #define VLC_FONT_ALIGN_LEFT    DT_LEFT
+    #define VLC_FONT_ALIGN_CENTER  DT_CENTER
+    #define VLC_FONT_ALIGN_RIGHT   DT_RIGHT
+
+#elif defined GTK2_SKINS
+    #include "gtk2/gtk2_font.h"
+    #define OSFont GTK2Font
+
+    #define VLC_FONT_ALIGN_LEFT    PANGO_ALIGN_LEFT
+    #define VLC_FONT_ALIGN_CENTER  PANGO_ALIGN_CENTER
+    #define VLC_FONT_ALIGN_RIGHT   PANGO_ALIGN_RIGHT
+
+#elif defined X11_SKINS
+    #include "x11/x11_font.h"
+    #define OSFont X11Font
+
+    #define VLC_FONT_ALIGN_LEFT    0
+    #define VLC_FONT_ALIGN_CENTER  1
+    #define VLC_FONT_ALIGN_RIGHT   2
+
 #endif