diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 1999-02-19 15:34:09 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 1999-02-19 15:34:09 +0000 |
| commit | 1a135b04249a6747ba023af915b6586bef4b41fb (patch) | |
| tree | bdfc95ce2fdf4f0edbdb587ec3f6fa188778821b /src/Fl_win32.cxx | |
| parent | d91bdb6022ba1711ec82bce013e17ff4bddb8a2b (diff) | |
Updated Fl::x(), ::y(), ::w(), and ::h() to account for WIN32 trays.
Updated menu code to account for tray locations.
git-svn-id: file:///fltk/svn/fltk/trunk@307 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_win32.cxx')
| -rw-r--r-- | src/Fl_win32.cxx | 36 |
1 files changed, 32 insertions, 4 deletions
diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx index f79112a4a..2d08091cb 100644 --- a/src/Fl_win32.cxx +++ b/src/Fl_win32.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_win32.cxx,v 1.28 1999/02/16 21:59:51 mike Exp $" +// "$Id: Fl_win32.cxx,v 1.29 1999/02/19 15:34:09 mike Exp $" // // WIN32-specific code for the Fast Light Tool Kit (FLTK). // @@ -156,9 +156,37 @@ double fl_wait(int timeout_flag, double time) { //////////////////////////////////////////////////////////////// -int Fl::h() {return GetSystemMetrics(SM_CYSCREEN);} +int Fl::x() +{ + RECT r; + + SystemParametersInfo(SPI_GETWORKAREA, 0, &r, 0); + return r.left; +} + +int Fl::y() +{ + RECT r; + + SystemParametersInfo(SPI_GETWORKAREA, 0, &r, 0); + return r.top; +} -int Fl::w() {return GetSystemMetrics(SM_CXSCREEN);} +int Fl::h() +{ + RECT r; + + SystemParametersInfo(SPI_GETWORKAREA, 0, &r, 0); + return r.bottom - r.top; +} + +int Fl::w() +{ + RECT r; + + SystemParametersInfo(SPI_GETWORKAREA, 0, &r, 0); + return r.right - r.left; +} void Fl::get_mouse(int &x, int &y) { POINT p; @@ -867,5 +895,5 @@ void Fl_Window::make_current() { } // -// End of "$Id: Fl_win32.cxx,v 1.28 1999/02/16 21:59:51 mike Exp $". +// End of "$Id: Fl_win32.cxx,v 1.29 1999/02/19 15:34:09 mike Exp $". // |