Author: manolo
Date: 2012-02-21 06:05:24 -0800 (Tue, 21 Feb 2012)
New Revision: 9252
Log:
Transmitted cairo-related changes from 1.3


Modified:
   branches/branch-3.0/cairo/Fl_Cairo.cxx
   branches/branch-3.0/documentation/Doxyfile

Modified: branches/branch-3.0/cairo/Fl_Cairo.cxx
===================================================================
--- branches/branch-3.0/cairo/Fl_Cairo.cxx      2012-02-21 13:36:07 UTC (rev 
9251)
+++ branches/branch-3.0/cairo/Fl_Cairo.cxx      2012-02-21 14:05:24 UTC (rev 
9252)
@@ -118,10 +118,15 @@
 # warning FIXME get W,H for cairo_make_current(void*)
 #elif defined(__APPLE_QUARTZ__) 
     if (fl_window) {
+#if __LP64__
+      W = Fl_Window::current()->w();
+      H = Fl_Window::current()->h();
+#else
       Rect portRect; 
       GetPortBounds(GetWindowPort( Fl_X::i(Fl_Window::current())->window_ref() 
), &portRect);
       W = portRect.right-portRect.left;
       H = portRect.bottom-portRect.top;
+#endif
     } 
     else {
       W = CGBitmapContextGetHeight(fl_gc);

Modified: branches/branch-3.0/documentation/Doxyfile
===================================================================
--- branches/branch-3.0/documentation/Doxyfile  2012-02-21 13:36:07 UTC (rev 
9251)
+++ branches/branch-3.0/documentation/Doxyfile  2012-02-21 14:05:24 UTC (rev 
9252)
@@ -567,6 +567,7 @@
                          src/unicode.dox \
                          ../include \
                          ../src \
+                         ../cairo \
                          src/enumerations.dox \
                          src/glut.dox \
                          src/forms.dox \

_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit

Reply via email to