Implemeted 95% of all Mac OS X support. Makefiles still need modifications.

Almost all test applications run out of the box (->Makefile). See more
information in README.mac .

Changes:
- message handling
- access to opaque port structures
- image, bitmap, pixmap support
- most OpenGL stuff
- window styles


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1812 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher
2001-12-06 00:17:47 +00:00
parent 39109694e1
commit e07200c4e8
16 changed files with 281 additions and 151 deletions
+8 -3
View File
@@ -1,5 +1,5 @@
//
// "$Id: gl.h,v 1.6.2.4 2001/01/22 15:13:38 easysw Exp $"
// "$Id: gl.h,v 1.6.2.4.2.1 2001/12/06 00:17:47 matthiaswm Exp $"
//
// OpenGL header file for the Fast Light Tool Kit (FLTK).
//
@@ -44,7 +44,12 @@
# define APIENTRY
# endif
#endif
#include <GL/gl.h>
#ifdef __APPLE__
# include <OpenGL/gl.h>
#else
# include <GL/gl.h>
#endif
FL_EXPORT void gl_start();
FL_EXPORT void gl_finish();
@@ -76,5 +81,5 @@ FL_EXPORT void gl_draw_image(const uchar *, int x,int y,int w,int h, int d=3, in
#endif
//
// End of "$Id: gl.h,v 1.6.2.4 2001/01/22 15:13:38 easysw Exp $".
// End of "$Id: gl.h,v 1.6.2.4.2.1 2001/12/06 00:17:47 matthiaswm Exp $".
//
+3 -3
View File
@@ -1,5 +1,5 @@
//
// "$Id: mac.H,v 1.1.2.1 2001/11/27 17:44:06 easysw Exp $"
// "$Id: mac.H,v 1.1.2.2 2001/12/06 00:17:47 matthiaswm Exp $"
//
// Mac header file for the Fast Light Tool Kit (FLTK).
//
@@ -108,7 +108,7 @@ extern void fl_delete_offscreen(Fl_Offscreen gWorld);
extern void fl_begin_offscreen(Fl_Offscreen gWorld);
extern void fl_end_offscreen();
typedef GrafPtr Fl_Bitmask;
typedef GWorldPtr Fl_Bitmask; // Carbon requires a 1-bit GWorld instead of a BitMap
extern FL_EXPORT Fl_Bitmask fl_create_bitmask(int w, int h, const uchar *data);
extern FL_EXPORT void fl_delete_bitmask(Fl_Bitmask bm);
@@ -120,6 +120,6 @@ extern FL_EXPORT int fl_parse_color(const char* p, uchar& r, uchar& g, uchar& b)
#endif // !FL_MAC_H
//
// End of "$Id: mac.H,v 1.1.2.1 2001/11/27 17:44:06 easysw Exp $".
// End of "$Id: mac.H,v 1.1.2.2 2001/12/06 00:17:47 matthiaswm Exp $".
//
-13
View File
@@ -8,19 +8,6 @@ data 'MENU' (128, "Apple") {
$"2D00 0000 0000" /* -..... */
};
data 'cfrg' (0) {
$"0000 0000 0000 0000 0000 0001 0000 0000" /* ................ */
$"0000 0000 0000 0000 0000 0000 0000 0001" /* ................ */
$"7077 7063 0000 0000 0000 0000 0000 0000" /* pwpc............ */
$"0001 0000 0000 0101 0000 0000 0000 0000" /* ................ */
$"0000 0000 0000 0000 0034 0662 7574 746F" /* .........4.butto */
$"6E00 0000" /* n... */
};
data 'SIZE' (-1) {
$"58C0 0006 0000 0006 0000" /* XÀ........ */
};
data 'carb' (0) {
};