summaryrefslogtreecommitdiff
path: root/FL/Fl_Widget.H
diff options
context:
space:
mode:
authorAlbrecht Schlosser <albrechts.fltk@online.de>2015-04-04 09:52:53 +0000
committerAlbrecht Schlosser <albrechts.fltk@online.de>2015-04-04 09:52:53 +0000
commitf05b677a4beaeac8c27220efe481cd74cc84f39c (patch)
tree360a8dfe5a01eff229019677f5da5b89c8e706a4 /FL/Fl_Widget.H
parent33f61316fc92f314e94ee114e3cc09efd3ca25a2 (diff)
Fix Windows 64-bit compilation warnings (STR #2813).
Thanks to Csaba for providing a patch. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10670 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL/Fl_Widget.H')
-rw-r--r--FL/Fl_Widget.H6
1 files changed, 3 insertions, 3 deletions
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