Moving the platform dependencies from the "freeglut_menu.c" file to the platform...

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1066 7f0cb862-5218-0410-a997-914c9d46530a

diff --git a/src/Common/freeglut_menu.c b/src/Common/freeglut_menu.c
index 8444d6e..4ea023a 100644 (file)
--- a/src/Common/freeglut_menu.c
+++ b/src/Common/freeglut_menu.c
@@ -53,11 +53,7 @@
  * that that wasn't the original intent...if not, perhaps we need another\r
  * symbolic constant, FREEGLUT_MENU_ITEM_BORDER, or such.)\r
  */\r
-#if TARGET_HOST_MS_WINDOWS\r
-#define  FREEGLUT_MENU_FONT    GLUT_BITMAP_8_BY_13\r
-#else\r
-#define  FREEGLUT_MENU_FONT    GLUT_BITMAP_HELVETICA_18\r
-#endif\r
+/* See platform-specific header files for menu font and color definitions */\r
 \r
 #define  FREEGLUT_MENU_HEIGHT  (glutBitmapHeight(FREEGLUT_MENU_FONT) + \\r
                                 FREEGLUT_MENU_BORDER)\r
@@ -72,17 +68,10 @@
  * too.  These variables should be stuffed into global state and initialized\r
  * via the glutInit*() system.\r
  */\r
-#if TARGET_HOST_MS_WINDOWS\r
-static float menu_pen_fore  [4] = {0.0f,  0.0f,  0.0f,  1.0f};\r
-static float menu_pen_back  [4] = {0.85f, 0.85f, 0.85f, 1.0f};\r
-static float menu_pen_hfore [4] = {1.0f,  1.0f,  1.0f,  1.0f};\r
-static float menu_pen_hback [4] = {0.15f, 0.15f, 0.45f, 1.0f};\r
-#else\r
-static float menu_pen_fore  [4] = {0.0f,  0.0f,  0.0f,  1.0f};\r
-static float menu_pen_back  [4] = {0.70f, 0.70f, 0.70f, 1.0f};\r
-static float menu_pen_hfore [4] = {0.0f,  0.0f,  0.0f,  1.0f};\r
-static float menu_pen_hback [4] = {1.0f,  1.0f,  1.0f,  1.0f};\r
-#endif\r
+static float menu_pen_fore  [4] = FREEGLUT_MENU_PEN_FORE_COLORS ;\r
+static float menu_pen_back  [4] = FREEGLUT_MENU_PEN_BACK_COLORS ;\r
+static float menu_pen_hfore [4] = FREEGLUT_MENU_PEN_HFORE_COLORS;\r
+static float menu_pen_hback [4] = FREEGLUT_MENU_PEN_HBACK_COLORS;\r
 \r
 \r
 extern GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y );\r

diff --git a/src/mswin/freeglut_internal_mswin.h b/src/mswin/freeglut_internal_mswin.h
index 8712ad9..b37ad8c 100644 (file)
--- a/src/mswin/freeglut_internal_mswin.h
+++ b/src/mswin/freeglut_internal_mswin.h
@@ -108,6 +108,14 @@ struct tagSFG_PlatformJoystick
 #endif\r
 \r
 \r
+/* Menu font and color definitions */\r
+#define  FREEGLUT_MENU_FONT    GLUT_BITMAP_8_BY_13\r
+\r
+#define  FREEGLUT_MENU_PEN_FORE_COLORS   {0.0f,  0.0f,  0.0f,  1.0f}\r
+#define  FREEGLUT_MENU_PEN_BACK_COLORS   {0.85f, 0.85f, 0.85f, 1.0f}\r
+#define  FREEGLUT_MENU_PEN_HFORE_COLORS  {1.0f,  1.0f,  1.0f,  1.0f}\r
+#define  FREEGLUT_MENU_PEN_HBACK_COLORS  {0.15f, 0.15f, 0.45f, 1.0f}\r
+\r
 \r
 /* Function to be called on exit */\r
 extern void (__cdecl *__glutExitFunc)( int return_value );\r

diff --git a/src/x11/freeglut_internal_x11.h b/src/x11/freeglut_internal_x11.h
index 72fd6dc..02472e7 100644 (file)
--- a/src/x11/freeglut_internal_x11.h
+++ b/src/x11/freeglut_internal_x11.h
@@ -198,6 +198,17 @@ struct tagSFG_PlatformJoystick
 };\r
 \r
 \r
+/* Menu font and color definitions */\r
+#define  FREEGLUT_MENU_FONT    GLUT_BITMAP_HELVETICA_18\r
+\r
+#define  FREEGLUT_MENU_PEN_FORE_COLORS   {0.0f,  0.0f,  0.0f,  1.0f}\r
+#define  FREEGLUT_MENU_PEN_BACK_COLORS   {0.70f, 0.70f, 0.70f, 1.0f}\r
+#define  FREEGLUT_MENU_PEN_HFORE_COLORS  {0.0f,  0.0f,  0.0f,  1.0f}\r
+#define  FREEGLUT_MENU_PEN_HBACK_COLORS  {1.0f,  1.0f,  1.0f,  1.0f}\r
+\r
+\r
+\r
+\r
 /* -- PRIVATE FUNCTION DECLARATIONS ---------------------------------------- */\r
 /* spaceball device functions, defined in freeglut_spaceball.c */\r
 int             fgIsSpaceballXEvent( const XEvent *ev );\r