Move Fl_Help_Dialog to fltk_images library.

Add "Additional Libraries" section to docos as needed. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2625 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
author: Michael R Sweet <michael.r.sweet@gmail.com> 2002-09-16 01:35:34 +0000
committer: Michael R Sweet <michael.r.sweet@gmail.com> 2002-09-16 01:35:34 +0000
commit: 11bf9b28da63ee26632b6cf72aeba16115daf9b3 (patch)
tree: c3cc21675e9bbc8ed7accdb098abda20d411d71f
parent: cf16564eda7815f230658a41bbe776f1b6f84879 (diff)
15 files changed, 87 insertions, 26 deletions
diff --git a/documentation/Fl_BMP_Image.html b/documentation/Fl_BMP_Image.html
index 7f920813e..06dffe26e 100644
--- a/documentation/Fl_BMP_Image.html
+++ b/documentation/Fl_BMP_Image.html
@@ -20,6 +20,12 @@
 #include &lt;FL/Fl_BMP_Image.H&gt;
 </PRE></UL>
 
+<H3>Additional Libraries</H3>
+
+<UL><PRE>
+-lfltk_images  /  fltkimages.lib
+</PRE></UL>
+
 <H3>Description</H3>
 
 <P>The <TT>Fl_BMP_Image</TT> class supports loading, caching,
diff --git a/documentation/Fl_GIF_Image.html b/documentation/Fl_GIF_Image.html
index 543bfcc30..f67911a12 100644
--- a/documentation/Fl_GIF_Image.html
+++ b/documentation/Fl_GIF_Image.html
@@ -20,6 +20,12 @@
 #include &lt;FL/Fl_GIF_Image.H&gt;
 </PRE></UL>
 
+<H3>Additional Libraries</H3>
+
+<UL><PRE>
+-lfltk_images  /  fltkimages.lib
+</PRE></UL>
+
 <H3>Description</H3>
 
 <P>The <TT>Fl_GIF_Image</TT> class supports loading, caching,
diff --git a/documentation/Fl_Gl_Window.html b/documentation/Fl_Gl_Window.html
index fd5957e57..84bddd7e0 100644
--- a/documentation/Fl_Gl_Window.html
+++ b/documentation/Fl_Gl_Window.html
@@ -1,21 +1,32 @@
-<HTML><BODY>
+<HTML>
+<BODY>
+
 <!-- NEW PAGE -->
+
 <H2><A name=Fl_Gl_Window>class Fl_Gl_Window</A></H2>
+
 <HR>
+
 <H3>Class Hierarchy</H3>
-<UL>
-<PRE>
+
+<UL><PRE>
 <A href=Fl_Window.html#Fl_Window>Fl_Window</A>
    |
    +----<B>Fl_Gl_Window</B>
-</PRE>
-</UL>
+</PRE></UL>
+
 <H3>Include Files</H3>
-<UL>
-<PRE>
+
+<UL><PRE>
 #include &lt;FL/Fl_Gl_Window.H&gt;
-</PRE>
-</UL>
+</PRE></UL>
+
+<H3>Additional Libraries</H3>
+
+<UL><PRE>
+-lfltk_gl  /  fltkgl.lib
+</PRE></UL>
+
 <H3>Description</H3>
  The <TT>Fl_Gl_Window</TT> widget sets things up so OpenGL works, and
 also keeps an OpenGL &quot;context&quot; for that window, so that changes to the
@@ -208,4 +219,5 @@ Fl_Gl_Window::valid()</TT> and set the same transformation.  If you
 don't your code may not work on other systems.  Depending on the OS,
 and on whether overlays are real or simulated, the OpenGL context may
 be the same or different between the overlay and main window. </P>
-</BODY></HTML>
+</BODY>
+</HTML>
diff --git a/documentation/Fl_Help_Dialog.html b/documentation/Fl_Help_Dialog.html
index e414019ab..26d07f783 100644
--- a/documentation/Fl_Help_Dialog.html
+++ b/documentation/Fl_Help_Dialog.html
@@ -20,6 +20,12 @@ Fl_Group
 #include "Fl_Help_Dialog.h"
 </PRE></UL>
 
+<H3>Additional Libraries</H3>
+
+<UL><PRE>
+-lfltk_images  /  fltkimages.lib
+</PRE></UL>
+
 <H3>Description</H3>
 
 <P>The <CODE>Fl_Help_Dialog</CODE> widget displays a standard help dialog window
