mirrors
/
fltk
mirror of https://github.com/fltk/fltk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix build problems on Windows. 

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2913 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 2003-01-15 19:41:58 +00:00
parent e695187237
commit 4fb89e2571
8 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
CodeWarrior/OS_X.sit
View File

Binary file not shown.

BIN
CodeWarrior/Win32/FLTK_Data/CWSettingsWindows.stg
View File

Binary file not shown.

8
FL/Fl_Bitmap.H
View File

@ -1,5 +1,5 @@
//
// "$Id: Fl_Bitmap.H,v 1.5.2.3.2.9 2003/01/10 19:29:07 easysw Exp $"
// "$Id: Fl_Bitmap.H,v 1.5.2.3.2.10 2003/01/15 19:41:58 easysw Exp $"
//
// Bitmap header file for the Fast Light Tool Kit (FLTK).
//
@ -35,11 +35,11 @@ class FL_EXPORT Fl_Bitmap : public Fl_Image {
const uchar *array;
int alloc_array; // Non-zero if data was allocated
#ifdef __APPLE__
#if defined(__APPLE__) || defined(WIN32)
void *id; // for internal use
#else
unsigned id; // for internal use
#endif // __APPLE__
#endif // __APPLE__ || WIN32
Fl_Bitmap(const uchar *bits, int W, int H) :
Fl_Image(W,H,0), array(bits), alloc_array(0), id(0) {data((const char **)&array, 1);}
@ -58,5 +58,5 @@ class FL_EXPORT Fl_Bitmap : public Fl_Image {
#endif
//
// End of "$Id: Fl_Bitmap.H,v 1.5.2.3.2.9 2003/01/10 19:29:07 easysw Exp $".
// End of "$Id: Fl_Bitmap.H,v 1.5.2.3.2.10 2003/01/15 19:41:58 easysw Exp $".
//

8
FL/Fl_Image.H
View File

@ -1,5 +1,5 @@
//
// "$Id: Fl_Image.H,v 1.5.2.3.2.19 2003/01/12 01:22:21 easysw Exp $"
// "$Id: Fl_Image.H,v 1.5.2.3.2.20 2003/01/15 19:41:58 easysw Exp $"
//
// Image header file for the Fast Light Tool Kit (FLTK).
//
@ -81,13 +81,13 @@ class FL_EXPORT Fl_RGB_Image : public Fl_Image {
const uchar *array;
int alloc_array; // Non-zero if array was allocated
#ifdef __APPLE__
#if defined(__APPLE__) || defined(WIN32)
void *id; // for internal use
void *mask; // for internal use (mask bitmap)
#else
unsigned id; // for internal use
unsigned mask; // for internal use (mask bitmap)
#endif //
#endif // __APPLE__ || WIN32
Fl_RGB_Image(const uchar *bits, int W, int H, int D=3, int LD=0) :
Fl_Image(W,H,D), array(bits), alloc_array(0), id(0), mask(0) {data((const char **)&array, 1); ld(LD);}
@ -106,5 +106,5 @@ class FL_EXPORT Fl_RGB_Image : public Fl_Image {
#endif // !Fl_Image_H
//
// End of "$Id: Fl_Image.H,v 1.5.2.3.2.19 2003/01/12 01:22:21 easysw Exp $".
// End of "$Id: Fl_Image.H,v 1.5.2.3.2.20 2003/01/15 19:41:58 easysw Exp $".
//

8
FL/Fl_Pixmap.H
View File

@ -1,5 +1,5 @@
//
// "$Id: Fl_Pixmap.H,v 1.6.2.8.2.10 2003/01/10 19:29:08 easysw Exp $"
// "$Id: Fl_Pixmap.H,v 1.6.2.8.2.11 2003/01/15 19:41:58 easysw Exp $"
//
// Pixmap header file for the Fast Light Tool Kit (FLTK).
//
@ -47,13 +47,13 @@ class FL_EXPORT Fl_Pixmap : public Fl_Image {
public:
int alloc_data; // Non-zero if data was allocated
#ifdef __APPLE__
#if defined(__APPLE__) || defined(WIN32)
void *id; // for internal use
void *mask; // for internal use (mask bitmap)
#else
unsigned id; // for internal use
unsigned mask; // for internal use (mask bitmap)
#endif // __APPLE__
#endif // __APPLE__ || WIN32
explicit Fl_Pixmap(char * const * D) : Fl_Image(-1,0,1), alloc_data(0), id(0), mask(0) {set_data((const char*const*)D); measure();}
explicit Fl_Pixmap(uchar* const * D) : Fl_Image(-1,0,1), alloc_data(0), id(0), mask(0) {set_data((const char*const*)D); measure();}
@ -74,5 +74,5 @@ class FL_EXPORT Fl_Pixmap : public Fl_Image {
#endif
//
// End of "$Id: Fl_Pixmap.H,v 1.6.2.8.2.10 2003/01/10 19:29:08 easysw Exp $".
// End of "$Id: Fl_Pixmap.H,v 1.6.2.8.2.11 2003/01/15 19:41:58 easysw Exp $".
//

6
src/Fl_Image.cxx
View File

@ -1,5 +1,5 @@
//
// "$Id: Fl_Image.cxx,v 1.5.2.3.2.27 2003/01/10 19:29:09 easysw Exp $"
// "$Id: Fl_Image.cxx,v 1.5.2.3.2.28 2003/01/15 19:41:58 easysw Exp $"
//
// Image drawing code for the Fast Light Tool Kit (FLTK).
//
@ -327,7 +327,7 @@ void Fl_RGB_Image::draw(int XP, int YP, int WP, int HP, int cx, int cy) {
BitBlt(fl_gc, X, Y, W, H, new_gc, cx, cy, SRCPAINT);
DeleteDC(new_gc);
} else {
fl_copy_offscreen(X, Y, W, H, id, cx, cy);
fl_copy_offscreen(X, Y, W, H, (Fl_Offscreen)id, cx, cy);
}
#elif defined(__APPLE__)
if (mask) {
@ -392,5 +392,5 @@ void Fl_RGB_Image::label(Fl_Menu_Item* m) {
//
// End of "$Id: Fl_Image.cxx,v 1.5.2.3.2.27 2003/01/10 19:29:09 easysw Exp $".
// End of "$Id: Fl_Image.cxx,v 1.5.2.3.2.28 2003/01/15 19:41:58 easysw Exp $".
//

6
src/Fl_Pixmap.cxx
View File

@ -1,5 +1,5 @@
//
// "$Id: Fl_Pixmap.cxx,v 1.9.2.4.2.25 2003/01/10 19:29:09 easysw Exp $"
// "$Id: Fl_Pixmap.cxx,v 1.9.2.4.2.26 2003/01/15 19:41:58 easysw Exp $"
//
// Pixmap drawing code for the Fast Light Tool Kit (FLTK).
//
@ -102,7 +102,7 @@ void Fl_Pixmap::draw(int XP, int YP, int WP, int HP, int cx, int cy) {
BitBlt(fl_gc, X, Y, W, H, new_gc, cx, cy, SRCPAINT);
DeleteDC(new_gc);
} else {
fl_copy_offscreen(X, Y, W, H, id, cx, cy);
fl_copy_offscreen(X, Y, W, H, (Fl_Offscreen)id, cx, cy);
}
#elif defined(__APPLE__)
if (mask) {
@ -461,5 +461,5 @@ void Fl_Pixmap::desaturate() {
}
//
// End of "$Id: Fl_Pixmap.cxx,v 1.9.2.4.2.25 2003/01/10 19:29:09 easysw Exp $".
// End of "$Id: Fl_Pixmap.cxx,v 1.9.2.4.2.26 2003/01/15 19:41:58 easysw Exp $".
//

5
src/fl_line_style.cxx
View File

@ -1,5 +1,5 @@
//
// "$Id: fl_line_style.cxx,v 1.3.2.3.2.11 2003/01/12 14:49:33 easysw Exp $"
// "$Id: fl_line_style.cxx,v 1.3.2.3.2.12 2003/01/15 19:41:58 easysw Exp $"
//
// Line style code for the Fast Light Tool Kit (FLTK).
//
@ -23,6 +23,7 @@
// Please report all bugs and problems to "fltk-bugs@fltk.org".
//
#include <FL/Fl.H>
#include <FL/fl_draw.H>
#include <FL/x.H>
#include "flstring.h"
@ -103,5 +104,5 @@ void fl_line_style(int style, int width, char* dashes) {
//
// End of "$Id: fl_line_style.cxx,v 1.3.2.3.2.11 2003/01/12 14:49:33 easysw Exp $".
// End of "$Id: fl_line_style.cxx,v 1.3.2.3.2.12 2003/01/15 19:41:58 easysw Exp $".
//