Commit 68783ddb authored by Aaron M. Ucko's avatar Aaron M. Ucko

Load fltk-1.1.5 into branches/upstream/current.

parent 398d9e39
CHANGES IN FLTK 1.1.5
- Documentation updates (STR #568, STR #570)
- Shortcuts were incorrectly underlined in multi-line
labels (STR #566)
- More CMake updates (STR #499)
- The Watcom C++ compiler needed a small change (STR
#567)
- Added DESTDIR support and now remove all man pages for
the "uninstall" target (STR #545)
- Fix PNG drawing on buggy WIN32 graphics cards (STR
#548)
- The configure script didn't propagate the CPPFLAGS
environment variable (STR #549)
- The numpad keys didn't work properly on WIN32 (STR
#502)
- fl_input() and friends now set the input focus to the
text field when the dialog is shown (STR #553)
- Fixed background color mixup when drawing Fl_Choice
menus (STR #544)
- Fixed MingW makefiles (STR #550)
- More VC++ project file tweaking (STR #559)
- Fl_PNG_Image didn't use the png_set_trns_to_alpha
function when available (STR #547)
- The FL_UNFOCUS event wasn't always sent when switching
tabs (STR #558)
CHANGES IN FLTK 1.1.5rc3
- Documentation updates (STR #505, STR #513)
......
#
# Check if the symbol exists in include files
#
# CHECK_FUNCTIONWITHHEADER_EXISTS - macro which checks the symbol exists in include files.
# SYMBOL - symbol
# FILES - include files to check
# VARIABLE - variable to return result
#
MACRO(CHECK_FUNCTIONWITHHEADER_EXISTS SYMBOL FILES VARIABLE)
IF("${VARIABLE}" MATCHES "^${VARIABLE}$")
SET(CHECK_SYMBOL_EXISTS_CONTENT "/* */\n")
SET(MACRO_CHECK_SYMBOL_EXISTS_FLAGS ${CMAKE_REQUIRED_FLAGS})
IF(CMAKE_REQUIRED_LIBRARIES)
SET(CHECK_SYMBOL_EXISTS_LIBS
"-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}")
ENDIF(CMAKE_REQUIRED_LIBRARIES)
FOREACH(FILE ${FILES})
SET(CHECK_SYMBOL_EXISTS_CONTENT
"${CHECK_SYMBOL_EXISTS_CONTENT}#include <${FILE}>\n")
ENDFOREACH(FILE)
SET(CHECK_SYMBOL_EXISTS_CONTENT
"${CHECK_SYMBOL_EXISTS_CONTENT}\nint main()\n{\n${SYMBOL};return 0;\n}\n")
FILE(WRITE ${CMAKE_BINARY_DIR}/CMakeTmp/CheckSymbolExists.c
"${CHECK_SYMBOL_EXISTS_CONTENT}")
MESSAGE(STATUS "Looking for ${SYMBOL}")
TRY_COMPILE(${VARIABLE}
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/CMakeTmp/CheckSymbolExists.c
CMAKE_FLAGS
-DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_SYMBOL_EXISTS_FLAGS}
"${CHECK_SYMBOL_EXISTS_LIBS}"
OUTPUT_VARIABLE OUTPUT)
IF(${VARIABLE})
MESSAGE(STATUS "Looking for ${SYMBOL} - found")
SET(${VARIABLE} 1 CACHE INTERNAL "Have symbol ${SYMBOL}")
FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeOutput.log
"Determining if the ${SYMBOL} "
"exist passed with the following output:\n"
"${OUTPUT}\nFile ${CMAKE_BINARY_DIR}/CMakeTmp/CheckSymbolExists.c:\n"
"${CHECK_SYMBOL_EXISTS_CONTENT}\n")
ELSE(${VARIABLE})
MESSAGE(STATUS "Looking for ${SYMBOL} - not found.")
SET(${VARIABLE} "" CACHE INTERNAL "Have symbol ${SYMBOL}")
FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeError.log
"Determining if the ${SYMBOL} "
"exist failed with the following output:\n"
"${OUTPUT}\nFile ${CMAKE_BINARY_DIR}/CMakeTmp/CheckSymbolExists.c:\n"
"${CHECK_SYMBOL_EXISTS_CONTENT}\n")
ENDIF(${VARIABLE})
ENDIF("${VARIABLE}" MATCHES "^${VARIABLE}$")
ENDMACRO(CHECK_FUNCTIONWITHHEADER_EXISTS)
#
# Check if the symbol exists in include files
#
# CHECK_FUNCTIONWITHHEADER_EXISTS - macro which checks the symbol exists in include files.
# SYMBOL - symbol
# FILES - include files to check
# VARIABLE - variable to return result
#
MACRO(CHECK_FUNCTIONWITHHEADER_EXISTS SYMBOL FILES VARIABLE)
IF("${VARIABLE}" MATCHES "^${VARIABLE}$")
SET(CHECK_SYMBOL_EXISTS_CONTENT "/* */\n")
SET(MACRO_CHECK_SYMBOL_EXISTS_FLAGS ${CMAKE_REQUIRED_FLAGS})
IF(CMAKE_REQUIRED_LIBRARIES)
SET(CHECK_SYMBOL_EXISTS_LIBS
"-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}")
ENDIF(CMAKE_REQUIRED_LIBRARIES)
FOREACH(FILE ${FILES})
SET(CHECK_SYMBOL_EXISTS_CONTENT
"${CHECK_SYMBOL_EXISTS_CONTENT}#include <${FILE}>\n")
ENDFOREACH(FILE)
SET(CHECK_SYMBOL_EXISTS_CONTENT
"${CHECK_SYMBOL_EXISTS_CONTENT}\nint main()\n{\n${SYMBOL};return 0;\n}\n")
FILE(WRITE ${CMAKE_BINARY_DIR}/CMakeTmp/CheckSymbolExists.c
"${CHECK_SYMBOL_EXISTS_CONTENT}")
MESSAGE(STATUS "Looking for ${SYMBOL}")
TRY_COMPILE(${VARIABLE}
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/CMakeTmp/CheckSymbolExists.c
CMAKE_FLAGS
-DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_SYMBOL_EXISTS_FLAGS}
"${CHECK_SYMBOL_EXISTS_LIBS}"
OUTPUT_VARIABLE OUTPUT)
IF(${VARIABLE})
MESSAGE(STATUS "Looking for ${SYMBOL} - found")
SET(${VARIABLE} 1 CACHE INTERNAL "Have symbol ${SYMBOL}")
FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeOutput.log
"Determining if the ${SYMBOL} "
"exist passed with the following output:\n"
"${OUTPUT}\nFile ${CMAKE_BINARY_DIR}/CMakeTmp/CheckSymbolExists.c:\n"
"${CHECK_SYMBOL_EXISTS_CONTENT}\n")
ELSE(${VARIABLE})
MESSAGE(STATUS "Looking for ${SYMBOL} - not found.")
SET(${VARIABLE} "" CACHE INTERNAL "Have symbol ${SYMBOL}")
FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeError.log
"Determining if the ${SYMBOL} "
"exist failed with the following output:\n"
"${OUTPUT}\nFile ${CMAKE_BINARY_DIR}/CMakeTmp/CheckSymbolExists.c:\n"
"${CHECK_SYMBOL_EXISTS_CONTENT}\n")
ENDIF(${VARIABLE})
ENDIF("${VARIABLE}" MATCHES "^${VARIABLE}$")
ENDMACRO(CHECK_FUNCTIONWITHHEADER_EXISTS)
#-----------------------------------------------------------------------------
#
# FLTKConfig.cmake - FLTK CMake configuration file for external projects.
#
# This file is configured by FLTK and used by the UseFLTK.cmake module
# to load FLTK's settings for an external project.
# The FLTK source tree.
SET(FLTK_SOURCE_DIR "@FLTK_SOURCE_DIR@")
# The FLTK include file directories.
SET(FLTK_EXECUTABLE_DIRS "@FLTK_EXECUTABLE_DIRS@")
SET(FLTK_LIBRARY_DIRS "@FLTK_LIBRARY_DIRS@")
SET(FLTK_LIBRARIES "fltk_images;fltk;fltk_gl;fltk_forms")
# The C and C++ flags added by FLTK to the cmake-configured flags.
SET(FLTK_REQUIRED_C_FLAGS "@FLTK_REQUIRED_C_FLAGS@")
SET(FLTK_REQUIRED_CXX_FLAGS "@FLTK_REQUIRED_CXX_FLAGS@")
# The FLTK version number
SET(FLTK_VERSION_MAJOR "@FLTK_VERSION_MAJOR@")
SET(FLTK_VERSION_MINOR "@FLTK_VERSION_MINOR@")
SET(FLTK_VERSION_PATCH "@FLTK_VERSION_PATCH@")
# The location of the UseFLTK.cmake file.
SET(FLTK_USE_FILE "@FLTK_USE_FILE@")
# The build settings file.
SET(FLTK_BUILD_SETTINGS_FILE "@FLTK_BUILD_SETTINGS_FILE@")
# Whether FLTK was built with shared libraries.
SET(FLTK_BUILD_SHARED "@BUILD_SHARED_LIBS@")
#-----------------------------------------------------------------------------
#
# FLTKConfig.cmake - FLTK CMake configuration file for external projects.
#
# This file is configured by FLTK and used by the UseFLTK.cmake module
# to load FLTK's settings for an external project.
# The FLTK source tree.
SET(FLTK_SOURCE_DIR "@FLTK_SOURCE_DIR@")
# The FLTK include file directories.
SET(FLTK_EXECUTABLE_DIRS "@FLTK_EXECUTABLE_DIRS@")
SET(FLTK_LIBRARY_DIRS "@FLTK_LIBRARY_DIRS@")
SET(FLTK_LIBRARIES "fltk_images;fltk;fltk_gl;fltk_forms")
# The C and C++ flags added by FLTK to the cmake-configured flags.
SET(FLTK_REQUIRED_C_FLAGS "@FLTK_REQUIRED_C_FLAGS@")
SET(FLTK_REQUIRED_CXX_FLAGS "@FLTK_REQUIRED_CXX_FLAGS@")
# The FLTK version number
SET(FLTK_VERSION_MAJOR "@FLTK_VERSION_MAJOR@")
SET(FLTK_VERSION_MINOR "@FLTK_VERSION_MINOR@")
SET(FLTK_VERSION_PATCH "@FLTK_VERSION_PATCH@")
# The location of the UseFLTK.cmake file.
SET(FLTK_USE_FILE "@FLTK_USE_FILE@")
# The build settings file.
SET(FLTK_BUILD_SETTINGS_FILE "@FLTK_BUILD_SETTINGS_FILE@")
# Whether FLTK was built with shared libraries.
SET(FLTK_BUILD_SHARED "@BUILD_SHARED_LIBS@")
This diff is collapsed.
//
// "$Id: Fl_Multi_Browser.H,v 1.4.2.3.2.3 2004/04/11 04:38:54 easysw Exp $"
// "$Id: Fl_Multi_Browser.H,v 1.4.2.3.2.4 2004/09/29 15:05:48 easysw Exp $"
//
// Multi browser header file for the Fast Light Tool Kit (FLTK).
//
......@@ -30,12 +30,12 @@
class Fl_Multi_Browser : public Fl_Browser {
public:
Fl_Multi_Browser(int x,int y,int w,int h,const char *l=0)
: Fl_Browser(x,y,w,h,l) {type(FL_MULTI_BROWSER);}
Fl_Multi_Browser(int X,int Y,int W,int H,const char *L=0)
: Fl_Browser(X,Y,W,H,L) {type(FL_MULTI_BROWSER);}
};
#endif
//
// End of "$Id: Fl_Multi_Browser.H,v 1.4.2.3.2.3 2004/04/11 04:38:54 easysw Exp $".
// End of "$Id: Fl_Multi_Browser.H,v 1.4.2.3.2.4 2004/09/29 15:05:48 easysw Exp $".
//
#
# "$Id: Makefile.in,v 1.1.2.8 2004/04/11 04:38:54 easysw Exp $"
# "$Id: Makefile.in,v 1.1.2.9 2004/10/18 20:22:21 easysw Exp $"
#
# Header makefile for the Fast Light Tool Kit (FLTK).
#
......@@ -28,31 +28,31 @@ include ../makeinclude
all:
install:
echo "Installing include files in $(includedir)..."
-$(MKDIR) -p $(includedir)
$(RMDIR) $(includedir)/FL
$(MKDIR) $(includedir)/FL
$(CHMOD) 755 $(includedir)/FL
$(CP) ../FL/*.[hHr] $(includedir)/FL
$(CHMOD) 644 $(includedir)/FL/*.[hHr]
@HLINKS@ cd $(includedir)/FL;\
echo "Installing include files in $(DESTDIR)$(includedir)..."
-$(MKDIR) -p $(DESTDIR)$(includedir)
$(RMDIR) $(DESTDIR)$(includedir)/FL
$(MKDIR) $(DESTDIR)$(includedir)/FL
$(CHMOD) 755 $(DESTDIR)$(includedir)/FL
$(CP) ../FL/*.[hHr] $(DESTDIR)$(includedir)/FL
$(CHMOD) 644 $(DESTDIR)$(includedir)/FL/*.[hHr]
@HLINKS@ cd $(DESTDIR)$(includedir)/FL;\
@HLINKS@ for file in *.H; do\
@HLINKS@ $(RM) "`basename $$file H`h";\
@HLINKS@ $(LN) $$file "`basename $$file H`h";\
@HLINKS@ done
@HLINKS@ $(RM) $(includedir)/FL/fl_file_chooser.H
@HLINKS@ $(LN) Fl_File_Chooser.H $(includedir)/FL/fl_file_chooser.H
@HLINKS@ $(RM) $(includedir)/FL/fl_file_chooser.h
@HLINKS@ $(LN) Fl_File_Chooser.H $(includedir)/FL/fl_file_chooser.h
@HLINKS@ $(RM) $(includedir)/Fl
@HLINKS@ $(LN) FL $(includedir)/Fl
@HLINKS@ $(RM) $(DESTDIR)$(includedir)/FL/fl_file_chooser.H
@HLINKS@ $(LN) Fl_File_Chooser.H $(DESTDIR)$(includedir)/FL/fl_file_chooser.H
@HLINKS@ $(RM) $(DESTDIR)$(includedir)/FL/fl_file_chooser.h
@HLINKS@ $(LN) Fl_File_Chooser.H $(DESTDIR)$(includedir)/FL/fl_file_chooser.h
@HLINKS@ $(RM) $(DESTDIR)$(includedir)/Fl
@HLINKS@ $(LN) FL $(DESTDIR)$(includedir)/Fl
uninstall:
echo "Uninstalling include files..."
$(RMDIR) $(includedir)/FL
@HLINKS@ $(RM) $(includedir)/Fl
$(RMDIR) $(DESTDIR)$(includedir)/FL
@HLINKS@ $(RM) $(DESTDIR)$(includedir)/Fl
#
# End of "$Id: Makefile.in,v 1.1.2.8 2004/04/11 04:38:54 easysw Exp $".
# End of "$Id: Makefile.in,v 1.1.2.9 2004/10/18 20:22:21 easysw Exp $".
#
/*
* "$Id: filename.H,v 1.11.2.4.2.14 2004/04/11 04:38:54 easysw Exp $"
* "$Id: filename.H,v 1.11.2.4.2.15 2004/10/18 20:29:54 easysw Exp $"
*
* Filename header file for the Fast Light Tool Kit (FLTK).
*
......@@ -51,7 +51,7 @@ inline int fl_filename_relative(char *to, const char *from) { return fl_filename
# endif /* __cplusplus */
# if defined(WIN32) && !defined(__CYGWIN__)
# if defined(WIN32) && !defined(__CYGWIN__) && !defined(__WATCOMC__)
struct dirent {char d_name[1];};
......@@ -65,6 +65,10 @@ struct dirent {char d_name[1];};
# include <sys/types.h>
# include "/usr/include/dirent.h"
# elif defined(__WATCOMC__)
# include <sys/types.h>
# include <direct.h>
# else
/*
* WARNING: on some systems (very few nowadays?) <dirent.h> may not exist.
......@@ -127,5 +131,5 @@ FL_EXPORT int fl_filename_list(const char *d, struct dirent ***l,
#endif /* FL_FILENAME_H */
/*
* End of "$Id: filename.H,v 1.11.2.4.2.14 2004/04/11 04:38:54 easysw Exp $".
* End of "$Id: filename.H,v 1.11.2.4.2.15 2004/10/18 20:29:54 easysw Exp $".
*/
#
# "$Id: Makefile,v 1.12.2.6.2.18 2004/07/06 00:18:48 easysw Exp $"
# "$Id: Makefile,v 1.12.2.6.2.19 2004/10/18 20:22:21 easysw Exp $"
#
# Top-level makefile for the Fast Light Tool Kit (FLTK).
#
......@@ -34,17 +34,17 @@ all: makeinclude
done
install: makeinclude
-mkdir -p $(bindir)
$(RM) $(bindir)/fltk-config
-cp fltk-config $(bindir)
-chmod 755 $(bindir)/fltk-config
-mkdir -p $(DESTDIR)$(bindir)
$(RM) $(DESTDIR)$(bindir)/fltk-config
-cp fltk-config $(DESTDIR)$(bindir)
-chmod 755 $(DESTDIR)$(bindir)/fltk-config
for dir in FL $(DIRS); do\
echo "=== installing $$dir ===";\
(cd $$dir; $(MAKE) $(MFLAGS) install) || break;\
done
uninstall: makeinclude
$(RM) $(bindir)/fltk-config
$(RM) $(DESTDIR)$(bindir)/fltk-config
for dir in FL $(DIRS); do\
echo "=== uninstalling $$dir ===";\
(cd $$dir; $(MAKE) $(MFLAGS) uninstall) || break;\
......@@ -97,5 +97,5 @@ native-dist:
#
# End of "$Id: Makefile,v 1.12.2.6.2.18 2004/07/06 00:18:48 easysw Exp $".
# End of "$Id: Makefile,v 1.12.2.6.2.19 2004/10/18 20:22:21 easysw Exp $".
#
This diff is collapsed.
......@@ -1291,7 +1291,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
FL_MAJOR_VERSION=1
FL_MINOR_VERSION=1
FL_PATCH_VERSION=5
FL_RELEASE_VERSION=rc3
FL_RELEASE_VERSION=
FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}
......@@ -9208,7 +9208,7 @@ echo "${ECHO_T}yes" >&6
# Show all standard warnings + unused variables, conversion errors,
# and inlining problems when compiling...
OPTIM="-Wall -Wunused -Wconversion -Winline $OPTIM"
OPTIM="-Wall -Wunused -Wconversion $OPTIM"
# The following additional warnings are useful for tracking down problems...
#OPTIM="-Wshadow $OPTIM"
......
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.118 2004/09/24 20:08:29 easysw Exp $"
dnl "$Id: configure.in,v 1.33.2.31.2.120 2004/10/18 21:05:27 easysw Exp $"
dnl
dnl Configuration script for the Fast Light Tool Kit (FLTK).
dnl
......@@ -35,7 +35,7 @@ dnl FLTK library versions...
FL_MAJOR_VERSION=1
FL_MINOR_VERSION=1
FL_PATCH_VERSION=5
FL_RELEASE_VERSION=rc3
FL_RELEASE_VERSION=
FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}
AC_SUBST(FL_MAJOR_VERSION)
......@@ -730,7 +730,7 @@ if test -n "$GCC"; then
# Show all standard warnings + unused variables, conversion errors,
# and inlining problems when compiling...
OPTIM="-Wall -Wunused -Wconversion -Winline $OPTIM"
OPTIM="-Wall -Wunused -Wconversion $OPTIM"
# The following additional warnings are useful for tracking down problems...
#OPTIM="-Wshadow $OPTIM"
......@@ -911,5 +911,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.118 2004/09/24 20:08:29 easysw Exp $".
dnl End of "$Id: configure.in,v 1.33.2.31.2.120 2004/10/18 21:05:27 easysw Exp $".
dnl
......@@ -36,10 +36,12 @@ does not exist for every visual.
<LI><A href=#Fl_Double_Window.~Fl_Double_Window>~Fl_Double_Window</A></LI>
</UL>
<H4><A name=Fl_Double_Window.Fl_Double_Window>
Fl_Double_Window::Fl_Double_Window(int w, int h, const
char *label = 0)<br>
Fl_Double_Window::Fl_Double_Window(int x, int y, int w, int h, const
char *label = 0)</A></H4>
Creates a new <TT>Fl_Double_Window</TT> widget using the given
position, size, and label (title) string.
<p>Creates a new <TT>Fl_Double_Window</TT> widget using the given
position, size, and label (title) string.</p>
<H4><A name=Fl_Double_Window.~Fl_Double_Window>virtual
Fl_Double_Window::~Fl_Double_Window()</A></H4>
The destructor <I>also deletes all the children</I>. This allows a
......
......@@ -79,25 +79,33 @@ Fl::modal()</TT></A> is zero or equal to the window. <TT>Fl_Window</TT>
</TD></TR>
</TABLE>
</CENTER>
<H4><A name=Fl_Window.Fl_Window>Fl_Window::Fl_Window(int w, int h, const char *title = 0)</A></H4>
<H4><A name=Fl_Window.Fl_Window>Fl_Window::Fl_Window(int w, int h, const char *title = 0)<br>
Fl_Window::Fl_Window(int x, int y, int w, int h, const char *title = 0)</A></H4>
The first form of the constructor should be used for a "top-level" window
(that is, one that is not inside another window). It correctly sets
<tt>visible()</tt> to false and <tt>parent()</tt> to <tt>NULL</tt>.
By not specifying the position of the window, the window system will pick a
place to show the window or allow the user to pick a location. If you want to
force a position you should call <tt>position(x,y)</tt> or <tt>hotspot()</tt>
before calling <tt>show()</tt>.
<p>Creates a new window. If <a
href='Fl_Group.html#Fl_Group.current'><tt>Fl_Group::current()</tt></a>
is not <tt>NULL</tt>, the window is created as a subwindow of
the parent window.</p>
<P><TT>Fl_Widget::box()</TT> is set to <TT>FL_FLAT_BOX</TT>. If you
plan to completely fill the window with children widgets you should
change this to <TT>FL_NO_BOX</TT>. If you turn the window border off
you may want to change this to <TT>FL_UP_BOX</TT>. </P>
<p>The first form of the constructor creates a top-level window
and tells the window manager to position the window. The second
form of the constructor either creates a subwindow or a
top-level window at the specified location, subject to window
manager configuration. If you do not specify the position of the
window, the window manager will pick a place to show the window
or allow the user to pick a location. Use <tt>position(x,y)</tt>
or <tt>hotspot()</tt> before calling <tt>show()</tt> to force a
position on the screen.</p>
<h4>Fl_Window::Fl_Window(int x, int y, int w, int h, const char *title = 0)</H4>
<p>Top-level windows initially have <tt>visible()</tt> set to 0
and <tt>parent()</tt> set to <tt>NULL</tt>. Subwindows initially
have <tt>visible()</tt> set to 1 and <tt>parent()</tt> set to
the parent window pointer.</p>
<P>The second form of the constructor is for creating child windows. It
leaves <tt>visible()</tt> set to true.
<P><TT>Fl_Widget::box()</TT> defaults to <TT>FL_FLAT_BOX</TT>. If you
plan to completely fill the window with children widgets you should
change this to <TT>FL_NO_BOX</TT>. If you turn the window border off
you may want to change this to <TT>FL_UP_BOX</TT>.</P>
<H4><A name=Fl_Window.~Fl_Window>virtual Fl_Window::~Fl_Window()</A></H4>
The destructor <I>also deletes all the children</I>. This allows a
......
#
# "$Id: Makefile,v 1.9.2.10.2.22 2004/04/11 04:38:55 easysw Exp $"
# "$Id: Makefile,v 1.9.2.10.2.23 2004/10/18 20:22:22 easysw Exp $"
#
# Documentation makefile for the Fast Light Tool Kit (FLTK).
#
......@@ -225,35 +225,37 @@ depend:
docdir = $(datadir)/doc/fltk
install: $(MANPAGES)
echo "Installing documentation files in $(docdir)..."
-$(MKDIR) $(docdir)
$(CP) $(HTMLFILES) *.gif *.jpg index.html $(docdir)
$(CHMOD) 644 $(docdir)/*
echo "Installing man pages in $(mandir)..."
-$(MKDIR) $(mandir)/cat1
$(CP) fluid.$(CAT1EXT) $(mandir)/cat1
$(CHMOD) 644 $(mandir)/cat1/fluid.$(CAT1EXT)
$(CP) fltk-config.$(CAT1EXT) $(mandir)/cat1
$(CHMOD) 644 $(mandir)/cat1/fltk-config.$(CAT1EXT)
-$(MKDIR) $(mandir)/cat3
$(CP) fltk.$(CAT3EXT) $(mandir)/cat3
$(CHMOD) 644 $(mandir)/cat3/fltk.$(CAT3EXT)
-$(MKDIR) $(mandir)/man1
$(CP) fluid.man $(mandir)/man1/fluid.1
$(CHMOD) 644 $(mandir)/man1/fluid.1
$(CP) fltk-config.man $(mandir)/man1/fltk-config.1
$(CHMOD) 644 $(mandir)/man1/fltk-config.1
-$(MKDIR) $(mandir)/man3
$(CP) fltk.man $(mandir)/man3/fltk.3
$(CHMOD) 644 $(mandir)/man3/fltk.3
echo "Installing documentation files in $(DESTDIR)$(docdir)..."
-$(MKDIR) $(DESTDIR)$(docdir)
$(CP) $(HTMLFILES) *.gif *.jpg index.html $(DESTDIR)$(docdir)
$(CHMOD) 644 $(DESTDIR)$(docdir)/*
echo "Installing man pages in $(DESTDIR)$(mandir)..."
-$(MKDIR) $(DESTDIR)$(mandir)/cat1
$(CP) fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
$(CHMOD) 644 $(DESTDIR)$(mandir)/cat1/fluid.$(CAT1EXT)
$(CP) fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
$(CHMOD) 644 $(DESTDIR)$(mandir)/cat1/fltk-config.$(CAT1EXT)
-$(MKDIR) $(DESTDIR)$(mandir)/cat3
$(CP) fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3
$(CHMOD) 644 $(DESTDIR)$(mandir)/cat3/fltk.$(CAT3EXT)
-$(MKDIR) $(DESTDIR)$(mandir)/man1
$(CP) fluid.man $(DESTDIR)$(mandir)/man1/fluid.1
$(CHMOD) 644 $(DESTDIR)$(mandir)/man1/fluid.1
$(CP) fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1
$(CHMOD) 644 $(DESTDIR)$(mandir)/man1/fltk-config.1
-$(MKDIR) $(DESTDIR)$(mandir)/man3
$(CP) fltk.man $(DESTDIR)$(mandir)/man3/fltk.3
$(CHMOD) 644 $(DESTDIR)$(mandir)/man3/fltk.3
uninstall:
$(RMDIR) $(docdir)
$(RM) $(mandir)/cat1/fluid.$(CAT1EXT)
$(RM) $(mandir)/man1/fluid.1
$(RM) $(mandir)/cat3/fltk.$(CAT3EXT)
$(RM) $(mandir)/man3/fltk.3
$(RMDIR) $(DESTDIR)$(docdir)
$(RM) $(DESTDIR)$(mandir)/cat1/fluid.$(CAT1EXT)
$(RM) $(DESTDIR)$(mandir)/man1/fluid.1
$(RM) $(DESTDIR)$(mandir)/cat1/fltk-config.$(CAT1EXT)
$(RM) $(DESTDIR)$(mandir)/man1/fltk-config.1
$(RM) $(DESTDIR)$(mandir)/cat3/fltk.$(CAT3EXT)
$(RM) $(DESTDIR)$(mandir)/man3/fltk.3
# Base html files are now the readable ones, so this target is not make by
......@@ -275,5 +277,5 @@ fltk.pdf: $(HTMLFILES) $(IMAGEFILES)
-$(HTMLDOC) --verbose --batch fltk.book $(MEDIA) -f fltk.pdf
#
# End of "$Id: Makefile,v 1.9.2.10.2.22 2004/04/11 04:38:55 easysw Exp $".
# End of "$Id: Makefile,v 1.9.2.10.2.23 2004/10/18 20:22:22 easysw Exp $".
#
......@@ -346,7 +346,7 @@ with your application use:
<UL><PRE>
#include &quot;icon.xbm&quot;
fl_opendisplay(); // needed if display has not been previously opened
fl_open_display(); // needed if display has not been previously opened
Pixmap p = XCreateBitmapFromData(fl_display, DefaultRootWindow(fl_display),
icon_bits, icon_width, icon_height);
......
#
# "$Id: fltk.spec,v 1.1.2.9.2.30 2004/09/24 20:08:29 easysw Exp $"
# "$Id: fltk.spec,v 1.1.2.9.2.31 2004/10/18 21:05:28 easysw Exp $"
#
# RPM spec file for FLTK.
#
......@@ -23,7 +23,7 @@
# Please report all bugs and problems to "fltk-bugs@fltk.org".
#
%define version 1.1.5rc3
%define version 1.1.5
%define release 0
%define prefix /usr
......@@ -96,5 +96,5 @@ rm -rf $RPM_BUILD_ROOT
%{prefix}/share/doc/fltk/*
#
# End of "$Id: fltk.spec,v 1.1.2.9.2.30 2004/09/24 20:08:29 easysw Exp $".
# End of "$Id: fltk.spec,v 1.1.2.9.2.31 2004/10/18 21:05:28 easysw Exp $".
#
SET(CPPFILES
Fl_Function_Type.cxx
Fl_Menu_Type.cxx
Fl_Group_Type.cxx
Fl_Widget_Type.cxx
Fl_Type.cxx
Fl_Window_Type.cxx
Fluid_Image.cxx
code.cxx
factory.cxx
file.cxx
fluid.cxx
align_widget.cxx
about_panel.cxx
widget_panel.cxx
alignment_panel.cxx
function_panel.cxx
)
ADD_EXECUTABLE(fluid ${CPPFILES})
TARGET_LINK_LIBRARIES(fluid fltk fltk_images fltk_forms ${FLTK_PLATFORM_DEPENDENT_LIBS})
IF(OPENGL_FOUND)
TARGET_LINK_LIBRARIES(fluid fltk_gl)
ENDIF(OPENGL_FOUND)
SET(CPPFILES
Fl_Function_Type.cxx
Fl_Menu_Type.cxx
Fl_Group_Type.cxx
Fl_Widget_Type.cxx
Fl_Type.cxx
Fl_Window_Type.cxx
Fluid_Image.cxx
code.cxx
factory.cxx
file.cxx
fluid.cxx
align_widget.cxx
about_panel.cxx
widget_panel.cxx
alignment_panel.cxx
function_panel.cxx
)
ADD_EXECUTABLE(fluid ${CPPFILES})
TARGET_LINK_LIBRARIES(fluid fltk fltk_images fltk_forms ${FLTK_PLATFORM_DEPENDENT_LIBS})
IF(OPENGL_FOUND)
TARGET_LINK_LIBRARIES(fluid fltk_gl)
ENDIF(OPENGL_FOUND)
#
# "$Id: Makefile,v 1.10.2.6.2.26 2004/04/11 04:38:56 easysw Exp $"
# "$Id: Makefile,v 1.10.2.6.2.27 2004/10/18 20:22:22 easysw Exp $"
#
# FLUID makefile for the Fast Light Tool Kit (FLTK).
#
......@@ -73,15 +73,15 @@ depend: $(CPPFILES)
include makedepend
install: all
echo "Installing FLUID in $(bindir)..."
-$(MKDIR) $(bindir)
$(CP) $(FLUID) $(bindir)/fluid$(EXEEXT)
$(STRIP) $(bindir)/fluid$(EXEEXT)
$(bindir)/fltk-config --post $(bindir)/fluid$(EXEEXT)
$(CHMOD) 755 $(bindir)/fluid$(EXEEXT)
echo "Installing FLUID in $(DESTDIR)$(bindir)..."
-$(MKDIR) $(DESTDIR)$(bindir)
$(CP) $(FLUID) $(DESTDIR)$(bindir)/fluid$(EXEEXT)
$(STRIP) $(DESTDIR)$(bindir)/fluid$(EXEEXT)
$(DESTDIR)$(bindir)/fltk-config --post $(DESTDIR)$(bindir)/fluid$(EXEEXT)
$(CHMOD) 755 $(DESTDIR)$(bindir)/fluid$(EXEEXT)
uninstall:
$(RM) $(bindir)/fluid
$(RM) $(DESTDIR)$(bindir)/fluid$(EXEEXT)
#
# Note: The rebuild target can only be used if you have the original .fl
......@@ -95,5 +95,5 @@ rebuild:
./fluid -c widget_panel.fl
#
# End of "$Id: Makefile,v 1.10.2.6.2.26 2004/04/11 04:38:56 easysw Exp $".
# End of "$Id: Makefile,v 1.10.2.6.2.27 2004/10/18 20:22:22 easysw Exp $".
#
PROJECT(FLTKJPEG)
INCLUDE_REGULAR_EXPRESSION("^(jchuff|jconfig|jdct|jdhuff|jerror|jinclude|jmemsys|jmorecfg|jpegint|jpeglib|jversion|jpeg).*$")
INCLUDE_DIRECTORIES(${FLTKJPEG_SOURCE_DIR})
INCLUDE_DIRECTORIES(${FLTKJPEG_BINARY_DIR})
# memmgr back ends: compile only one of these into a working library
# (For now, let's use the mode that requires the image fit into memory.
# This is the recommended mode for Win32 anyway.)
SET(systemdependent_SRCS jmemnobs.c)
# library object files common to compression and decompression
SET(common_SRCS
jcomapi.c jutils.c jerror.c jmemmgr.c
)
# compression library object files
SET(compression_SRCS
jcapimin.c jcapistd.c jctrans.c jcparam.c jdatadst.c jcinit.c
jcmaster.c jcmarker.c jcmainct.c jcprepct.c jccoefct.c jccolor.c
jcsample.c jchuff.c jcphuff.c jcdctmgr.c jfdctfst.c jfdctflt.c
jfdctint.c
)
# decompression library object files
SET(decompression_SRCS
jdapimin.c jdapistd.c jdtrans.c jdatasrc.c jdmaster.c
jdinput.c jdmarker.c jdhuff.c jdphuff.c jdmainct.c jdcoefct.c
jdpostct.c jddctmgr.c jidctfst.c jidctflt.c jidctint.c jidctred.c
jdsample.c jdcolor.c jquant1.c jquant2.c jdmerge.c
)
ADD_LIBRARY(fltk_jpeg ${systemdependent_SRCS} ${common_SRCS} ${compression_SRCS} ${decompression_SRCS})
PROJECT(FLTKJPEG)
INCLUDE_REGULAR_EXPRESSION("^(jchuff|jconfig|jdct|jdhuff|jerror|jinclude|jmemsys|jmorecfg|jpegint|jpeglib|jversion|jpeg).*$")
INCLUDE_DIRECTORIES(${FLTKJPEG_SOURCE_DIR})
INCLUDE_DIRECTORIES(${FLTKJPEG_BINARY_DIR})
# memmgr back ends: compile only one of these into a working library
# (For now, let's use the mode that requires the image fit into memory.
# This is the recommended mode for Win32 anyway.)
SET(systemdependent_SRCS jmemnobs.c)
# library object files common to compression and decompression
SET(common_SRCS
jcomapi.c jutils.c jerror.c jmemmgr.c
)
# compression library object files
SET(compression_SRCS
jcapimin.c jcapistd.c jctrans.c jcparam.c jdatadst.c jcinit.c
jcmaster.c jcmarker.c jcmainct.c jcprepct.c jccoefct.c jccolor.c
jcsample.c jchuff.c jcphuff.c jcdctmgr.c jfdctfst.c jfdctflt.c
jfdctint.c
)
# decompression library object files
SET(decompression_SRCS
jdapimin.c jdapistd.c jdtrans.c jdatasrc.c jdmaster.c
jdinput.c jdmarker.c jdhuff.c jdphuff.c jdmainct.c jdcoefct.c
jdpostct.c jddctmgr.c jidctfst.c jidctflt.c jidctint.c jidctred.c
jdsample.c jdcolor.c jquant1.c jquant2.c jdmerge.c
)
ADD_LIBRARY(fltk_jpeg ${systemdependent_SRCS} ${common_SRCS} ${compression_SRCS} ${decompression_SRCS})
#
# "$Id: Makefile.mingw,v 1.1.2.2 2001/01/22 15:13:39 easysw Exp $"
# "$Id: Makefile.mingw,v 1.1.2.2.2.1 2004/10/18 20:22:22 easysw Exp $"