From 0629b40afd8fc49ef2d9db898d190e3a1a508d8d Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Mon, 18 Apr 2016 14:31:07 +0000 Subject: Move set_cursor() member functions from class Fl_X to classes Fl_Window_Driver and derived. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11652 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_x.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/Fl_x.cxx') diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx index faa8a068b..020a41ad8 100644 --- a/src/Fl_x.cxx +++ b/src/Fl_x.cxx @@ -2666,7 +2666,7 @@ void Fl_X11_Window_Driver::set_icons() { //////////////////////////////////////////////////////////////// -int Fl_X::set_cursor(Fl_Cursor c) { +int Fl_X11_Window_Driver::set_cursor(Fl_Cursor c) { /* The cursors are cached, because creating one takes 0.5ms including opening, reading, and closing theme files. They are kept until program @@ -2720,12 +2720,12 @@ int Fl_X::set_cursor(Fl_Cursor c) { #undef cache_cursor - XDefineCursor(fl_display, xid, xc); + XDefineCursor(fl_display, fl_xid(pWindow), xc); return 1; } -int Fl_X::set_cursor(const Fl_RGB_Image *image, int hotx, int hoty) { +int Fl_X11_Window_Driver::set_cursor(const Fl_RGB_Image *image, int hotx, int hoty) { #if ! HAVE_XCURSOR return 0; #else @@ -2769,7 +2769,7 @@ int Fl_X::set_cursor(const Fl_RGB_Image *image, int hotx, int hoty) { cursor->yhot = hoty; xc = XcursorImageLoadCursor(fl_display, cursor); - XDefineCursor(fl_display, xid, xc); + XDefineCursor(fl_display, fl_xid(pWindow), xc); XFreeCursor(fl_display, xc); XcursorImageDestroy(cursor); -- cgit v1.2.3