diff --git a/documentation/Fl_JPEG_Image.html b/documentation/Fl_JPEG_Image.html
index 74c609b24..06b57f9e6 100644
--- a/documentation/Fl_JPEG_Image.html
+++ b/documentation/Fl_JPEG_Image.html
@@ -20,6 +20,12 @@
 #include &lt;FL/Fl_JPEG_Image.H&gt;
 </PRE></UL>
 
+<H3>Additional Libraries</H3>
+
+<UL><PRE>
+-lfltk_images  /  fltkimages.lib
+</PRE></UL>
+
 <H3>Description</H3>
 
 <P>The <TT>Fl_JPEG_Image</TT> class supports loading, caching,
diff --git a/documentation/Fl_PNG_Image.html b/documentation/Fl_PNG_Image.html
index a87ac5455..164863486 100644
--- a/documentation/Fl_PNG_Image.html
+++ b/documentation/Fl_PNG_Image.html
@@ -20,6 +20,12 @@
 #include &lt;FL/Fl_PNG_Image.H&gt;
 </PRE></UL>
 
+<H3>Additional Libraries</H3>
+
+<UL><PRE>
+-lfltk_images  /  fltkimages.lib
+</PRE></UL>
+
 <H3>Description</H3>
 
 <P>The <TT>Fl_PNG_Image</TT> class supports loading, caching,
diff --git a/documentation/Fl_PNM_Image.html b/documentation/Fl_PNM_Image.html
index 7b761c5f9..70f058bc6 100644
--- a/documentation/Fl_PNM_Image.html
+++ b/documentation/Fl_PNM_Image.html
@@ -20,6 +20,12 @@
 #include &lt;FL/Fl_PNM_Image.H&gt;
 </PRE></UL>
 
+<H3>Additional Libraries</H3>
+
+<UL><PRE>
+-lfltk_images  /  fltkimages.lib
+</PRE></UL>
+
 <H3>Description</H3>
 
 <P>The <TT>Fl_PNM_Image</TT> class supports loading, caching,
diff --git a/documentation/Fl_XBM_Image.html b/documentation/Fl_XBM_Image.html
index 38a88c28d..22180f8bf 100644
--- a/documentation/Fl_XBM_Image.html
+++ b/documentation/Fl_XBM_Image.html
@@ -20,6 +20,12 @@
 #include &lt;FL/Fl_XBM_Image.H&gt;
 </PRE></UL>
 
+<H3>Additional Libraries</H3>
+
+<UL><PRE>
+-lfltk_images  /  fltkimages.lib
+</PRE></UL>
+
 <H3>Description</H3>
 
 <P>The <TT>Fl_XBM_Image</TT> class supports loading, caching,
diff --git a/documentation/Fl_XPM_Image.html b/documentation/Fl_XPM_Image.html
index 821751937..e53dfaded 100644
--- a/documentation/Fl_XPM_Image.html
+++ b/documentation/Fl_XPM_Image.html
@@ -20,6 +20,12 @@
 #include &lt;FL/Fl_XPM_Image.H&gt;
 </PRE></UL>
 
+<H3>Additional Libraries</H3>
+
+<UL><PRE>
+-lfltk_images  /  fltkimages.lib
+</PRE></UL>
+
 <H3>Description</H3>
 
 <P>The <TT>Fl_XPM_Image</TT> class supports loading, caching,
diff --git a/src/Fl_Help_Dialog.cxx b/src/Fl_Help_Dialog.cxx
index b2e9844c2..0a4f06620 100644
--- a/src/Fl_Help_Dialog.cxx
+++ b/src/Fl_Help_Dialog.cxx
@@ -152,6 +152,8 @@ forward_->deactivate();
 
 index_ = -1;
 max_  = 0;
