diff options
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | src/Fl_File_Browser.cxx | 6 | ||||
| -rw-r--r-- | src/Fl_File_Chooser2.cxx | 9 | ||||
| -rw-r--r-- | test/CubeViewUI.fl | 13 |
4 files changed, 17 insertions, 12 deletions
@@ -1,5 +1,6 @@ CHANGES IN FLTK 1.1.0 + - BC++ fixes. - The pixmap_browser demo didn't check for a NULL image pointer. - Fl_File_Icon::find() now uses fl_filename_isdir() diff --git a/src/Fl_File_Browser.cxx b/src/Fl_File_Browser.cxx index dbd800290..2c558fee4 100644 --- a/src/Fl_File_Browser.cxx +++ b/src/Fl_File_Browser.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_File_Browser.cxx,v 1.1.2.16 2002/05/16 12:47:43 easysw Exp $" +// "$Id: Fl_File_Browser.cxx,v 1.1.2.17 2002/06/13 19:35:59 easysw Exp $" // // Fl_File_Browser routines. // @@ -49,6 +49,8 @@ #elif defined(WIN32) # include <windows.h> # include <direct.h> +// Apparently Borland C++ defines DIRECTORY in <direct.h>, which +// interfers with the Fl_File_Icon enumeration of the same name. # ifdef DIRECTORY # undef DIRECTORY # endif // DIRECTORY @@ -637,5 +639,5 @@ Fl_File_Browser::filter(const char *pattern) // I - Pattern string // -// End of "$Id: Fl_File_Browser.cxx,v 1.1.2.16 2002/05/16 12:47:43 easysw Exp $". +// End of "$Id: Fl_File_Browser.cxx,v 1.1.2.17 2002/06/13 19:35:59 easysw Exp $". // diff --git a/src/Fl_File_Chooser2.cxx b/src/Fl_File_Chooser2.cxx index a94314fe5..cfeb9bdd3 100644 --- a/src/Fl_File_Chooser2.cxx +++ b/src/Fl_File_Chooser2.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_File_Chooser2.cxx,v 1.1.2.16 2002/06/13 18:18:33 easysw Exp $" +// "$Id: Fl_File_Chooser2.cxx,v 1.1.2.17 2002/06/13 19:36:00 easysw Exp $" // // More Fl_File_Chooser routines. // @@ -59,6 +59,11 @@ #if defined(WIN32) && ! defined (__CYGWIN__) # include <direct.h> # include <io.h> +// Apparently Borland C++ defines DIRECTORY in <direct.h>, which +// interfers with the Fl_File_Icon enumeration of the same name. +# ifdef DIRECTORY +# undef DIRECTORY +# endif // DIRECTORY #else # include <unistd.h> # include <pwd.h> @@ -1103,5 +1108,5 @@ unquote_pathname(char *dst, // O - Destination string // -// End of "$Id: Fl_File_Chooser2.cxx,v 1.1.2.16 2002/06/13 18:18:33 easysw Exp $". +// End of "$Id: Fl_File_Chooser2.cxx,v 1.1.2.17 2002/06/13 19:36:00 easysw Exp $". // diff --git a/test/CubeViewUI.fl b/test/CubeViewUI.fl index f31260e75..537be17fb 100644 --- a/test/CubeViewUI.fl +++ b/test/CubeViewUI.fl @@ -1,17 +1,14 @@ # data file for the Fltk User Interface Designer (fluid) version 1.0100 header_name {.h} -code_name {.cxx} -gridx 2 -gridy 2 -snap 2 +code_name {.cxx} class CubeViewUI {open } { Function {CubeViewUI()} {open } { Fl_Window mainWindow { label CubeView open - private xywh {428 124 419 406} box UP_BOX labelsize 12 resizable visible + private xywh {428 124 415 405} box UP_BOX labelsize 12 resizable visible } { Fl_Group {} {open xywh {5 3 374 399} @@ -56,8 +53,8 @@ cube->redraw();} xywh {46 27 333 333} box DOWN_FRAME color 4 selection_color 69 } Fl_Box cube { - label {This is the cube_view} - xywh {48 29 329 329} + label {This is the cube_view} selected + xywh {48 29 329 329} align 16 code0 {\#include "CubeView.h"} class CubeView } @@ -71,7 +68,7 @@ cube->redraw();} } } } - Function {show(int argc, char **argv)} {open selected + Function {show(int argc, char **argv)} {open } { code {mainWindow->show(argc, argv);} {} } |