diff options
| author | Manolo Gouy <Manolo> | 2011-01-03 20:51:17 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2011-01-03 20:51:17 +0000 |
| commit | d4d4a24eff2fdba0a1a3744c31962f88ffca5db4 (patch) | |
| tree | 8886ff741907e712548e307bb29c81532190f277 /src | |
| parent | 523a2ed9b7792458da6ed7c26b4b70e4f90bb0b2 (diff) | |
Fixed warning in Fl_Gl_Choice.cxx
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8175 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Gl_Choice.cxx | 2 | ||||
| -rw-r--r-- | src/Fl_cocoa.mm | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/Fl_Gl_Choice.cxx b/src/Fl_Gl_Choice.cxx index df6267650..5343bf45c 100644 --- a/src/Fl_Gl_Choice.cxx +++ b/src/Fl_Gl_Choice.cxx @@ -296,6 +296,7 @@ GLContext fl_create_gl_context(Fl_Window* window, const Fl_Gl_Choice* g, int lay } # elif defined(__APPLE_QUARTZ__) +#if !(MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 && __LP64__) static CGrafPtr fl_GetWindowPort(WindowRef window) { typedef CGrafPtr (*wf)(WindowRef); @@ -303,6 +304,7 @@ static CGrafPtr fl_GetWindowPort(WindowRef window) if ( ! f) f = (wf)Fl_X::get_carbon_function("GetWindowPort"); return (*f)(window); } +#endif // warning: the Quartz version should probably use Core GL (CGL) instead of AGL GLContext fl_create_gl_context(Fl_Window* window, const Fl_Gl_Choice* g, int layer) { diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index 20a7250f8..7df208a97 100644 --- a/src/Fl_cocoa.mm +++ b/src/Fl_cocoa.mm @@ -864,7 +864,7 @@ static void calc_e_text(CFStringRef s, char *buffer, size_t len, unsigned sym) static int cocoaKeyboardHandler(NSEvent *theEvent); @interface FLTextView : NSTextView -// this subclass is needed under OS X 10.3 and 10.4 but not under 10.6 where the base class is enough +// this subclass is needed under OS X <= 10.4 but not under >= 10.5 where the base class is enough { } @end |