+
+fl_register_images();
 }
 
 Fl_Help_Dialog::~Fl_Help_Dialog() {
diff --git a/src/Fl_Help_Dialog.fl b/src/Fl_Help_Dialog.fl
index e948ed08e..c5ddabd98 100644
--- a/src/Fl_Help_Dialog.fl
+++ b/src/Fl_Help_Dialog.fl
@@ -4,8 +4,7 @@ header_name {../FL/Fl_Help_Dialog.H}
 code_name {.cxx}
 decl {\#include "flstring.h"} {} 
 
-decl {\#include <FL/fl_ask.H>} {selected
-} 
+decl {\#include <FL/fl_ask.H>} {} 
 
 class Fl_Help_Dialog {open
 } {
@@ -55,8 +54,8 @@ else if (view_->filename())
       } {}
       Fl_Button {} {
         label Close
-        callback {window_->hide();}
-        xywh {425 350 95 25}
+        callback {window_->hide();} selected
+        private xywh {425 350 95 25}
         code0 {o->label(fl_close);}
       }
       Fl_Button back_ {
@@ -116,7 +115,9 @@ smaller_->activate();}
 forward_->deactivate();
 
 index_ = -1;
-max_  = 0;} {}
+max_  = 0;
+
+fl_register_images();} {}
   }
   Function {~Fl_Help_Dialog()} {} {
     code {delete window_;} {}
diff --git a/src/Makefile b/src/Makefile
index 419cd6680..dcb6f4bc4 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.18.2.14.2.47 2002/08/09 01:09:49 easysw Exp $"
+# "$Id: Makefile,v 1.18.2.14.2.48 2002/09/16 01:35:34 easysw Exp $"
 #
 # Library makefile for the Fast Light Tool Kit (FLTK).
 #
@@ -47,7 +47,6 @@ CPPFILES = \
 	Fl_File_Icon.cxx \
 	Fl_File_Input.cxx \
 	Fl_Group.cxx \
-	Fl_Help_Dialog.cxx \
 	Fl_Help_View.cxx \
 	Fl_Image.cxx \
 	Fl_Input.cxx \
@@ -170,6 +169,7 @@ IMGCPPFILES = \
 	Fl_BMP_Image.cxx \
 	Fl_File_Icon2.cxx \
 	Fl_GIF_Image.cxx \
+	Fl_Help_Dialog.cxx \
 	Fl_JPEG_Image.cxx \
 	Fl_PNG_Image.cxx \
 	Fl_PNM_Image.cxx
@@ -565,5 +565,5 @@ uninstall:
 
 
 #
-# End of "$Id: Makefile,v 1.18.2.14.2.47 2002/08/09 01:09:49 easysw Exp $".
+# End of "$Id: Makefile,v 1.18.2.14.2.48 2002/09/16 01:35:34 easysw Exp $".
 #
diff --git a/test/help.cxx b/test/help.cxx
index 5dc6b4c22..ce58fea0d 100644
--- a/test/help.cxx
+++ b/test/help.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: help.cxx,v 1.1.2.7 2002/07/15 23:39:22 easysw Exp $"
+// "$Id: help.cxx,v 1.1.2.8 2002/09/16 01:35:34 easysw Exp $"
 //
 // Fl_Help_Dialog test program.
 //
@@ -45,8 +45,6 @@ main(int  argc,			// I - Number of command-line arguments
   Fl_Help_Dialog	*help;		// Help dialog
 
 
-  fl_register_images();
-
   help = new Fl_Help_Dialog;
 
   if (argc < 2)
@@ -65,5 +63,5 @@ main(int  argc,			// I - Number of command-line arguments
 
 
 //
-// End of "$Id: help.cxx,v 1.1.2.7 2002/07/15 23:39:22 easysw Exp $".
+// End of "$Id: help.cxx,v 1.1.2.8 2002/09/16 01:35:34 easysw Exp $".
 //
diff --git a/visualc/fltk.lib.dsp b/visualc/fltk.lib.dsp
index 4aa93433b..9cbbf1cc0 100644
--- a/visualc/fltk.lib.dsp
+++ b/visualc/fltk.lib.dsp
@@ -299,10 +299,6 @@ SOURCE=..\src\Fl_Group.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\Fl_Help_Dialog.cxx
-# End Source File
-# Begin Source File
-
 SOURCE=..\src\Fl_Help_View.cxx
 # End Source File
 # Begin Source File
diff --git a/visualc/fltkimages.dsp b/visualc/fltkimages.dsp
index e13a942d1..3df36a91f 100644
--- a/visualc/fltkimages.dsp
+++ b/visualc/fltkimages.dsp
@@ -95,6 +95,10 @@ SOURCE=..\src\Fl_GIF_Image.cxx
 # End Source File
 # Begin Source File
 
+SOURCE=..\src\Fl_Help_Dialog.cxx
+# End Source File
+# Begin Source File
+
 SOURCE=..\src\fl_images_core.cxx
 # End Source File
 # Begin Source File
author	Michael R Sweet <michael.r.sweet@gmail.com>	2002-09-16 01:35:34 +0000
committer	Michael R Sweet <michael.r.sweet@gmail.com>	2002-09-16 01:35:34 +0000
commit	11bf9b28da63ee26632b6cf72aeba16115daf9b3 (patch)
tree	c3cc21675e9bbc8ed7accdb098abda20d411d71f
parent	cf16564eda7815f230658a41bbe776f1b6f84879 (diff)