mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00
Code Issues Releases Activity

- Fix gcc42 build on amd64, these diffs duplicate vendor fltk-1.1.x-r5940

Browse Source 
work in progress, so can be backed out on next major release of fltk.

Approved by:	demon
This commit is contained in:
Diane Bruce 2007-09-27 17:17:58 +00:00
parent e91317d068
commit dc46db692a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=200182
5 changed files with 81 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
x11-toolkits/fltk/files/patch-test_cursor.cxx Normal file
View File

@ -0,0 +1,11 @@
--- test/cursor.cxx.orig Fri Apr 15 20:13:17 2005
+++ test/cursor.cxx Thu Sep 27 12:42:14 2007
@@ -39,7 +39,7 @@
Fl_Hor_Value_Slider *cursor_slider;
void choice_cb(Fl_Widget *, void *v) {
- cursor = (Fl_Cursor)(int)v;
+ cursor = (Fl_Cursor)(long)v;
cursor_slider->value(cursor);
fl_cursor(cursor,fg,bg);
}

19
x11-toolkits/fltk/files/patch-test_input.cxx Normal file
View File

@ -0,0 +1,19 @@
--- test/input.cxx.orig Fri Sep 21 21:59:12 2007
+++ test/input.cxx Fri Sep 21 22:44:21 2007
@@ -26,6 +26,7 @@
//
#include <stdio.h>
+#include <sys/types.h>
#include <FL/Fl.H>
#include <FL/Fl_Window.H>
#include <FL/Fl_Input.H>
@@ -61,7 +62,7 @@
void color_cb(Fl_Widget* button, void* v) {
Fl_Color c;
- switch ((int)v) {
+ switch ((long)v) {
case 0: c = FL_BACKGROUND2_COLOR; break;
case 1: c = FL_SELECTION_COLOR; break;
default: c = FL_FOREGROUND_COLOR; break;

16
x11-toolkits/fltk/files/patch-test_keyboard.cxx Normal file
View File

@ -0,0 +1,16 @@
--- test/keyboard.cxx.orig Sat Sep 22 10:00:16 2007
+++ test/keyboard.cxx Sat Sep 22 12:05:41 2007
@@ -105,11 +105,11 @@
for (int i = 0; i < window->children(); i++) {
Fl_Widget* b = window->child(i);
if (b->callback() == (Fl_Callback*)key_cb) {
- int i = int(b->user_data());
+ long i = long(b->user_data());
if (!i) i = b->label()[0];
((Fl_Button*)b)->value(Fl::event_key(i));
} else if (b->callback() == (Fl_Callback*)shift_cb) {
- int i = int(b->user_data());
+ long i = long(b->user_data());
((Fl_Button*)b)->value(Fl::event_state(i));
}
}

15
x11-toolkits/fltk/files/patch-test_line_style.cxx Normal file
View File

@ -0,0 +1,15 @@
--- test/line_style.cxx.orig Sat Sep 22 12:55:42 2007
+++ test/line_style.cxx Sat Sep 22 12:56:25 2007
@@ -54,9 +54,9 @@
buf[3] = char(sliders[7]->value());
buf[4] = 0;
fl_line_style(
- (int)(choice[0]->mvalue()->user_data()) +
- (int)(choice[1]->mvalue()->user_data()) +
- (int)(choice[2]->mvalue()->user_data()),
+ (long)(choice[0]->mvalue()->user_data()) +
+ (long)(choice[1]->mvalue()->user_data()) +
+ (long)(choice[2]->mvalue()->user_data()),
(int)(sliders[3]->value()),
buf);
fl_rect(10,10,w()-20,h()-20);

20
x11-toolkits/fltk/files/patch-test_scroll.cxx Normal file
View File

@ -0,0 +1,20 @@
--- test/scroll.cxx.orig Sat Sep 22 13:33:34 2007
+++ test/scroll.cxx Sat Sep 22 13:33:53 2007
@@ -71,7 +71,7 @@
}
void type_cb(Fl_Widget*, void* v) {
- thescroll->type(int(v));
+ thescroll->type(long(v));
thescroll->redraw();
}
@@ -87,7 +87,7 @@
};
void align_cb(Fl_Widget*, void* v) {
- thescroll->scrollbar.align(int(v));
+ thescroll->scrollbar.align(long(v));
thescroll->redraw();
}