summaryrefslogtreecommitdiff
path: root/src/gl_start.cxx
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2001-12-18 11:00:09 +0000
committerMatthias Melcher <fltk@matthiasm.com>2001-12-18 11:00:09 +0000
commitb6b4e1ec20e88533ce48fc081544477627648181 (patch)
tree9d4793b113cf0d25783d2fe2488cb965102874d1 /src/gl_start.cxx
parent6642c677cabe32f0d1d5712af9f5999e02c32d6e (diff)
- Mac: greatly improved OpenGL support, some window management,
soem little bugs, better source comments git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1872 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/gl_start.cxx')
-rw-r--r--src/gl_start.cxx13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/gl_start.cxx b/src/gl_start.cxx
index f57767bda..ba435baa1 100644
--- a/src/gl_start.cxx
+++ b/src/gl_start.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: gl_start.cxx,v 1.6.2.5.2.4 2001/12/09 12:52:13 easysw Exp $"
+// "$Id: gl_start.cxx,v 1.6.2.5.2.5 2001/12/18 11:00:09 matthiaswm Exp $"
//
// OpenGL context routines for the Fast Light Tool Kit (FLTK).
//
@@ -54,6 +54,10 @@ static int pw, ph;
static Fl_Gl_Choice* gl_choice;
#endif
+#ifdef __APPLE__
+static Fl_Gl_Choice* gl_choice;
+#endif
+
Fl_Region XRectangleRegion(int x, int y, int w, int h); // in fl_rect.cxx
void gl_start() {
@@ -62,7 +66,8 @@ void gl_start() {
if (!gl_choice) Fl::gl_visual(0);
context = fl_create_gl_context(Fl_Window::current(), gl_choice);
#elif defined(__APPLE__)
- //++
+ //++ Matt: We need to check the code and verify it with Apple Sample code. 'shiny' give some output...
+ context = fl_create_gl_context(Fl_Window::current(), gl_choice);
#else
context = fl_create_gl_context(fl_visual);
#endif
@@ -106,7 +111,7 @@ int Fl::gl_visual(int mode, int *alist) {
#ifdef WIN32
gl_choice = c;
#elif defined(__APPLE__)
- //++
+ gl_choice = c;
#else
fl_visual = c->vis;
fl_colormap = c->colormap;
@@ -117,5 +122,5 @@ int Fl::gl_visual(int mode, int *alist) {
#endif
//
-// End of "$Id: gl_start.cxx,v 1.6.2.5.2.4 2001/12/09 12:52:13 easysw Exp $".
+// End of "$Id: gl_start.cxx,v 1.6.2.5.2.5 2001/12/18 11:00:09 matthiaswm Exp $".
//