diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-12-12 21:33:34 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-12-12 21:33:34 +0000 |
| commit | cd9639c212846ba3597f1f10551d1c55b6c51312 (patch) | |
| tree | 606ad78a661d43d95e413cd751c1e4506051ed31 | |
| parent | a9103714031cedb16b00cd6ce81ef93b04734f08 (diff) | |
Update documentation screenshots (still have some to go...)
Cleanup some demos and the color chooser.
Restore code in Fl_Window::hotspot() to keep the window on the screen.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1837 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | CHANGES | 6 | ||||
| -rw-r--r-- | documentation/Fl_Check_Button.gif | bin | 352 -> 362 bytes | |||
| -rw-r--r-- | documentation/Fl_File_Chooser.gif | bin | 150 -> 0 bytes | |||
| -rw-r--r-- | documentation/Fl_Help_Dialog.gif | bin | 112 -> 8571 bytes | |||
| -rw-r--r-- | documentation/Fl_Light_Button.gif | bin | 462 -> 421 bytes | |||
| -rw-r--r-- | documentation/Fl_Return_Button.gif | bin | 497 -> 491 bytes | |||
| -rw-r--r-- | documentation/Fl_Roller.gif | bin | 1142 -> 1592 bytes | |||
| -rw-r--r-- | documentation/Fl_Round_Button.gif | bin | 378 -> 404 bytes | |||
| -rw-r--r-- | documentation/Fl_Scroll.gif | bin | 5112 -> 13051 bytes | |||
| -rw-r--r-- | documentation/Fl_Tile.gif | bin | 4423 -> 3837 bytes | |||
| -rw-r--r-- | documentation/Fl_Value_Input.gif | bin | 464 -> 651 bytes | |||
| -rw-r--r-- | documentation/Fl_Value_Output.gif | bin | 409 -> 640 bytes | |||
| -rw-r--r-- | documentation/adjuster1.gif | bin | 944 -> 1249 bytes | |||
| -rw-r--r-- | documentation/ask.C.gif | bin | 2778 -> 1152 bytes | |||
| -rw-r--r-- | documentation/boxtypes.gif | bin | 13347 -> 12196 bytes | |||
| -rw-r--r-- | documentation/button.C.gif | bin | 1725 -> 786 bytes | |||
| -rw-r--r-- | documentation/buttons.gif | bin | 4024 -> 2052 bytes | |||
| -rw-r--r-- | documentation/charts.gif | bin | 12873 -> 12312 bytes | |||
| -rw-r--r-- | documentation/choice.gif | bin | 3354 -> 2240 bytes | |||
| -rw-r--r-- | documentation/clock.gif | bin | 1556 -> 1779 bytes | |||
| -rw-r--r-- | documentation/counter.gif | bin | 1488 -> 1879 bytes | |||
| -rw-r--r-- | documentation/cubeview.gif | bin | 20106 -> 8289 bytes | |||
| -rw-r--r-- | documentation/dial.gif | bin | 1140 -> 1564 bytes | |||
| -rw-r--r-- | documentation/editor-replace.gif | bin | 4768 -> 1521 bytes | |||
| -rw-r--r-- | documentation/editor.gif | bin | 34310 -> 10187 bytes | |||
| -rw-r--r-- | documentation/filechooser.gif | bin | 18433 -> 9384 bytes | |||
| -rw-r--r-- | documentation/fl_alert.gif | bin | 1830 -> 1674 bytes | |||
| -rw-r--r-- | documentation/fl_ask.gif | bin | 1498 -> 1333 bytes | |||
| -rw-r--r-- | documentation/fl_choice.gif | bin | 1693 -> 1519 bytes | |||
| -rw-r--r-- | documentation/fl_color_chooser.jpg | bin | 12610 -> 7694 bytes | |||
| -rw-r--r-- | documentation/fl_input.gif | bin | 3719 -> 1935 bytes | |||
| -rw-r--r-- | documentation/fl_message.gif | bin | 1656 -> 1509 bytes | |||
| -rw-r--r-- | documentation/fl_password.gif | bin | 3562 -> 1607 bytes | |||
| -rw-r--r-- | documentation/fl_show_colormap.gif | bin | 17470 -> 17916 bytes | |||
| -rw-r--r-- | documentation/hello.C.gif | bin | 5584 -> 1686 bytes | |||
| -rw-r--r-- | documentation/menubar.gif | bin | 3798 -> 1273 bytes | |||
| -rw-r--r-- | documentation/scrollbar.gif | bin | 1041 -> 1201 bytes | |||
| -rw-r--r-- | documentation/slider.gif | bin | 3098 -> 3412 bytes | |||
| -rw-r--r-- | documentation/symbols.gif | bin | 6281 -> 5175 bytes | |||
| -rw-r--r-- | documentation/tabs.gif | bin | 2779 -> 2271 bytes | |||
| -rw-r--r-- | documentation/text.gif | bin | 2189 -> 1988 bytes | |||
| -rw-r--r-- | documentation/valuators.gif | bin | 37238 -> 19207 bytes | |||
| -rw-r--r-- | documentation/value_slider.gif | bin | 8401 -> 3733 bytes | |||
| -rw-r--r-- | src/Fl_Color_Chooser.cxx | 34 | ||||
| -rw-r--r-- | src/Fl_Window_hotspot.cxx | 48 | ||||
| -rw-r--r-- | test/Makefile | 92 | ||||
| -rw-r--r-- | test/editor.cxx | 8 | ||||
| -rw-r--r-- | test/message.cxx | 6 |
48 files changed, 102 insertions, 92 deletions
@@ -1,9 +1,11 @@ CHANGES IN FLTK 1.1.0b7 - - Mac OS X uses mostly Carbon event handling to support - Mousewheel, three buttons, all modifier keys, etc. - More documentation updates... - Mac OS X support works 95% + - The Fl_Window::hotspot() off-screen avoidance code was + commented out. + - Mac OS X uses mostly Carbon event handling to support + Mousewheel, three buttons, all modifier keys, etc. - Updated paragraph 4 of the FLTK license exceptions; there was some question about the requirement to show that a program uses FLTK, which is required by section diff --git a/documentation/Fl_Check_Button.gif b/documentation/Fl_Check_Button.gif Binary files differindex d29c34d1b..bbd6f4ee7 100644 --- a/documentation/Fl_Check_Button.gif +++ b/documentation/Fl_Check_Button.gif diff --git a/documentation/Fl_File_Chooser.gif b/documentation/Fl_File_Chooser.gif Binary files differdeleted file mode 100644 index 3f8990f79..000000000 --- a/documentation/Fl_File_Chooser.gif +++ /dev/null diff --git a/documentation/Fl_Help_Dialog.gif b/documentation/Fl_Help_Dialog.gif Binary files differindex 580e6a11a..92b0840c3 100644 --- a/documentation/Fl_Help_Dialog.gif +++ b/documentation/Fl_Help_Dialog.gif diff --git a/documentation/Fl_Light_Button.gif b/documentation/Fl_Light_Button.gif Binary files differindex 38d55ced1..0d380937e 100644 --- a/documentation/Fl_Light_Button.gif +++ b/documentation/Fl_Light_Button.gif diff --git a/documentation/Fl_Return_Button.gif b/documentation/Fl_Return_Button.gif Binary files differindex b9ee29dd7..349163ca7 100644 --- a/documentation/Fl_Return_Button.gif +++ b/documentation/Fl_Return_Button.gif diff --git a/documentation/Fl_Roller.gif b/documentation/Fl_Roller.gif Binary files differindex 9e53cff4a..48cd5b189 100644 --- a/documentation/Fl_Roller.gif +++ b/documentation/Fl_Roller.gif diff --git a/documentation/Fl_Round_Button.gif b/documentation/Fl_Round_Button.gif Binary files differindex 476f92965..3acb88876 100644 --- a/documentation/Fl_Round_Button.gif +++ b/documentation/Fl_Round_Button.gif diff --git a/documentation/Fl_Scroll.gif b/documentation/Fl_Scroll.gif Binary files differindex c1a959578..3055429a0 100644 --- a/documentation/Fl_Scroll.gif +++ b/documentation/Fl_Scroll.gif diff --git a/documentation/Fl_Tile.gif b/documentation/Fl_Tile.gif Binary files differindex e96744504..f14f0b49b 100644 --- a/documentation/Fl_Tile.gif +++ b/documentation/Fl_Tile.gif diff --git a/documentation/Fl_Value_Input.gif b/documentation/Fl_Value_Input.gif Binary files differindex bdc556502..feabbffc1 100644 --- a/documentation/Fl_Value_Input.gif +++ b/documentation/Fl_Value_Input.gif diff --git a/documentation/Fl_Value_Output.gif b/documentation/Fl_Value_Output.gif Binary files differindex 5e8c9e97f..18cf45a39 100644 --- a/documentation/Fl_Value_Output.gif +++ b/documentation/Fl_Value_Output.gif diff --git a/documentation/adjuster1.gif b/documentation/adjuster1.gif Binary files differindex 9425669cf..1f9f5353e 100644 --- a/documentation/adjuster1.gif +++ b/documentation/adjuster1.gif diff --git a/documentation/ask.C.gif b/documentation/ask.C.gif Binary files differindex d4ae1a40a..3bf91d518 100644 --- a/documentation/ask.C.gif +++ b/documentation/ask.C.gif diff --git a/documentation/boxtypes.gif b/documentation/boxtypes.gif Binary files differindex f0b549823..bf1b67fd3 100644 --- a/documentation/boxtypes.gif +++ b/documentation/boxtypes.gif diff --git a/documentation/button.C.gif b/documentation/button.C.gif Binary files differindex bbfda3eee..b3cf14539 100644 --- a/documentation/button.C.gif +++ b/documentation/button.C.gif diff --git a/documentation/buttons.gif b/documentation/buttons.gif Binary files differindex 4a9de2039..cadf9a3a5 100644 --- a/documentation/buttons.gif +++ b/documentation/buttons.gif diff --git a/documentation/charts.gif b/documentation/charts.gif Binary files differindex f204e14f4..c68e66ed5 100644 --- a/documentation/charts.gif +++ b/documentation/charts.gif diff --git a/documentation/choice.gif b/documentation/choice.gif Binary files differindex 83247dffd..c446830d9 100644 --- a/documentation/choice.gif +++ b/documentation/choice.gif diff --git a/documentation/clock.gif b/documentation/clock.gif Binary files differindex c3de9ae37..fd7295306 100644 --- a/documentation/clock.gif +++ b/documentation/clock.gif diff --git a/documentation/counter.gif b/documentation/counter.gif Binary files differindex 9784e467e..6e05a65e7 100644 --- a/documentation/counter.gif +++ b/documentation/counter.gif diff --git a/documentation/cubeview.gif b/documentation/cubeview.gif Binary files differindex 98f612d21..7dd3863f9 100644 --- a/documentation/cubeview.gif +++ b/documentation/cubeview.gif diff --git a/documentation/dial.gif b/documentation/dial.gif Binary files differindex 68b09c032..e52e18038 100644 --- a/documentation/dial.gif +++ b/documentation/dial.gif diff --git a/documentation/editor-replace.gif b/documentation/editor-replace.gif Binary files differindex 6098ead60..73c285664 100644 --- a/documentation/editor-replace.gif +++ b/documentation/editor-replace.gif diff --git a/documentation/editor.gif b/documentation/editor.gif Binary files differindex 88db4417b..8fce896f0 100644 --- a/documentation/editor.gif +++ b/documentation/editor.gif diff --git a/documentation/filechooser.gif b/documentation/filechooser.gif Binary files differindex 0145a5e80..974bef23e 100644 --- a/documentation/filechooser.gif +++ b/documentation/filechooser.gif diff --git a/documentation/fl_alert.gif b/documentation/fl_alert.gif Binary files differindex 66fa01b8b..be008e3ab 100644 --- a/documentation/fl_alert.gif +++ b/documentation/fl_alert.gif diff --git a/documentation/fl_ask.gif b/documentation/fl_ask.gif Binary files differindex 9b31af3b9..00a9fbbe0 100644 --- a/documentation/fl_ask.gif +++ b/documentation/fl_ask.gif diff --git a/documentation/fl_choice.gif b/documentation/fl_choice.gif Binary files differindex 3ce8c7d2e..940b22cf3 100644 --- a/documentation/fl_choice.gif +++ b/documentation/fl_choice.gif diff --git a/documentation/fl_color_chooser.jpg b/documentation/fl_color_chooser.jpg Binary files differindex ce59c156f..55dd82f07 100644 --- a/documentation/fl_color_chooser.jpg +++ b/documentation/fl_color_chooser.jpg diff --git a/documentation/fl_input.gif b/documentation/fl_input.gif Binary files differindex c999a8d0c..63dc51cec 100644 --- a/documentation/fl_input.gif +++ b/documentation/fl_input.gif diff --git a/documentation/fl_message.gif b/documentation/fl_message.gif Binary files differindex 2d6072668..778020638 100644 --- a/documentation/fl_message.gif +++ b/documentation/fl_message.gif diff --git a/documentation/fl_password.gif b/documentation/fl_password.gif Binary files differindex 6baccfb64..0523b574a 100644 --- a/documentation/fl_password.gif +++ b/documentation/fl_password.gif diff --git a/documentation/fl_show_colormap.gif b/documentation/fl_show_colormap.gif Binary files differindex 62f16bfcb..5c3b3518d 100644 --- a/documentation/fl_show_colormap.gif +++ b/documentation/fl_show_colormap.gif diff --git a/documentation/hello.C.gif b/documentation/hello.C.gif Binary files differindex 1a030cc36..559b69520 100644 --- a/documentation/hello.C.gif +++ b/documentation/hello.C.gif diff --git a/documentation/menubar.gif b/documentation/menubar.gif Binary files differindex 383598d0f..5c6c9442b 100644 --- a/documentation/menubar.gif +++ b/documentation/menubar.gif diff --git a/documentation/scrollbar.gif b/documentation/scrollbar.gif Binary files differindex 3b548a4d0..96d0358cf 100644 --- a/documentation/scrollbar.gif +++ b/documentation/scrollbar.gif diff --git a/documentation/slider.gif b/documentation/slider.gif Binary files differindex af3e09863..923e25784 100644 --- a/documentation/slider.gif +++ b/documentation/slider.gif diff --git a/documentation/symbols.gif b/documentation/symbols.gif Binary files differindex e36d24d19..54bda5b44 100644 --- a/documentation/symbols.gif +++ b/documentation/symbols.gif diff --git a/documentation/tabs.gif b/documentation/tabs.gif Binary files differindex c1f151644..c347cba15 100644 --- a/documentation/tabs.gif +++ b/documentation/tabs.gif diff --git a/documentation/text.gif b/documentation/text.gif Binary files differindex c96bcbf97..65a56da97 100644 --- a/documentation/text.gif +++ b/documentation/text.gif diff --git a/documentation/valuators.gif b/documentation/valuators.gif Binary files differindex 86bf2d3e1..a2de73801 100644 --- a/documentation/valuators.gif +++ b/documentation/valuators.gif diff --git a/documentation/value_slider.gif b/documentation/value_slider.gif Binary files differindex ab1c00197..13fec43ba 100644 --- a/documentation/value_slider.gif +++ b/documentation/value_slider.gif diff --git a/src/Fl_Color_Chooser.cxx b/src/Fl_Color_Chooser.cxx index 91076241e..e13643e83 100644 --- a/src/Fl_Color_Chooser.cxx +++ b/src/Fl_Color_Chooser.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Color_Chooser.cxx,v 1.7.2.4 2001/01/22 15:13:39 easysw Exp $" +// "$Id: Fl_Color_Chooser.cxx,v 1.7.2.4.2.1 2001/12/12 21:33:34 easysw Exp $" // // Color chooser for the Fast Light Tool Kit (FLTK). // @@ -40,7 +40,7 @@ // The "hue box" can be a circle or rectilinear. // You get a circle by defining this: -// #define CIRCLE 1 +#define CIRCLE 1 // And the "hue box" can auto-update when the value changes // you get this by defining this: #define UPDATE_HUE_BOX 1 @@ -320,14 +320,14 @@ void Fl_Color_Chooser::mode_cb(Fl_Widget* o, void*) { //////////////////////////////////////////////////////////////// Fl_Color_Chooser::Fl_Color_Chooser(int X, int Y, int W, int H, const char* L) - : Fl_Group(0,0,180,100,L), - huebox(0,0,100,100), - valuebox(100,0,20,100), - choice(120,0,60,20), - rvalue(120,20,60,23), - gvalue(120,43,60,23), - bvalue(120,66,60,23), - resize_box(0,89,100,9) + : Fl_Group(0,0,195,115,L), + huebox(0,0,115,115), + valuebox(115,0,20,115), + choice(140,0,55,25), + rvalue(140,30,55,25), + gvalue(140,60,55,25), + bvalue(140,90,55,25), + resize_box(0,0,115,115) { end(); resizable(resize_box); @@ -384,15 +384,15 @@ extern const char* fl_ok; extern const char* fl_cancel; int fl_color_chooser(const char* name, double& r, double& g, double& b) { - Fl_Window window(210,153,name); - Fl_Color_Chooser chooser(5, 5, 200, 95); - ColorChip ok_color(5, 105, 95, 23); - Fl_Return_Button ok_button(5, 128, 95, 23, fl_ok); - ColorChip cancel_color(110, 105, 95, 23); + Fl_Window window(215,200,name); + Fl_Color_Chooser chooser(10, 10, 195, 115); + ColorChip ok_color(10, 130, 95, 25); + Fl_Return_Button ok_button(10, 165, 95, 25, fl_ok); + ColorChip cancel_color(110, 130, 95, 25); cancel_color.r = uchar(255*r+.5); ok_color.r = cancel_color.r; ok_color.g = cancel_color.g = uchar(255*g+.5); ok_color.b = cancel_color.b = uchar(255*b+.5); - Fl_Button cancel_button(110, 128, 95, 23, fl_cancel); + Fl_Button cancel_button(110, 165, 95, 25, fl_cancel); window.resizable(chooser); chooser.rgb(r,g,b); chooser.callback(chooser_cb, &ok_color); @@ -431,5 +431,5 @@ int fl_color_chooser(const char* name, uchar& r, uchar& g, uchar& b) { } // -// End of "$Id: Fl_Color_Chooser.cxx,v 1.7.2.4 2001/01/22 15:13:39 easysw Exp $". +// End of "$Id: Fl_Color_Chooser.cxx,v 1.7.2.4.2.1 2001/12/12 21:33:34 easysw Exp $". // diff --git a/src/Fl_Window_hotspot.cxx b/src/Fl_Window_hotspot.cxx index 176985a86..ec0f580b7 100644 --- a/src/Fl_Window_hotspot.cxx +++ b/src/Fl_Window_hotspot.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Window_hotspot.cxx,v 1.7.2.3 2001/01/22 15:13:40 easysw Exp $" +// "$Id: Fl_Window_hotspot.cxx,v 1.7.2.3.2.1 2001/12/12 21:33:34 easysw Exp $" // // Common hotspot routines for the Fast Light Tool Kit (FLTK). // @@ -27,17 +27,21 @@ #include <FL/Fl_Window.H> #ifdef WIN32 -#include <FL/win32.H> +# include <FL/win32.H> #endif -void Fl_Window::hotspot(int X, int Y, int /*offscreen*/) { - int mx,my; Fl::get_mouse(mx,my); +void Fl_Window::hotspot(int X, int Y, int offscreen) { + int mx,my; + + // Update the screen position based on the mouse position. + Fl::get_mouse(mx,my); X = mx-X; Y = my-Y; -#if 0 - // Both the WIN32 and X versions do this to all windows all the time... + + // If offscreen is 0 (the default), make sure that the window + // stays on the screen, if possible. if (!offscreen) { #ifdef WIN32 - //These will be used by reference, so we must passed different variables + // These will be used by reference, so we must passed different variables int bt,bx,by; x(X);y(Y); Fl_X::fake_X_wm(this, X, Y, bt, bx, by); @@ -45,24 +49,25 @@ void Fl_Window::hotspot(int X, int Y, int /*offscreen*/) { if (X==x()) x(X-1); #else if (border()) { - // ensure border is on screen: + // Ensure border is on screen; these values are generic enough + // to work with many window managers, and are based on KDE defaults. const int top = 20; - const int left = 1; - const int right = 1; - const int bottom = 1; - if (X+w()+right > Fl::w()) X = Fl::w()-right-w(); - if (X-left < 0) X = left; - if (Y+h()+bottom > Fl::h()) Y = Fl::h()-bottom-h(); - if (Y-top < 0) Y = top; + const int left = 4; + const int right = 4; + const int bottom = 8; + if (X+w()+right > Fl::w()-Fl::x()) X = Fl::w()-Fl::x()-right-w(); + if (X-left < Fl::x()) X = left; + if (Y+h()+bottom > Fl::h()-Fl::y()) Y = Fl::h()-Fl::y()-bottom-h(); + if (Y-top < Fl::y()) Y = top; } // now insure contents are on-screen (more important than border): - if (X+w() > Fl::w()) X = Fl::w()-w(); - if (X < 0) X = 0; - if (Y+h() > Fl::h()) Y = Fl::h()-h(); - if (Y < 0) Y = 0; + if (X+w() > Fl::w()-Fl::x()) X = Fl::w()-Fl::x()-w(); + if (X < Fl::x()) X = Fl::x(); + if (Y+h() > Fl::h()-Fl::y()) Y = Fl::h()-Fl::y()-h(); + if (Y < Fl::y()) Y = Fl::y(); #endif } -#endif + position(X,Y); } @@ -76,6 +81,7 @@ void Fl_Window::hotspot(const Fl_Widget *o, int offscreen) { hotspot(X,Y,offscreen); } + // -// End of "$Id: Fl_Window_hotspot.cxx,v 1.7.2.3 2001/01/22 15:13:40 easysw Exp $". +// End of "$Id: Fl_Window_hotspot.cxx,v 1.7.2.3.2.1 2001/12/12 21:33:34 easysw Exp $". // diff --git a/test/Makefile b/test/Makefile index 12054e4a9..0d41ca152 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile,v 1.19.2.7.2.17 2001/12/08 16:23:51 easysw Exp $" +# "$Id: Makefile,v 1.19.2.7.2.18 2001/12/12 21:33:34 easysw Exp $" # # Test/example program makefile for the Fast Light Tool Kit (FLTK). # @@ -163,74 +163,76 @@ gldemos: $(GLALL) $(ALL): ../lib/$(LIBNAME) # Programs needing special instructions... -editor$(EXEEXT): editor.cxx - echo Compiling and linking $@... - $(CXX) -I.. $(CXXFLAGS) editor.cxx -o $@ $(LINKFLTK) $(LDLIBS) $(IMAGELIBS) +editor$(EXEEXT): editor.o + echo Linking $@... + $(CXX) -I.. $(CXXFLAGS) editor.o -o $@ $(LINKFLTK) $(LDLIBS) $(IMAGELIBS) $(POSTBUILD) -file_chooser$(EXEEXT): file_chooser.cxx - echo Compiling and linking $@... - $(CXX) -I.. $(CXXFLAGS) file_chooser.cxx -o $@ $(LINKFLTK) $(LDLIBS) $(IMAGELIBS) +file_chooser$(EXEEXT): file_chooser.o + echo Linking $@... + $(CXX) -I.. $(CXXFLAGS) file_chooser.o -o $@ $(LINKFLTK) $(LDLIBS) $(IMAGELIBS) $(POSTBUILD) -help$(EXEEXT): help.cxx - echo Compiling and linking $@... - $(CXX) -I.. $(CXXFLAGS) help.cxx -o $@ $(LINKFLTK) $(LDLIBS) $(IMAGELIBS) +help$(EXEEXT): help.o + echo Linking $@... + $(CXX) -I.. $(CXXFLAGS) help.o -o $@ $(LINKFLTK) $(LDLIBS) $(IMAGELIBS) $(POSTBUILD) -keyboard$(EXEEXT): keyboard.cxx keyboard_ui.cxx - echo Compiling and linking $@... - $(CXX) -I.. $(CXXFLAGS) keyboard.cxx $(LINKFLTK) $(LDLIBS) -o $@ +keyboard$(EXEEXT): keyboard.o + echo Linking $@... + $(CXX) -I.. $(CXXFLAGS) keyboard.o $(LINKFLTK) $(LDLIBS) -o $@ $(POSTBUILD) -mandelbrot$(EXEEXT): mandelbrot.cxx mandelbrot_ui.cxx - echo Compiling and linking $@... - $(CXX) -I.. $(CXXFLAGS) mandelbrot.cxx $(LINKFLTK) $(LDLIBS) -o $@ +keyboard.o: keyboard.cxx keyboard_ui.cxx + +mandelbrot$(EXEEXT): mandelbrot.o mandelbrot_ui.o + echo Linking $@... + $(CXX) -I.. $(CXXFLAGS) mandelbrot.o $(LINKFLTK) $(LDLIBS) -o $@ $(POSTBUILD) -pixmap_browser$(EXEEXT): pixmap_browser.cxx - echo Compiling and linking $@... - $(CXX) -I.. $(CXXFLAGS) pixmap_browser.cxx -o $@ $(LINKFLTK) $(LDLIBS) $(IMAGELIBS) +pixmap_browser$(EXEEXT): pixmap_browser.o + echo Linking $@... + $(CXX) -I.. $(CXXFLAGS) pixmap_browser.o -o $@ $(LINKFLTK) $(LDLIBS) $(IMAGELIBS) $(POSTBUILD) # OpenGL demos... CubeView$(EXEEXT): CubeMain.o CubeView.o CubeViewUI.o - echo Compiling and linking $@... + echo Linking $@... $(CXX) $(CXXFLAGS) CubeMain.o CubeView.o CubeViewUI.o \ $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@ $(POSTBUILD) CubeMain.o: CubeViewUI.h CubeView.h CubeView.o: CubeView.h -cube$(EXEEXT): cube.cxx - echo Compiling and linking $@... - $(CXX) -I.. $(CXXFLAGS) cube.cxx $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@ +cube$(EXEEXT): cube.o + echo Linking $@... + $(CXX) -I.. $(CXXFLAGS) cube.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@ $(POSTBUILD) -fractals$(EXEEXT): fractals.cxx - echo Compiling and linking $@... - $(CXX) -I.. $(CXXFLAGS) fractals.cxx $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@ +fractals$(EXEEXT): fractals.o + echo Linking $@... + $(CXX) -I.. $(CXXFLAGS) fractals.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@ $(POSTBUILD) -fullscreen$(EXEEXT): fullscreen.cxx - echo Compiling and linking $@... - $(CXX) -I.. $(CXXFLAGS) fullscreen.cxx $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@ +fullscreen$(EXEEXT): fullscreen.o + echo Linking $@... + $(CXX) -I.. $(CXXFLAGS) fullscreen.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@ $(POSTBUILD) -glpuzzle$(EXEEXT): glpuzzle.cxx - echo Compiling and linking $@... - $(CXX) -I.. $(CXXFLAGS) glpuzzle.cxx $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@ +glpuzzle$(EXEEXT): glpuzzle.o + echo Linking $@... + $(CXX) -I.. $(CXXFLAGS) glpuzzle.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@ $(POSTBUILD) -gl_overlay$(EXEEXT): gl_overlay.cxx - echo Compiling and linking $@... - $(CXX) -I.. $(CXXFLAGS) gl_overlay.cxx $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@ +gl_overlay$(EXEEXT): gl_overlay.o + echo Linking $@... + $(CXX) -I.. $(CXXFLAGS) gl_overlay.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@ $(POSTBUILD) -shiny$(EXEEXT): shiny.cxx shiny_panel.cxx - echo Compiling and linking $@... - $(CXX) -I.. $(CXXFLAGS) shiny.cxx $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@ +shiny$(EXEEXT): shiny.o shiny_panel.o + echo Linking $@... + $(CXX) -I.. $(CXXFLAGS) shiny.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@ $(POSTBUILD) -shape$(EXEEXT): shape.cxx - echo Compiling and linking $@... - $(CXX) -I.. $(CXXFLAGS) shape.cxx $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@ +shape$(EXEEXT): shape.o + echo Linking $@... + $(CXX) -I.. $(CXXFLAGS) shape.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@ $(POSTBUILD) # If you have libjpeg installed, you might want to try this test program: -jpeg_image$(EXEEXT): jpeg_image.cxx - echo Compiling and linking $@... - $(CXX) -I.. $(CXXFLAGS) jpeg_image.cxx $(LINKFLTK) $(LDLIBS) -ljpeg -lXext -o $@ +jpeg_image$(EXEEXT): jpeg_image.o + echo Linking $@... + $(CXX) -I.. $(CXXFLAGS) jpeg_image.o $(LINKFLTK) $(LDLIBS) -ljpeg -lXext -o $@ $(POSTBUILD) depend: @@ -247,5 +249,5 @@ uninstall: @echo Nothing to uninstall in test directory. # -# End of "$Id: Makefile,v 1.19.2.7.2.17 2001/12/08 16:23:51 easysw Exp $". +# End of "$Id: Makefile,v 1.19.2.7.2.18 2001/12/12 21:33:34 easysw Exp $". # diff --git a/test/editor.cxx b/test/editor.cxx index 8aa2129dd..31a732653 100644 --- a/test/editor.cxx +++ b/test/editor.cxx @@ -1,5 +1,5 @@ // -// "$Id: editor.cxx,v 1.2.2.3.2.5 2001/12/09 12:52:13 easysw Exp $" +// "$Id: editor.cxx,v 1.2.2.3.2.6 2001/12/12 21:33:34 easysw Exp $" // // A simple text editor program for the Fast Light Tool Kit (FLTK). // @@ -78,10 +78,10 @@ class EditorWindow : public Fl_Double_Window { EditorWindow::EditorWindow(int w, int h, const char* t) : Fl_Double_Window(w, h, t) { replace_dlg = new Fl_Window(300, 105, "Replace"); - replace_find = new Fl_Input(70, 10, 210, 25, "Find:"); + replace_find = new Fl_Input(80, 10, 210, 25, "Find:"); replace_find->align(FL_ALIGN_LEFT); - replace_with = new Fl_Input(70, 40, 210, 25, "Replace:"); + replace_with = new Fl_Input(80, 40, 210, 25, "Replace:"); replace_with->align(FL_ALIGN_LEFT); replace_all = new Fl_Button(10, 70, 90, 25, "Replace All"); @@ -419,5 +419,5 @@ int main(int argc, char **argv) { } // -// End of "$Id: editor.cxx,v 1.2.2.3.2.5 2001/12/09 12:52:13 easysw Exp $". +// End of "$Id: editor.cxx,v 1.2.2.3.2.6 2001/12/12 21:33:34 easysw Exp $". // diff --git a/test/message.cxx b/test/message.cxx index 0dfe90512..9c476dcf4 100644 --- a/test/message.cxx +++ b/test/message.cxx @@ -1,5 +1,5 @@ // -// "$Id: message.cxx,v 1.5.2.3 2001/01/22 15:13:41 easysw Exp $" +// "$Id: message.cxx,v 1.5.2.3.2.1 2001/12/12 21:33:34 easysw Exp $" // // Message test program for the Fast Light Tool Kit (FLTK). // @@ -33,7 +33,7 @@ int main(int, char **) { fl_message("Spelling check sucessfull, %d errors found with %g%% confidence", 1002, 100*(15/77.0)); - fl_alert("Quantum fluctuations in the space-time continuim detected, " + fl_alert("Quantum fluctuations in the space-time continuum detected, " "you have %g seconds to comply.", 10.0); printf("fl_ask returned %d\n", @@ -54,5 +54,5 @@ int main(int, char **) { } // -// End of "$Id: message.cxx,v 1.5.2.3 2001/01/22 15:13:41 easysw Exp $". +// End of "$Id: message.cxx,v 1.5.2.3.2.1 2001/12/12 21:33:34 easysw Exp $". // |
