From 3ebd631cf09a3d04f7c9606b33dca40176928445 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Mon, 30 Oct 2006 14:16:08 +0000 Subject: Fl::x(), Fl::y(), Fl::w(), and Fl::h() did not report the desktop work area on X11 (STR #1482) Fix another "missing sentinel" warning in the Xft code. FL/Fl.H: - Remove in-line x() and y() implementation for X11. src/Fl_x.cxx: - Fl::x(), Fl::y(): Added. - fl_init_workarea(): Added to get _NET_WORKAREA property from the root window; if none, is available, the code falls back to 0, 0, DisplayWidth, and DisplayHeight. src/fl_font_xft.cxx: - Missing sentinel needs cast to void *. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5535 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- FL/Fl.H | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'FL') diff --git a/FL/Fl.H b/FL/Fl.H index 72086ccd2..13a24a6c5 100644 --- a/FL/Fl.H +++ b/FL/Fl.H @@ -3,7 +3,7 @@ // // Main header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2005 by Bill Spitzak and others. +// Copyright 1998-2006 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -194,13 +194,8 @@ public: static void paste(Fl_Widget &receiver); // screen size: -#if defined(WIN32) || defined(__APPLE__) static int x(); static int y(); -#else - static int x() {return 0;} - static int y() {return 0;} -#endif /* WIN32 || __APPLE__ */ static int w(); static int h(); -- cgit v1.2.3