diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2005-04-08 07:25:56 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2005-04-08 07:25:56 +0000 |
| commit | 4bc49798e468ea2f7dc379a14ab2757d007d5b8a (patch) | |
| tree | 1246d64a8dfd2b99b94fb94e4affe5fc381fb56c | |
| parent | 500665b24deef32cce70a50583b58e2321a8d086 (diff) | |
fixed Xinerama compile and link bug
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4246 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | src/screen_xywh.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/screen_xywh.cxx b/src/screen_xywh.cxx index dd4b8ff5f..786886d07 100644 --- a/src/screen_xywh.cxx +++ b/src/screen_xywh.cxx @@ -34,12 +34,12 @@ // Number of screens... static int num_screens = 0; -#ifdef WIN32
-
-#if !defined(HMONITOR_DECLARED) && (_WIN32_WINNT < 0x0500)
-#define COMPILE_MULTIMON_STUBS
-#include <multimon.h>
-#endif
+#ifdef WIN32 + +#if !defined(HMONITOR_DECLARED) && (_WIN32_WINNT < 0x0500) +#define COMPILE_MULTIMON_STUBS +#include <multimon.h> +#endif static RECT screens[16]; @@ -80,7 +80,7 @@ static void screen_init() { if (num_screens >= 16) break; } } -#elif defined(HAVE_XINERAMA) +#elif HAVE_XINERAMA # include <X11/extensions/Xinerama.h> // Screen data... @@ -143,7 +143,7 @@ void Fl::screen_xywh(int &x, int &y, int &w, int &h, int mx, int my) { } } } -#elif defined(HAVE_XINERAMA) +#elif HAVE_XINERAMA if (num_screens > 0) { int i; @@ -188,7 +188,7 @@ void Fl::screen_xywh(int &x, int &y, int &w, int &h, int n) { h = screens[n].height; return; } -#elif defined(HAVE_XINERAMA) +#elif HAVE_XINERAMA if (num_screens > 0 && n >= 0 && n < num_screens) { x = screens[n].x_org; y = screens[n].y_org; |