From 9c7ec90412754b36441871b6869ba582b10bb51a Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Sun, 1 Jun 2003 00:23:57 +0000 Subject: [PATCH] Fix open-documents callback stuff. Add open documents callback to FLUID. Add FLUID application to fltk.list file for packaging. Add FLUID application icon and data files. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3020 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- fltk.list.in | 16 +++++++++-- fluid/fluid.cxx | 32 ++++++++++++++++++++-- fluid/fluid.icns | Bin 0 -> 44080 bytes fluid/fluid.info | 1 + fluid/fluid.plist | 68 ++++++++++++++++++++++++++++++++++++++++++++++ src/Fl_mac.cxx | 8 +++--- 6 files changed, 116 insertions(+), 9 deletions(-) create mode 100644 fluid/fluid.icns create mode 100644 fluid/fluid.info create mode 100644 fluid/fluid.plist diff --git a/fltk.list.in b/fltk.list.in index db1c2970f..5b564c8f3 100644 --- a/fltk.list.in +++ b/fltk.list.in @@ -1,5 +1,5 @@ # -# "$Id: fltk.list.in,v 1.1.2.9 2003/01/30 21:38:22 easysw Exp $" +# "$Id: fltk.list.in,v 1.1.2.10 2003/06/01 00:23:56 easysw Exp $" # # EPM product list file for the Fast Light Tool Kit (FLTK). # @@ -52,8 +52,18 @@ $GLLIBNAME=@GLLIBNAME@ $FLUID=@FLUID@ %system darwin -%postinstall $bindir/fltk-config -post $bindir/fluid f 0444 root sys $includedir/FL/mac.r FL/mac.r + +d 0555 root sys /Applications/fluid.app - +d 0555 root sys /Applications/fluid.app/Contents - +f 0444 root sys /Applications/fluid.app/Info.plist fluid/fluid.plist +f 0444 root sys /Applications/fluid.app/PkgInfo fluid/fluid.info +d 0555 root sys /Applications/fluid.app/Contents/MacOS - +l 0555 root sys /Applications/fluid.app/Contents/MacOS/fluid $bindir/fluid +d 0555 root sys /Applications/fluid.app/Contents/Resources - +f 0444 root sys /Applications/fluid.app/Contents/Resources/fluid.icns fluid/fluid.icns +%postinstall $bindir/fltk-config --post $bindir/fluid +%postremove /bin/rm -rf /Applications/fluid.app %system all # FLUID @@ -251,5 +261,5 @@ f 0444 root sys $datadir/doc/fltk/COPYING COPYING f 0444 root sys $datadir/doc/fltk/CHANGES CHANGES # -# End of "$Id: fltk.list.in,v 1.1.2.9 2003/01/30 21:38:22 easysw Exp $". +# End of "$Id: fltk.list.in,v 1.1.2.10 2003/06/01 00:23:56 easysw Exp $". # diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx index edf298092..2cc9096a3 100644 --- a/fluid/fluid.cxx +++ b/fluid/fluid.cxx @@ -1,5 +1,5 @@ // -// "$Id: fluid.cxx,v 1.15.2.13.2.37 2003/04/01 19:58:08 easysw Exp $" +// "$Id: fluid.cxx,v 1.15.2.13.2.38 2003/06/01 00:23:57 easysw Exp $" // // FLUID main entry for the Fast Light Tool Kit (FLTK). // @@ -178,6 +178,30 @@ void exit_cb(Fl_Widget *,void *) { exit(0); } +#ifdef __APPLE__ +# include + +void +apple_open_cb(const char *c) { + if (modflag && !fl_ask("Discard changes?")) return; + const char *oldfilename; + oldfilename = filename; + filename = NULL; + set_filename(c); + if (!read_file(c, 0)) { + fl_message("Can't read %s: %s", c, strerror(errno)); + free((void *)filename); + filename = oldfilename; + if (main_window) main_window->label(filename); + return; + } + + // Loaded a file; free the old filename... + modflag = 0; + if (oldfilename) free((void *)oldfilename); +} +#endif // __APPLE__ + void open_cb(Fl_Widget *, void *v) { if (!v && modflag && !fl_ask("Discard changes?")) return; const char *c; @@ -820,6 +844,10 @@ int main(int argc,char **argv) { make_main_window(); +#ifdef __APPLE__ + fl_open_callback(apple_open_cb); +#endif // __APPLE__ + if (c) set_filename(c); if (!compile_only) { Fl::visual((Fl_Mode)(FL_DOUBLE|FL_INDEX)); @@ -856,5 +884,5 @@ int main(int argc,char **argv) { } // -// End of "$Id: fluid.cxx,v 1.15.2.13.2.37 2003/04/01 19:58:08 easysw Exp $". +// End of "$Id: fluid.cxx,v 1.15.2.13.2.38 2003/06/01 00:23:57 easysw Exp $". // diff --git a/fluid/fluid.icns b/fluid/fluid.icns new file mode 100644 index 0000000000000000000000000000000000000000..361eaa56abc873cc374ebbb81c4446a16d341ea3 GIT binary patch literal 44080 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 + + + CFBundleInfoDictionaryVersion + 6.0 + + CFBundleExecutable + fluid + + CFBundleIdentifier + org.fltk.fluid + + CFBundleVersion + 1.1.4 + + CFBundleDevelopmentRegion + English + + NSHumanReadableCopyright + Copyright 1998-2003 by Bill Spitzak and others + + CFAppleHelpAnchor + help + + CFBundleName + FLUID + + CFBundlePackageType + APPL + + CFBundleSignature + FLID + + CFBundleIconFile + fluid.icns + + CFBundleShortVersionString + 1.1.4 + + CFBundleGetInfoString + 1.1.4, Copyright 1998-2003 by Bill Spitzak and others + + CFBundleDocumentTypes + + + CFBundleTypeExtensions + + fl + + + CFBundleTypeIconFile + fluid.icns + + CFBundleTypeName + FLUID Designer File + + CFBundleTypeOSTypes + + Flid + + + CFBundleTypeRole + Editor + + + + + diff --git a/src/Fl_mac.cxx b/src/Fl_mac.cxx index 779d20112..fe046222e 100644 --- a/src/Fl_mac.cxx +++ b/src/Fl_mac.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_mac.cxx,v 1.1.2.44 2003/05/30 07:03:09 easysw Exp $" +// "$Id: Fl_mac.cxx,v 1.1.2.45 2003/06/01 00:23:57 easysw Exp $" // // MacOS specific code for the Fast Light Tool Kit (FLTK). // @@ -1026,10 +1026,10 @@ static OSErr OpenAppleEventHandler(const AppleEvent *appleEvt, fl_lock_function(); // Open the documents via the callback... - if (AECountItems(theDocuments, &n) == noErr) { + if (AECountItems(&documents, &n) == noErr) { for (i = 1; i <= n; i ++) { // Get the next FSSpec record... - AEGetNthPtr(theDocuments, i, typeFSS, &keyWd, &typeCd, + AEGetNthPtr(&documents, i, typeFSS, &keyWd, &typeCd, (Ptr)&fileSpec, sizeof(fileSpec), (actSz = sizeof(fileSpec), &actSz)); @@ -1861,6 +1861,6 @@ void Fl::paste(Fl_Widget &receiver, int clipboard) { // -// End of "$Id: Fl_mac.cxx,v 1.1.2.44 2003/05/30 07:03:09 easysw Exp $". +// End of "$Id: Fl_mac.cxx,v 1.1.2.45 2003/06/01 00:23:57 easysw Exp $". //