diff options
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_Menu_Item.H | 6 | ||||
| -rw-r--r-- | FL/Fl_Widget.H | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/FL/Fl_Menu_Item.H b/FL/Fl_Menu_Item.H index cb90226f9..8167149ea 100644 --- a/FL/Fl_Menu_Item.H +++ b/FL/Fl_Menu_Item.H @@ -240,7 +240,7 @@ struct FL_EXPORT Fl_Menu_Item { for the menu item's callback function. \see Fl_Callback_p Fl_MenuItem::callback() const */ - void callback(Fl_Callback1*c, long p=0) {callback_=(Fl_Callback*)c; user_data_=(void*)p;} + void callback(Fl_Callback1*c, long p=0) {callback_=(Fl_Callback*)c; user_data_=(void*)(fl_intptr_t)p;} /** Gets the user_data() argument that is sent to the callback function. @@ -264,7 +264,7 @@ struct FL_EXPORT Fl_Menu_Item { and stores it in the menu item's userdata() member. This may not be portable to some machines. */ - void argument(long v) {user_data_ = (void*)v;} + void argument(long v) {user_data_ = (void*)(fl_intptr_t)v;} /** Gets what key combination shortcut will trigger the menu item. */ int shortcut() const {return shortcut_;} @@ -394,7 +394,7 @@ struct FL_EXPORT Fl_Menu_Item { the callback. You must first check that callback() is non-zero before calling this. */ - void do_callback(Fl_Widget* o,long arg) const {callback_(o, (void*)arg);} + void do_callback(Fl_Widget* o,long arg) const {callback_(o, (void*)(fl_intptr_t)arg);} // back-compatibility, do not use: diff --git a/FL/Fl_Widget.H b/FL/Fl_Widget.H index de6166f9a..d3b4e1516 100644 --- a/FL/Fl_Widget.H +++ b/FL/Fl_Widget.H @@ -584,7 +584,7 @@ public: \param[in] cb new callback \param[in] p user data */ - void callback(Fl_Callback1*cb, long p=0) {callback_=(Fl_Callback*)cb; user_data_=(void*)p;} + void callback(Fl_Callback1*cb, long p=0) {callback_=(Fl_Callback*)cb; user_data_=(void*)(fl_intptr_t)p;} /** Gets the user data for this widget. Gets the current user data (void *) argument that is passed to the callback function. @@ -606,7 +606,7 @@ public: \todo The user data value must be implemented using \em intptr_t or similar to avoid 64-bit machine incompatibilities. */ - void argument(long v) {user_data_ = (void*)v;} + void argument(long v) {user_data_ = (void*)(fl_intptr_t)v;} /** Returns the conditions under which the callback is called. @@ -856,7 +856,7 @@ public: \param[in] arg call the callback with \p arg as the user data argument \see callback() */ - void do_callback(Fl_Widget* o,long arg) {do_callback(o,(void*)arg);} + void do_callback(Fl_Widget* o,long arg) {do_callback(o,(void*)(fl_intptr_t)arg);} // Causes a widget to invoke its callback function with arbitrary arguments. // Documentation and implementation in Fl_Widget.cxx |