|
 |
ceac5b |
diff -up fltk-1.3.x-r9671/FL/Fl_Window.H.cursor-abi fltk-1.3.x-r9671/FL/Fl_Window.H
|
|
|
ceac5b |
--- fltk-1.3.x-r9671/FL/Fl_Window.H.cursor-abi 2012-12-04 12:39:42.419066193 +0100
|
|
|
ceac5b |
+++ fltk-1.3.x-r9671/FL/Fl_Window.H 2012-12-04 12:40:45.791122889 +0100
|
|
|
ceac5b |
@@ -467,15 +467,13 @@ public:
|
|
|
ceac5b |
|
|
|
ceac5b |
The type Fl_Cursor is an enumeration defined in <FL/Enumerations.H>.
|
|
|
ceac5b |
|
|
|
ceac5b |
+ The Fl_Color parameters are here only for backward compatibility.
|
|
|
ceac5b |
+
|
|
|
ceac5b |
\see cursor(const Fl_RGB_Image*, int, int), default_cursor()
|
|
|
ceac5b |
*/
|
|
|
ceac5b |
- void cursor(Fl_Cursor);
|
|
|
ceac5b |
+ void cursor(Fl_Cursor c, Fl_Color=FL_BLACK, Fl_Color=FL_WHITE);
|
|
|
ceac5b |
void cursor(const Fl_RGB_Image*, int, int);
|
|
|
ceac5b |
- void default_cursor(Fl_Cursor);
|
|
|
ceac5b |
-
|
|
|
ceac5b |
- /* for legacy compatibility */
|
|
|
ceac5b |
- void cursor(Fl_Cursor c, Fl_Color, Fl_Color=FL_WHITE) { cursor(c); };
|
|
|
ceac5b |
- void default_cursor(Fl_Cursor c, Fl_Color, Fl_Color=FL_WHITE) { default_cursor(c); };
|
|
|
ceac5b |
+ void default_cursor(Fl_Cursor c, Fl_Color=FL_BLACK, Fl_Color=FL_WHITE);
|
|
|
ceac5b |
|
|
|
ceac5b |
static void default_callback(Fl_Window*, void* v);
|
|
|
ceac5b |
|
|
|
ceac5b |
diff -up fltk-1.3.x-r9671/src/fl_cursor.cxx.cursor-abi fltk-1.3.x-r9671/src/fl_cursor.cxx
|
|
|
ceac5b |
--- fltk-1.3.x-r9671/src/fl_cursor.cxx.cursor-abi 2012-12-04 12:40:55.714131967 +0100
|
|
|
ceac5b |
+++ fltk-1.3.x-r9671/src/fl_cursor.cxx 2012-12-04 12:41:25.804159597 +0100
|
|
|
ceac5b |
@@ -55,7 +55,7 @@ void fl_cursor(Fl_Cursor c, Fl_Color fg,
|
|
|
ceac5b |
|
|
|
ceac5b |
\see cursor(const Fl_RGB_Image*, int, int), default_cursor()
|
|
|
ceac5b |
*/
|
|
|
ceac5b |
-void Fl_Window::default_cursor(Fl_Cursor c) {
|
|
|
ceac5b |
+void Fl_Window::default_cursor(Fl_Cursor c, Fl_Color, Fl_Color) {
|
|
|
ceac5b |
cursor_default = c;
|
|
|
ceac5b |
cursor(c);
|
|
|
ceac5b |
}
|
|
|
ceac5b |
@@ -108,7 +108,7 @@ void fallback_cursor(Fl_Window *w, Fl_Cu
|
|
|
ceac5b |
}
|
|
|
ceac5b |
|
|
|
ceac5b |
|
|
|
ceac5b |
-void Fl_Window::cursor(Fl_Cursor c) {
|
|
|
ceac5b |
+void Fl_Window::cursor(Fl_Cursor c, Fl_Color, Fl_Color) {
|
|
|
ceac5b |
int ret;
|
|
|
ceac5b |
|
|
|
ceac5b |
// the cursor must be set for the top level window, not for subwindows
|