gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better implementation of Fl_WinAPI_Window_Driver::reuse_cursor() that will also work with custom cursors.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12277 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2017-06-28 17:07:09 +00:00
parent 582701ba07
commit 85724f00a0
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Fl_win32.cxx
View File

@ -2294,7 +2294,6 @@ int Fl_WinAPI_Window_Driver::set_cursor(Fl_Cursor c) {
custom_cursor = 0;
SetCursor(cursor);
current_cursor_ = c;
return 1;
}
@ -2318,12 +2317,11 @@ int Fl_WinAPI_Window_Driver::set_cursor(const Fl_RGB_Image *image, int hotx, int
}
void Fl_WinAPI_Window_Driver::reuse_cursor(fl_uintptr_t c) {
// calling SetCursor(cursor) does not work, so we call the crossplatform API
pWindow->cursor((Fl_Cursor)c);
SetCursor((HCURSOR)c);
}
fl_uintptr_t Fl_WinAPI_Window_Driver::current_cursor() {
return (fl_uintptr_t)current_cursor_;
return (fl_uintptr_t)cursor;
}

1
src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H
View File

@ -61,7 +61,6 @@ class FL_EXPORT Fl_WinAPI_Window_Driver : public Fl_Window_Driver
HICON big_icon;
HICON small_icon;
};
Fl_Cursor current_cursor_;
private:
void shape_bitmap_(Fl_Image* b);
void shape_alpha_(Fl_Image* img, int offset);

1
src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx
View File

@ -48,7 +48,6 @@ Fl_WinAPI_Window_Driver::Fl_WinAPI_Window_Driver(Fl_Window *win)
icon_ = new icon_data;
memset(icon_, 0, sizeof(icon_data));
cursor = NULL;
current_cursor_ = FL_CURSOR_DEFAULT;
}