diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2006-10-30 14:16:08 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2006-10-30 14:16:08 +0000 |
| commit | 3ebd631cf09a3d04f7c9606b33dca40176928445 (patch) | |
| tree | 13ce6fd15d13d9c88bcd8a4ecb3df8ac6be99445 /src/fl_font_xft.cxx | |
| parent | 117e22670d08fb4b865ebe84fa779ae1acb16b1d (diff) | |
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
Diffstat (limited to 'src/fl_font_xft.cxx')
| -rw-r--r-- | src/fl_font_xft.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/fl_font_xft.cxx b/src/fl_font_xft.cxx index 4c87ca23a..d84af32d6 100644 --- a/src/fl_font_xft.cxx +++ b/src/fl_font_xft.cxx @@ -145,7 +145,7 @@ static XftFont* fontopen(const char* name, bool core) { XFT_PIXEL_SIZE, XftTypeDouble, (double)fl_size_, core ? XFT_CORE : 0, XftTypeBool, true, XFT_RENDER, XftTypeBool, false, - 0); + (void *)0); } Fl_FontSize::Fl_FontSize(const char* name) { |