Some fixes to get FLTK to compile under Jaquar.
Still have problems with menus and OpenGL... git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2280 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet
parent
25defef499
commit
7f64473ace
25
configure.in
25
configure.in
@ -1,7 +1,7 @@
|
||||
dnl -*- sh -*-
|
||||
dnl the "configure" script is made from this by running GNU "autoconf"
|
||||
dnl
|
||||
dnl "$Id: configure.in,v 1.33.2.31.2.68 2002/05/24 14:19:19 easysw Exp $"
|
||||
dnl "$Id: configure.in,v 1.33.2.31.2.69 2002/06/03 16:09:26 easysw Exp $"
|
||||
dnl
|
||||
dnl Configuration script for the Fast Light Tool Kit (FLTK).
|
||||
dnl
|
||||
@ -559,7 +559,7 @@ if test -n "$GXX"; then
|
||||
# you care about binary portability between Linux distributions,
|
||||
# you need to either 1) build your own GCC with static C++ libraries
|
||||
# or 2) link using gcc and libsupc++. We choose the latter since
|
||||
# FLTK doesn't (currently) use any of the stdc++ library.
|
||||
# CUPS doesn't (currently) use any of the stdc++ library.
|
||||
#
|
||||
# Also, GCC 3.0.x still has problems compiling some code. You may
|
||||
# or may not have success with it. USE 3.0.x WITH EXTREME CAUTION!
|
||||
@ -567,15 +567,16 @@ if test -n "$GXX"; then
|
||||
# Previous versions of GCC do not have the reliance on the stdc++
|
||||
# or g++ libraries, so the extra supc++ library is not needed.
|
||||
|
||||
case "`$CXX --version`" in
|
||||
3*)
|
||||
AC_MSG_WARN(GCC 3.0.x is known to produce incorrect code - use with caution!)
|
||||
LIBS="$LIBS -lsupc++"
|
||||
;;
|
||||
3.1*)
|
||||
LIBS="$LIBS -lsupc++"
|
||||
;;
|
||||
esac
|
||||
AC_MSG_CHECKING(if libsupc++ is required)
|
||||
|
||||
SUPC="`$CXX -print-file-name=libsupc++.a 2>/dev/null`"
|
||||
if test -n "$SUPC" -a "$SUPC" != "libsupc++.a"; then
|
||||
# This is gcc 3.x, and it knows of libsupc++, so we need it
|
||||
LIBS="$LIBS -lsupc++"
|
||||
AC_MSG_RESULT(yes)
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
fi
|
||||
|
||||
CXX="$CC"
|
||||
|
||||
@ -744,5 +745,5 @@ dnl Make sure the fltk-config script is executable...
|
||||
chmod +x fltk-config
|
||||
|
||||
dnl
|
||||
dnl End of "$Id: configure.in,v 1.33.2.31.2.68 2002/05/24 14:19:19 easysw Exp $".
|
||||
dnl End of "$Id: configure.in,v 1.33.2.31.2.69 2002/06/03 16:09:26 easysw Exp $".
|
||||
dnl
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
//
|
||||
// "$Id: Fl_mac.cxx,v 1.1.2.23 2002/05/25 13:38:24 easysw Exp $"
|
||||
// "$Id: Fl_mac.cxx,v 1.1.2.24 2002/06/03 16:09:27 easysw Exp $"
|
||||
//
|
||||
// MacOS specific code for the Fast Light Tool Kit (FLTK).
|
||||
//
|
||||
@ -77,12 +77,11 @@ Fl_Window *Fl_Window::current_;
|
||||
EventRef fl_os_event; // last (mouse) event
|
||||
|
||||
// forward declarations of variables in this file
|
||||
static unsigned short macKeyLookUp[];
|
||||
static Fl_Window* resize_from_system;
|
||||
static CursPtr default_cursor_ptr;
|
||||
static Cursor default_cursor;
|
||||
static WindowRef fl_os_capture = 0; // the dispatch handler will redirect mose move and drag events to these windows
|
||||
|
||||
|
||||
#if CONSOLIDATE_MOTION
|
||||
static Fl_Window* send_motion;
|
||||
extern Fl_Window* fl_xmousewin;
|
||||
@ -91,6 +90,37 @@ extern Fl_Window* fl_xmousewin;
|
||||
enum { kEventClassFLTK = 'fltk' };
|
||||
enum { kEventFLTKBreakLoop = 1 };
|
||||
|
||||
/**
|
||||
* Mac keyboard lookup table
|
||||
*/
|
||||
static unsigned short macKeyLookUp[128] =
|
||||
{
|
||||
'a', 's', 'd', 'f', 'h', 'g', 'z', 'x',
|
||||
'c', 'v', 0/*ISO extra (u-umlaut?)*/, 'b', 'q', 'w', 'e', 'r',
|
||||
|
||||
'y', 't', '1', '2', '3', '4', '6', '5',
|
||||
'=', '9', '7', '-', '8', '0', ']', 'o',
|
||||
|
||||
'u', '[', 'i', 'p', FL_Enter, 'l', 'j', '\'',
|
||||
'k', ';', '\\', ',', '/', 'n', 'm', '.',
|
||||
|
||||
FL_Tab, ' ', '`', FL_BackSpace, 0, FL_Escape, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
|
||||
0, FL_KP+'.', FL_Right, FL_KP+'*', 0, FL_KP+'+', FL_Left, FL_Num_Lock,
|
||||
FL_Down, 0, 0, FL_KP+'/', FL_KP_Enter, FL_Up, FL_KP+'-', 0,
|
||||
|
||||
0, FL_KP+'=', FL_KP+'0', FL_KP+'1', FL_KP+'2', FL_KP+'3', FL_KP+'4', FL_KP+'5',
|
||||
FL_KP+'6', FL_KP+'7', 0, FL_KP+'8', FL_KP+'9', 0, 0, 0,
|
||||
|
||||
FL_F+5, FL_F+6, FL_F+7, FL_F+3, FL_F+8, FL_F+9, 0, FL_F+11,
|
||||
0, 0, FL_Print, FL_Scroll_Lock, 0, FL_F+10, 0, FL_F+12,
|
||||
|
||||
0, FL_Pause, FL_Help, FL_Home, FL_Page_Up, FL_Delete, FL_F+4, FL_End,
|
||||
FL_F+2, FL_Page_Down, FL_F+1, FL_Left, FL_Right, FL_Down, FL_Up, 0,
|
||||
};
|
||||
|
||||
|
||||
// these pointers are set by the Fl::lock() function:
|
||||
static void nothing() {}
|
||||
void (*fl_lock_function)() = nothing;
|
||||
@ -726,37 +756,6 @@ void Fl::get_mouse(int &x, int &y)
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Mac keyboard lookup table
|
||||
*/
|
||||
static unsigned short macKeyLookUp[128] =
|
||||
{
|
||||
'a', 's', 'd', 'f', 'h', 'g', 'z', 'x',
|
||||
'c', 'v', 0/*ISO extra (u-umlaut?)*/, 'b', 'q', 'w', 'e', 'r',
|
||||
|
||||
'y', 't', '1', '2', '3', '4', '6', '5',
|
||||
'=', '9', '7', '-', '8', '0', ']', 'o',
|
||||
|
||||
'u', '[', 'i', 'p', FL_Enter, 'l', 'j', '\'',
|
||||
'k', ';', '\\', ',', '/', 'n', 'm', '.',
|
||||
|
||||
FL_Tab, ' ', '`', FL_BackSpace, 0, FL_Escape, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
|
||||
0, FL_KP+'.', FL_Right, FL_KP+'*', 0, FL_KP+'+', FL_Left, FL_Num_Lock,
|
||||
FL_Down, 0, 0, FL_KP+'/', FL_KP_Enter, FL_Up, FL_KP+'-', 0,
|
||||
|
||||
0, FL_KP+'=', FL_KP+'0', FL_KP+'1', FL_KP+'2', FL_KP+'3', FL_KP+'4', FL_KP+'5',
|
||||
FL_KP+'6', FL_KP+'7', 0, FL_KP+'8', FL_KP+'9', 0, 0, 0,
|
||||
|
||||
FL_F+5, FL_F+6, FL_F+7, FL_F+3, FL_F+8, FL_F+9, 0, FL_F+11,
|
||||
0, 0, FL_Print, FL_Scroll_Lock, 0, FL_F+10, 0, FL_F+12,
|
||||
|
||||
0, FL_Pause, FL_Help, FL_Home, FL_Page_Up, FL_Delete, FL_F+4, FL_End,
|
||||
FL_F+2, FL_Page_Down, FL_F+1, FL_Left, FL_Right, FL_Down, FL_Up, 0,
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* convert Mac keystrokes to FLTK
|
||||
*/
|
||||
@ -1427,6 +1426,6 @@ void Fl::paste(Fl_Widget &receiver, int clipboard) {
|
||||
|
||||
|
||||
//
|
||||
// End of "$Id: Fl_mac.cxx,v 1.1.2.23 2002/05/25 13:38:24 easysw Exp $".
|
||||
// End of "$Id: Fl_mac.cxx,v 1.1.2.24 2002/06/03 16:09:27 easysw Exp $".
|
||||
//
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user