diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2015-04-04 09:52:53 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2015-04-04 09:52:53 +0000 |
| commit | f05b677a4beaeac8c27220efe481cd74cc84f39c (patch) | |
| tree | 360a8dfe5a01eff229019677f5da5b89c8e706a4 /FL/Fl_Menu_Item.H | |
| parent | 33f61316fc92f314e94ee114e3cc09efd3ca25a2 (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_Menu_Item.H')
| -rw-r--r-- | FL/Fl_Menu_Item.H | 6 |
1 files changed, 3 insertions, 3 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: |