[cairo-commit] cairo-java/src/java/org/freedesktop/cairo FontOptions.java, 1.1, 1.2 Context.java, 1.8, 1.9 Surface.java, 1.13, 1.14

[Jeffrey Morgan]

Committed by: kuzman

Update of /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo
In directory gabe:/tmp/cvs-serv23265/src/java/org/freedesktop/cairo

Modified Files:
	FontOptions.java Context.java Surface.java 
Log Message:
more upstream changes.

Index: FontOptions.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/FontOptions.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FontOptions.java	13 Aug 2005 22:11:21 -0000	1.1
+++ FontOptions.java	13 Aug 2005 22:35:13 -0000	1.2
@@ -9,6 +9,10 @@
         super(cairo_font_options_create());
     }
     
+    FontOptions(Handle handle) {
+        super(handle);
+    }
+    
     public void setAntialias(Antialias antialias) {
         cairo_font_options_set_antialias(getHandle(), antialias.getValue());
     }

Index: Context.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/Context.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Context.java	13 Aug 2005 22:11:21 -0000	1.8
+++ Context.java	13 Aug 2005 22:35:13 -0000	1.9
@@ -888,10 +888,6 @@
         return Status.intern(cairo_status(getHandle()));
     }
     
-    public String statusString() {
-        return cairo_status_string(getHandle());
-    }
-    
     public void setAntialias(Antialias antialias) {
         cairo_set_antialias(getHandle(), antialias.getValue());        
     }
@@ -900,6 +896,14 @@
         return Antialias.intern(cairo_get_antialias(getHandle()));
     }
     
+    public void setFontOptions(FontOptions fontOptions) {
+        cairo_set_font_options(getHandle(), fontOptions.getHandle());
+    }
+    
+    public FontOptions getFontOptions() {
+        return new FontOptions(cairo_get_font_options(getHandle()));
+    }
+    
     /** Constant use for drawing ellipse */
     private static final double SVG_ARC_MAGIC = 0.5522847498;
 
@@ -1013,9 +1017,10 @@
     native static final private void cairo_get_matrix(Handle obj, Handle matrix);
     native static final private Handle cairo_get_target(Handle obj);
     native static final private int cairo_status(Handle obj);
-    native static final private String cairo_status_string(Handle obj);
     native static final private void cairo_set_antialias(Handle obj, int antialias);
     native static final private int cairo_get_antialias(Handle obj);
+    native static final private void cairo_set_font_options(Handle obj, Handle fo);
+    native static final private Handle cairo_get_font_options(Handle obj);
 
 // TODO: add the following	
 //	cairo_path_t *

Index: Surface.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/Surface.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Surface.java	17 Jul 2005 20:50:46 -0000	1.13
+++ Surface.java	13 Aug 2005 22:35:13 -0000	1.14
@@ -35,7 +35,7 @@
     }
     
     public void finish() {
-    	int status = cairo_surface_finish(getHandle());
+    	cairo_surface_finish(getHandle());
     }
     
     public void setDeviceOffset(double xOffset, double yOffset) {
@@ -46,6 +46,22 @@
         cairo_surface_write_to_png(getHandle(), filename);
     }
     
+    public FontOptions getFontOptions() {
+        return new FontOptions(cairo_surface_get_font_options(getHandle()));
+    }
+    
+    public void flush() {
+        cairo_surface_flush(getHandle());
+    }
+    
+    public void markDirty() {
+        cairo_surface_mark_dirty(getHandle());
+    }
+    
+    public void markDirty(int x, int y, int width, int height) {
+        cairo_surface_mark_dirty_rectangle(getHandle(), x, y, width, height);
+    }
+    
     /*
      * Native calls
      */
@@ -61,5 +77,10 @@
 //					   cairo_write_func_t	write_func,
 //					   void			*closure);
     native static final private void cairo_surface_set_device_offset(Handle obj, double xOff, double yOff);
-
+    
+    native static final private Handle cairo_surface_get_font_options(Handle obj);
+    native static final private void cairo_surface_flush(Handle obj);
+    native static final private void cairo_surface_mark_dirty(Handle obj);
+    native static final private void cairo_surface_mark_dirty_rectangle(Handle obj, int x, int y, int width, int height);
+    
 }