Change FSF Address

[~andy/gtk] / gdk / quartz / GdkQuartzView.c

diff --git a/gdk/quartz/GdkQuartzView.c b/gdk/quartz/GdkQuartzView.c
index 02018ff8d07592bed89c96756a7f3bd0470b6a28..d2f791c4f4c22a08f03be26042224cb21ef779ed 100644 (file)
--- a/gdk/quartz/GdkQuartzView.c
+++ b/gdk/quartz/GdkQuartzView.c
@@ -13,16 +13,13 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #import "GdkQuartzView.h"
-#include "gdkregion.h"
-#include "gdkregion-generic.h"
-#include "gdkwindow-quartz.h"
+#include "gdkquartzwindow.h"
 #include "gdkprivate-quartz.h"
+#include "gdkquartz.h"
 
 @implementation GdkQuartzView
 
@@ -62,24 +59,23 @@
   if (GDK_WINDOW_DESTROYED (gdk_window))
     return YES;
 
-  /* A view is opaque if its GdkWindow doesn't have the RGBA colormap */
-  return gdk_drawable_get_colormap (gdk_window) != gdk_screen_get_rgba_colormap (_gdk_screen);
+  /* A view is opaque if its GdkWindow doesn't have the RGBA visual */
+  return gdk_window_get_visual (gdk_window) != gdk_screen_get_rgba_visual (_gdk_screen);
 }
 
 -(void)drawRect:(NSRect)rect 
 {
   GdkRectangle gdk_rect;
-  GdkWindowObject *private = GDK_WINDOW_OBJECT (gdk_window);
-  GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (private->impl);
+  GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (gdk_window->impl);
   const NSRect *drawn_rects;
   NSInteger count;
   int i;
-  GdkRegion *region;
+  cairo_region_t *region;
 
   if (GDK_WINDOW_DESTROYED (gdk_window))
     return;
 
-  if (!(private->event_mask & GDK_EXPOSURE_MASK))
+  if (!(gdk_window->event_mask & GDK_EXPOSURE_MASK))
     return;
 
   if (NSEqualRects (rect, NSZeroRect))
@@ -88,12 +84,12 @@
   /* Clear our own bookkeeping of regions that need display */
   if (impl->needs_display_region)
     {
-      gdk_region_destroy (impl->needs_display_region);
+      cairo_region_destroy (impl->needs_display_region);
       impl->needs_display_region = NULL;
     }
 
   [self getRectsBeingDrawn:&drawn_rects count:&count];
-  region = gdk_region_new ();
+  region = cairo_region_create ();
   
   for (i = 0; i < count; i++)
     {
@@ -101,15 +97,15 @@
       gdk_rect.y = drawn_rects[i].origin.y;
       gdk_rect.width = drawn_rects[i].size.width;
       gdk_rect.height = drawn_rects[i].size.height;
-      
-      gdk_region_union_with_rect (region, &gdk_rect);
+
+      cairo_region_union_rectangle (region, &gdk_rect);
     }
 
   impl->in_paint_rect_count++;
   _gdk_window_process_updates_recurse (gdk_window, region);
   impl->in_paint_rect_count--;
 
-  gdk_region_destroy (region);
+  cairo_region_destroy (region);
 
   if (needsInvalidateShadow)
     {
@@ -128,8 +124,7 @@
  */
 -(void)updateTrackingRect
 {
-  GdkWindowObject *private = GDK_WINDOW_OBJECT (gdk_window);
-  GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (private->impl);
+  GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (gdk_window->impl);
   NSRect rect;
 
   if (!impl->toplevel)