mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure DIRECTORY is undef'd for BC++.

Browse Source 
Try to get rid of flickering in CubeView demo...


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2310 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 2002-06-13 19:36:01 +00:00
parent 91aa5847ba
commit 04f6fbbe03
4 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -1,5 +1,6 @@
CHANGES IN FLTK 1.1.0 CHANGES IN FLTK 1.1.0
- BC++ fixes.
- The pixmap_browser demo didn't check for a NULL image - The pixmap_browser demo didn't check for a NULL image
pointer. pointer.
- Fl_File_Icon::find() now uses fl_filename_isdir() - Fl_File_Icon::find() now uses fl_filename_isdir()

6
src/Fl_File_Browser.cxx
View File

@ -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. // Fl_File_Browser routines.
// //
@ -49,6 +49,8 @@
#elif defined(WIN32) #elif defined(WIN32)
# include <windows.h> # include <windows.h>
# include <direct.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 # ifdef DIRECTORY
# undef DIRECTORY # undef DIRECTORY
# endif // 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 $".
// //

9
src/Fl_File_Chooser2.cxx
View File

@ -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. // More Fl_File_Chooser routines.
// //
@ -59,6 +59,11 @@
#if defined(WIN32) && ! defined (__CYGWIN__) #if defined(WIN32) && ! defined (__CYGWIN__)
# include <direct.h> # include <direct.h>
# include <io.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 #else
# include <unistd.h> # include <unistd.h>
# include <pwd.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 $".
// //

13
test/CubeViewUI.fl
View File

@ -1,17 +1,14 @@
# data file for the Fltk User Interface Designer (fluid) # data file for the Fltk User Interface Designer (fluid)
version 1.0100 version 1.0100
header_name {.h} header_name {.h}
code_name {.cxx} code_name {.cxx}
gridx 2
gridy 2
snap 2
class CubeViewUI {open class CubeViewUI {open
} { } {
Function {CubeViewUI()} {open Function {CubeViewUI()} {open
} { } {
Fl_Window mainWindow { Fl_Window mainWindow {
label CubeView open 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 Fl_Group {} {open
xywh {5 3 374 399} xywh {5 3 374 399}
@ -56,8 +53,8 @@ cube->redraw();}
xywh {46 27 333 333} box DOWN_FRAME color 4 selection_color 69 xywh {46 27 333 333} box DOWN_FRAME color 4 selection_color 69
} }
Fl_Box cube { Fl_Box cube {
label {This is the cube_view} label {This is the cube_view} selected
xywh {48 29 329 329} xywh {48 29 329 329} align 16
code0 {\#include "CubeView.h"} code0 {\#include "CubeView.h"}
class CubeView 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);} {} code {mainWindow->show(argc, argv);} {}
} }