Added const modifier to FFI specs (required by recent STX)
authorJan Vrany <jan.vrany@fit.cvut.cz>
Sun, 21 Sep 2014 00:44:10 +0100
changeset 20 18a3e6b5f310
parent 18 fae6edf1bdbd
child 21 34bf952f3f60
Added const modifier to FFI specs (required by recent STX)
Cairo__FontFace.st
Cairo__FontOptions.st
Cairo__GraphicsContext.st
Cairo__Matrix.st
Cairo__Path.st
Cairo__Pattern.st
Cairo__RectangleList.st
Cairo__ScaledFont.st
Cairo__Surface.st
Make.proto
extensions.st
--- a/Cairo__FontFace.st	Wed Jun 20 06:37:21 2012 +0000
+++ b/Cairo__FontFace.st	Sun Sep 21 00:44:10 2014 +0100
@@ -72,7 +72,7 @@
 
 primDestroy: font_face 
 
-	<cdecl: void "cairo_font_face_destroy" ( Cairo::FontFace ) >
+	<cdecl: const void "cairo_font_face_destroy" ( Cairo::FontFace ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -80,7 +80,7 @@
 
 primFtFontFaceCreateForFtFace: face loadFlags: load_flags 
 
-	<cdecl: Cairo::FontFace "cairo_ft_font_face_create_for_ft_face" ( pointer int32 ) >
+	<cdecl: const Cairo::FontFace "cairo_ft_font_face_create_for_ft_face" ( pointer int32 ) >
 	self primitiveFailed
 
     "Created: / 10-07-2008 / 23:05:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -88,7 +88,7 @@
 
 primFtFontFaceCreateForPattern: pattern 
 
-	<cdecl: Cairo::FontFace "cairo_ft_font_face_create_for_pattern" ( pointer ) >
+	<cdecl: const Cairo::FontFace "cairo_ft_font_face_create_for_pattern" ( pointer ) >
 	self primitiveFailed
 
     "Created: / 10-07-2008 / 23:05:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -96,7 +96,7 @@
 
 primGetReferenceCount: font_face 
 
-	<cdecl: uint32 "cairo_font_face_get_reference_count" ( Cairo::FontFace ) >
+	<cdecl: const uint32 "cairo_font_face_get_reference_count" ( Cairo::FontFace ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -104,7 +104,7 @@
 
 primGetType: font_face 
 
-	<cdecl: int32 "cairo_font_face_get_type" ( Cairo::FontFace ) >
+	<cdecl: const int32 "cairo_font_face_get_type" ( Cairo::FontFace ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -112,7 +112,7 @@
 
 primGetUserData: font_face key: key 
 
-	<cdecl: pointer "cairo_font_face_get_user_data" ( Cairo::FontFace Cairo::UserDataKey ) >
+	<cdecl: const pointer "cairo_font_face_get_user_data" ( Cairo::FontFace Cairo::UserDataKey ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -120,7 +120,7 @@
 
 primReference: font_face 
 
-	<cdecl: Cairo::FontFace "cairo_font_face_reference" ( Cairo::FontFace ) >
+	<cdecl: const Cairo::FontFace "cairo_font_face_reference" ( Cairo::FontFace ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -128,7 +128,7 @@
 
 primSetUserData: font_face key: key userData: user_data destroy: destroy 
 
-	<cdecl: int32 "cairo_font_face_set_user_data" ( Cairo::FontFace Cairo::UserDataKey pointer pointer ) >
+	<cdecl: const int32 "cairo_font_face_set_user_data" ( Cairo::FontFace Cairo::UserDataKey pointer pointer ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -136,7 +136,7 @@
 
 primStatus: font_face 
 
-	<cdecl: int32 "cairo_font_face_status" ( Cairo::FontFace ) >
+	<cdecl: const int32 "cairo_font_face_status" ( Cairo::FontFace ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
--- a/Cairo__FontOptions.st	Wed Jun 20 06:37:21 2012 +0000
+++ b/Cairo__FontOptions.st	Sun Sep 21 00:44:10 2014 +0100
@@ -72,7 +72,7 @@
 
 primCopy: original 
 
-	<cdecl: Cairo::FontOptions "cairo_font_options_copy" ( Cairo::FontOptions ) >
+	<cdecl: const Cairo::FontOptions "cairo_font_options_copy" ( Cairo::FontOptions ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -80,7 +80,7 @@
 
 primDestroy: options 
 
-	<cdecl: void "cairo_font_options_destroy" ( Cairo::FontOptions ) >
+	<cdecl: const void "cairo_font_options_destroy" ( Cairo::FontOptions ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -88,7 +88,7 @@
 
 primEqual: options other: other 
 
-	<cdecl: int32 "cairo_font_options_equal" ( Cairo::FontOptions Cairo::FontOptions ) >
+	<cdecl: const int32 "cairo_font_options_equal" ( Cairo::FontOptions Cairo::FontOptions ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -96,7 +96,7 @@
 
 primFontOptionsCreate
 
-	<cdecl: Cairo::FontOptions "cairo_font_options_create" ( ) >
+	<cdecl: const Cairo::FontOptions "cairo_font_options_create" ( ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -104,7 +104,7 @@
 
 primFtFontOptionsSubstitute: options pattern: pattern 
 
-	<cdecl: void "cairo_ft_font_options_substitute" ( Cairo::FontOptions pointer ) >
+	<cdecl: const void "cairo_ft_font_options_substitute" ( Cairo::FontOptions pointer ) >
 	self primitiveFailed
 
     "Created: / 10-07-2008 / 23:05:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -112,7 +112,7 @@
 
 primGetAntialias: options 
 
-	<cdecl: int32 "cairo_font_options_get_antialias" ( Cairo::FontOptions ) >
+	<cdecl: const int32 "cairo_font_options_get_antialias" ( Cairo::FontOptions ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -120,7 +120,7 @@
 
 primGetHintMetrics: options 
 
-	<cdecl: int32 "cairo_font_options_get_hint_metrics" ( Cairo::FontOptions ) >
+	<cdecl: const int32 "cairo_font_options_get_hint_metrics" ( Cairo::FontOptions ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -128,7 +128,7 @@
 
 primGetHintStyle: options 
 
-	<cdecl: int32 "cairo_font_options_get_hint_style" ( Cairo::FontOptions ) >
+	<cdecl: const int32 "cairo_font_options_get_hint_style" ( Cairo::FontOptions ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -136,7 +136,7 @@
 
 primGetSubpixelOrder: options 
 
-	<cdecl: int32 "cairo_font_options_get_subpixel_order" ( Cairo::FontOptions ) >
+	<cdecl: const int32 "cairo_font_options_get_subpixel_order" ( Cairo::FontOptions ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -144,7 +144,7 @@
 
 primHash: options 
 
-	<cdecl: int32 "cairo_font_options_hash" ( Cairo::FontOptions ) >
+	<cdecl: const int32 "cairo_font_options_hash" ( Cairo::FontOptions ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -152,7 +152,7 @@
 
 primMerge: options other: other 
 
-	<cdecl: void "cairo_font_options_merge" ( Cairo::FontOptions Cairo::FontOptions ) >
+	<cdecl: const void "cairo_font_options_merge" ( Cairo::FontOptions Cairo::FontOptions ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -160,7 +160,7 @@
 
 primSetAntialias: options antialias: antialias 
 
-	<cdecl: void "cairo_font_options_set_antialias" ( Cairo::FontOptions int32 ) >
+	<cdecl: const void "cairo_font_options_set_antialias" ( Cairo::FontOptions int32 ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -168,7 +168,7 @@
 
 primSetHintMetrics: options hintMetrics: hint_metrics 
 
-	<cdecl: void "cairo_font_options_set_hint_metrics" ( Cairo::FontOptions int32 ) >
+	<cdecl: const void "cairo_font_options_set_hint_metrics" ( Cairo::FontOptions int32 ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -176,7 +176,7 @@
 
 primSetHintStyle: options hintStyle: hint_style 
 
-	<cdecl: void "cairo_font_options_set_hint_style" ( Cairo::FontOptions int32 ) >
+	<cdecl: const void "cairo_font_options_set_hint_style" ( Cairo::FontOptions int32 ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -184,7 +184,7 @@
 
 primSetSubpixelOrder: options subpixelOrder: subpixel_order 
 
-	<cdecl: void "cairo_font_options_set_subpixel_order" ( Cairo::FontOptions int32 ) >
+	<cdecl: const void "cairo_font_options_set_subpixel_order" ( Cairo::FontOptions int32 ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -192,7 +192,7 @@
 
 primStatus: options 
 
-	<cdecl: int32 "cairo_font_options_status" ( Cairo::FontOptions ) >
+	<cdecl: const int32 "cairo_font_options_status" ( Cairo::FontOptions ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
--- a/Cairo__GraphicsContext.st	Wed Jun 20 06:37:21 2012 +0000
+++ b/Cairo__GraphicsContext.st	Sun Sep 21 00:44:10 2014 +0100
@@ -16,7 +16,7 @@
 
     | cr |
 
-    self 
+    self
         assert: (surface isKindOf: Cairo::Surface)
         message: 'surface is not valid Cairo surface'.
 
@@ -44,7 +44,7 @@
             path := #( '/lib' '/usr/lib' '/usr/local/lib' ).
             (OperatingSystem getSystemInfo at:#machine) = 'x86_64' ifTrue:[
                 "If the machine is 64bit, prepend standard path for 32bit libs.
-                 Leave standard paths at the end, as the system might be completely 
+                 Leave standard paths at the end, as the system might be completely
                  32bit but running on 64bit-capable CPU.
 
                 CAVEAT: This is bit dangerous, as on 64bit OS, if ia32 libs are
@@ -112,833 +112,833 @@
 
 !GraphicsContext class methodsFor:'primitives'!
 
-primAppendPath: cr path: path 
+primAppendPath: cr path: path
 
-	<cdecl: void "cairo_append_path" ( Cairo::GraphicsContext Cairo::Path ) >
+	<cdecl: const void "cairo_append_path" ( Cairo::GraphicsContext Cairo::Path ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primArc: cr xc: xc yc: yc radius: radius angle1: angle1 angle2: angle2 
+primArc: cr xc: xc yc: yc radius: radius angle1: angle1 angle2: angle2
 
-	<cdecl: void "cairo_arc" ( Cairo::GraphicsContext double double double double double ) >
+	<cdecl: const void "cairo_arc" ( Cairo::GraphicsContext double double double double double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primArcNegative: cr xc: xc yc: yc radius: radius angle1: angle1 angle2: angle2 
+primArcNegative: cr xc: xc yc: yc radius: radius angle1: angle1 angle2: angle2
 
-	<cdecl: void "cairo_arc_negative" ( Cairo::GraphicsContext double double double double double ) >
+	<cdecl: const void "cairo_arc_negative" ( Cairo::GraphicsContext double double double double double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primClip: cr 
+primClip: cr
 
-	<cdecl: void "cairo_clip" ( Cairo::GraphicsContext ) >
+	<cdecl: const void "cairo_clip" ( Cairo::GraphicsContext ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primClipExtents: cr x1: x1 y1: y1 x2: x2 y2: y2 
+primClipExtents: cr x1: x1 y1: y1 x2: x2 y2: y2
 
-	<cdecl: void "cairo_clip_extents" ( Cairo::GraphicsContext pointer pointer pointer pointer ) >
+	<cdecl: const void "cairo_clip_extents" ( Cairo::GraphicsContext pointer pointer pointer pointer ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primClipPreserve: cr 
+primClipPreserve: cr
 
-	<cdecl: void "cairo_clip_preserve" ( Cairo::GraphicsContext ) >
+	<cdecl: const void "cairo_clip_preserve" ( Cairo::GraphicsContext ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primClosePath: cr 
+primClosePath: cr
 
-	<cdecl: void "cairo_close_path" ( Cairo::GraphicsContext ) >
+	<cdecl: const void "cairo_close_path" ( Cairo::GraphicsContext ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primCopyClipRectangleList: cr 
+primCopyClipRectangleList: cr
 
-	<cdecl: Cairo::RectangleList "cairo_copy_clip_rectangle_list" ( Cairo::GraphicsContext ) >
+	<cdecl: const Cairo::RectangleList "cairo_copy_clip_rectangle_list" ( Cairo::GraphicsContext ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primCopyPage: cr 
+primCopyPage: cr
 
-	<cdecl: void "cairo_copy_page" ( Cairo::GraphicsContext ) >
+	<cdecl: const void "cairo_copy_page" ( Cairo::GraphicsContext ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primCopyPath: cr 
+primCopyPath: cr
 
-	<cdecl: Cairo::Path "cairo_copy_path" ( Cairo::GraphicsContext ) >
+	<cdecl: const Cairo::Path "cairo_copy_path" ( Cairo::GraphicsContext ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primCopyPathFlat: cr 
+primCopyPathFlat: cr
 
-	<cdecl: Cairo::Path "cairo_copy_path_flat" ( Cairo::GraphicsContext ) >
+	<cdecl: const Cairo::Path "cairo_copy_path_flat" ( Cairo::GraphicsContext ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primCreate: target 
+primCreate: target
 
-	<cdecl: Cairo::GraphicsContext "cairo_create" ( Cairo::Surface ) >
+	<cdecl: const Cairo::GraphicsContext "cairo_create" ( Cairo::Surface ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primCurveTo: cr x1: x1 y1: y1 x2: x2 y2: y2 x3: x3 y3: y3 
+primCurveTo: cr x1: x1 y1: y1 x2: x2 y2: y2 x3: x3 y3: y3
 
-	<cdecl: void "cairo_curve_to" ( Cairo::GraphicsContext double double double double double double ) >
+	<cdecl: const void "cairo_curve_to" ( Cairo::GraphicsContext double double double double double double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primDestroy: cr 
+primDestroy: cr
 
-	<cdecl: void "cairo_destroy" ( Cairo::GraphicsContext ) >
+	<cdecl: const void "cairo_destroy" ( Cairo::GraphicsContext ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primDeviceToUser: cr x: x y: y 
+primDeviceToUser: cr x: x y: y
 
-	<cdecl: void "cairo_device_to_user" ( Cairo::GraphicsContext pointer pointer ) >
+	<cdecl: const void "cairo_device_to_user" ( Cairo::GraphicsContext pointer pointer ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primDeviceToUserDistance: cr dx: dx dy: dy 
+primDeviceToUserDistance: cr dx: dx dy: dy
 
-	<cdecl: void "cairo_device_to_user_distance" ( Cairo::GraphicsContext pointer pointer ) >
+	<cdecl: const void "cairo_device_to_user_distance" ( Cairo::GraphicsContext pointer pointer ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primFill: cr 
+primFill: cr
 
-	<cdecl: void "cairo_fill" ( Cairo::GraphicsContext ) >
+	<cdecl: const void "cairo_fill" ( Cairo::GraphicsContext ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primFillExtents: cr x1: x1 y1: y1 x2: x2 y2: y2 
+primFillExtents: cr x1: x1 y1: y1 x2: x2 y2: y2
 
-	<cdecl: void "cairo_fill_extents" ( Cairo::GraphicsContext pointer pointer pointer pointer ) >
+	<cdecl: const void "cairo_fill_extents" ( Cairo::GraphicsContext pointer pointer pointer pointer ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primFillPreserve: cr 
+primFillPreserve: cr
 
-	<cdecl: void "cairo_fill_preserve" ( Cairo::GraphicsContext ) >
+	<cdecl: const void "cairo_fill_preserve" ( Cairo::GraphicsContext ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primFontExtents: cr extents: extents 
+primFontExtents: cr extents: extents
 
-	<cdecl: void "cairo_font_extents" ( Cairo::GraphicsContext Cairo::FontExtents ) >
+	<cdecl: const void "cairo_font_extents" ( Cairo::GraphicsContext Cairo::FontExtents ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primGetAntialias: cr 
+primGetAntialias: cr
 
-	<cdecl: int32 "cairo_get_antialias" ( Cairo::GraphicsContext ) >
+	<cdecl: const int32 "cairo_get_antialias" ( Cairo::GraphicsContext ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primGetCurrentPoint: cr x: x y: y 
+primGetCurrentPoint: cr x: x y: y
 
-	<cdecl: void "cairo_get_current_point" ( Cairo::GraphicsContext pointer pointer ) >
+	<cdecl: const void "cairo_get_current_point" ( Cairo::GraphicsContext pointer pointer ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primGetDash: cr dashes: dashes offset: offset 
+primGetDash: cr dashes: dashes offset: offset
 
-	<cdecl: void "cairo_get_dash" ( Cairo::GraphicsContext pointer pointer ) >
+	<cdecl: const void "cairo_get_dash" ( Cairo::GraphicsContext pointer pointer ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primGetDashCount: cr 
+primGetDashCount: cr
 
-	<cdecl: int32 "cairo_get_dash_count" ( Cairo::GraphicsContext ) >
+	<cdecl: const int32 "cairo_get_dash_count" ( Cairo::GraphicsContext ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primGetFillRule: cr 
+primGetFillRule: cr
 
-	<cdecl: int32 "cairo_get_fill_rule" ( Cairo::GraphicsContext ) >
+	<cdecl: const int32 "cairo_get_fill_rule" ( Cairo::GraphicsContext ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primGetFontFace: cr 
+primGetFontFace: cr
 
-	<cdecl: Cairo::FontFace "cairo_get_font_face" ( Cairo::GraphicsContext ) >
+	<cdecl: const Cairo::FontFace "cairo_get_font_face" ( Cairo::GraphicsContext ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primGetFontMatrix: cr matrix: matrix 
+primGetFontMatrix: cr matrix: matrix
 
-	<cdecl: void "cairo_get_font_matrix" ( Cairo::GraphicsContext Cairo::Matrix ) >
+	<cdecl: const void "cairo_get_font_matrix" ( Cairo::GraphicsContext Cairo::Matrix ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primGetFontOptions: cr options: options 
+primGetFontOptions: cr options: options
 
-	<cdecl: void "cairo_get_font_options" ( Cairo::GraphicsContext Cairo::FontOptions ) >
+	<cdecl: const void "cairo_get_font_options" ( Cairo::GraphicsContext Cairo::FontOptions ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primGetGroupTarget: cr 
+primGetGroupTarget: cr
 
-	<cdecl: Cairo::Surface "cairo_get_group_target" ( Cairo::GraphicsContext ) >
+	<cdecl: const Cairo::Surface "cairo_get_group_target" ( Cairo::GraphicsContext ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primGetLineCap: cr 
+primGetLineCap: cr
 
-	<cdecl: int32 "cairo_get_line_cap" ( Cairo::GraphicsContext ) >
+	<cdecl: const int32 "cairo_get_line_cap" ( Cairo::GraphicsContext ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primGetLineJoin: cr 
+primGetLineJoin: cr
 
-	<cdecl: int32 "cairo_get_line_join" ( Cairo::GraphicsContext ) >
+	<cdecl: const int32 "cairo_get_line_join" ( Cairo::GraphicsContext ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primGetLineWidth: cr 
+primGetLineWidth: cr
 
-	<cdecl: double "cairo_get_line_width" ( Cairo::GraphicsContext ) >
+	<cdecl: const double "cairo_get_line_width" ( Cairo::GraphicsContext ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primGetMatrix: cr matrix: matrix 
+primGetMatrix: cr matrix: matrix
 
-	<cdecl: void "cairo_get_matrix" ( Cairo::GraphicsContext Cairo::Matrix ) >
+	<cdecl: const void "cairo_get_matrix" ( Cairo::GraphicsContext Cairo::Matrix ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primGetMiterLimit: cr 
+primGetMiterLimit: cr
 
-	<cdecl: double "cairo_get_miter_limit" ( Cairo::GraphicsContext ) >
+	<cdecl: const double "cairo_get_miter_limit" ( Cairo::GraphicsContext ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primGetOperator: cr 
+primGetOperator: cr
 
-	<cdecl: int32 "cairo_get_operator" ( Cairo::GraphicsContext ) >
+	<cdecl: const int32 "cairo_get_operator" ( Cairo::GraphicsContext ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primGetReferenceCount: cr 
+primGetReferenceCount: cr
 
-	<cdecl: uint32 "cairo_get_reference_count" ( Cairo::GraphicsContext ) >
+	<cdecl: const uint32 "cairo_get_reference_count" ( Cairo::GraphicsContext ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primGetScaledFont: cr 
+primGetScaledFont: cr
 
-	<cdecl: Cairo::ScaledFont "cairo_get_scaled_font" ( Cairo::GraphicsContext ) >
+	<cdecl: const Cairo::ScaledFont "cairo_get_scaled_font" ( Cairo::GraphicsContext ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primGetSource: cr 
+primGetSource: cr
 
-	<cdecl: Cairo::Pattern "cairo_get_source" ( Cairo::GraphicsContext ) >
+	<cdecl: const Cairo::Pattern "cairo_get_source" ( Cairo::GraphicsContext ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primGetTarget: cr 
+primGetTarget: cr
 
-	<cdecl: Cairo::Surface "cairo_get_target" ( Cairo::GraphicsContext ) >
+	<cdecl: const Cairo::Surface "cairo_get_target" ( Cairo::GraphicsContext ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primGetTolerance: cr 
+primGetTolerance: cr
 
-	<cdecl: double "cairo_get_tolerance" ( Cairo::GraphicsContext ) >
+	<cdecl: const double "cairo_get_tolerance" ( Cairo::GraphicsContext ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primGetUserData: cr key: key 
+primGetUserData: cr key: key
 
-	<cdecl: pointer "cairo_get_user_data" ( Cairo::GraphicsContext Cairo::UserDataKey ) >
+	<cdecl: const pointer "cairo_get_user_data" ( Cairo::GraphicsContext Cairo::UserDataKey ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primGlyphExtents: cr glyphs: glyphs numGlyphs: num_glyphs extents: extents 
+primGlyphExtents: cr glyphs: glyphs numGlyphs: num_glyphs extents: extents
 
-	<cdecl: void "cairo_glyph_extents" ( Cairo::GraphicsContext Cairo::Glyph int32 Cairo::TextExtents ) >
+	<cdecl: const void "cairo_glyph_extents" ( Cairo::GraphicsContext Cairo::Glyph int32 Cairo::TextExtents ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primGlyphPath: cr glyphs: glyphs numGlyphs: num_glyphs 
+primGlyphPath: cr glyphs: glyphs numGlyphs: num_glyphs
 
-	<cdecl: void "cairo_glyph_path" ( Cairo::GraphicsContext Cairo::Glyph int32 ) >
+	<cdecl: const void "cairo_glyph_path" ( Cairo::GraphicsContext Cairo::Glyph int32 ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primHasCurrentPoint: cr 
+primHasCurrentPoint: cr
 
-	<cdecl: int32 "cairo_has_current_point" ( Cairo::GraphicsContext ) >
+	<cdecl: const int32 "cairo_has_current_point" ( Cairo::GraphicsContext ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primIdentityMatrix: cr 
+primIdentityMatrix: cr
 
-	<cdecl: void "cairo_identity_matrix" ( Cairo::GraphicsContext ) >
+	<cdecl: const void "cairo_identity_matrix" ( Cairo::GraphicsContext ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primInFill: cr x: x y: y 
+primInFill: cr x: x y: y
 
-	<cdecl: int32 "cairo_in_fill" ( Cairo::GraphicsContext double double ) >
+	<cdecl: const int32 "cairo_in_fill" ( Cairo::GraphicsContext double double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primInStroke: cr x: x y: y 
+primInStroke: cr x: x y: y
 
-	<cdecl: int32 "cairo_in_stroke" ( Cairo::GraphicsContext double double ) >
+	<cdecl: const int32 "cairo_in_stroke" ( Cairo::GraphicsContext double double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primLineTo: cr x: x y: y 
+primLineTo: cr x: x y: y
 
-	<cdecl: void "cairo_line_to" ( Cairo::GraphicsContext double double ) >
+	<cdecl: const void "cairo_line_to" ( Cairo::GraphicsContext double double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primMask: cr pattern: pattern 
+primMask: cr pattern: pattern
 
-	<cdecl: void "cairo_mask" ( Cairo::GraphicsContext Cairo::Pattern ) >
+	<cdecl: const void "cairo_mask" ( Cairo::GraphicsContext Cairo::Pattern ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primMaskSurface: cr surface: surface surfaceX: surface_x surfaceY: surface_y 
+primMaskSurface: cr surface: surface surfaceX: surface_x surfaceY: surface_y
 
-	<cdecl: void "cairo_mask_surface" ( Cairo::GraphicsContext Cairo::Surface double double ) >
+	<cdecl: const void "cairo_mask_surface" ( Cairo::GraphicsContext Cairo::Surface double double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primMoveTo: cr x: x y: y 
+primMoveTo: cr x: x y: y
 
-	<cdecl: void "cairo_move_to" ( Cairo::GraphicsContext double double ) >
+	<cdecl: const void "cairo_move_to" ( Cairo::GraphicsContext double double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primNewPath: cr 
+primNewPath: cr
 
-	<cdecl: void "cairo_new_path" ( Cairo::GraphicsContext ) >
+	<cdecl: const void "cairo_new_path" ( Cairo::GraphicsContext ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primNewSubPath: cr 
+primNewSubPath: cr
 
-	<cdecl: void "cairo_new_sub_path" ( Cairo::GraphicsContext ) >
+	<cdecl: const void "cairo_new_sub_path" ( Cairo::GraphicsContext ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primPaint: cr 
+primPaint: cr
 
-	<cdecl: void "cairo_paint" ( Cairo::GraphicsContext ) >
+	<cdecl: const void "cairo_paint" ( Cairo::GraphicsContext ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primPaintWithAlpha: cr alpha: alpha 
+primPaintWithAlpha: cr alpha: alpha
 
-	<cdecl: void "cairo_paint_with_alpha" ( Cairo::GraphicsContext double ) >
+	<cdecl: const void "cairo_paint_with_alpha" ( Cairo::GraphicsContext double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primPathExtents: cr x1: x1 y1: y1 x2: x2 y2: y2 
+primPathExtents: cr x1: x1 y1: y1 x2: x2 y2: y2
 
-	<cdecl: void "cairo_path_extents" ( Cairo::GraphicsContext pointer pointer pointer pointer ) >
+	<cdecl: const void "cairo_path_extents" ( Cairo::GraphicsContext pointer pointer pointer pointer ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primPopGroup: cr 
+primPopGroup: cr
 
-	<cdecl: Cairo::Pattern "cairo_pop_group" ( Cairo::GraphicsContext ) >
+	<cdecl: const Cairo::Pattern "cairo_pop_group" ( Cairo::GraphicsContext ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primPopGroupToSource: cr 
+primPopGroupToSource: cr
 
-	<cdecl: void "cairo_pop_group_to_source" ( Cairo::GraphicsContext ) >
+	<cdecl: const void "cairo_pop_group_to_source" ( Cairo::GraphicsContext ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primPushGroup: cr 
+primPushGroup: cr
 
-	<cdecl: void "cairo_push_group" ( Cairo::GraphicsContext ) >
+	<cdecl: const void "cairo_push_group" ( Cairo::GraphicsContext ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primPushGroupWithContent: cr content: content 
+primPushGroupWithContent: cr content: content
 
-	<cdecl: void "cairo_push_group_with_content" ( Cairo::GraphicsContext int32 ) >
+	<cdecl: const void "cairo_push_group_with_content" ( Cairo::GraphicsContext int32 ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primRectangle: cr x: x y: y width: width height: height 
+primRectangle: cr x: x y: y width: width height: height
 
-	<cdecl: void "cairo_rectangle" ( Cairo::GraphicsContext double double double double ) >
+	<cdecl: const void "cairo_rectangle" ( Cairo::GraphicsContext double double double double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primReference: cr 
+primReference: cr
 
-	<cdecl: Cairo::GraphicsContext "cairo_reference" ( Cairo::GraphicsContext ) >
+	<cdecl: const Cairo::GraphicsContext "cairo_reference" ( Cairo::GraphicsContext ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primRelCurveTo: cr dx1: dx1 dy1: dy1 dx2: dx2 dy2: dy2 dx3: dx3 dy3: dy3 
+primRelCurveTo: cr dx1: dx1 dy1: dy1 dx2: dx2 dy2: dy2 dx3: dx3 dy3: dy3
 
-	<cdecl: void "cairo_rel_curve_to" ( Cairo::GraphicsContext double double double double double double ) >
+	<cdecl: const void "cairo_rel_curve_to" ( Cairo::GraphicsContext double double double double double double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primRelLineTo: cr dx: dx dy: dy 
+primRelLineTo: cr dx: dx dy: dy
 
-	<cdecl: void "cairo_rel_line_to" ( Cairo::GraphicsContext double double ) >
+	<cdecl: const void "cairo_rel_line_to" ( Cairo::GraphicsContext double double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primRelMoveTo: cr dx: dx dy: dy 
+primRelMoveTo: cr dx: dx dy: dy
 
-	<cdecl: void "cairo_rel_move_to" ( Cairo::GraphicsContext double double ) >
+	<cdecl: const void "cairo_rel_move_to" ( Cairo::GraphicsContext double double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primResetClip: cr 
+primResetClip: cr
 
-	<cdecl: void "cairo_reset_clip" ( Cairo::GraphicsContext ) >
+	<cdecl: const void "cairo_reset_clip" ( Cairo::GraphicsContext ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primRestore: cr 
+primRestore: cr
 
-	<cdecl: void "cairo_restore" ( Cairo::GraphicsContext ) >
+	<cdecl: const void "cairo_restore" ( Cairo::GraphicsContext ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primRotate: cr angle: angle 
+primRotate: cr angle: angle
 
-	<cdecl: void "cairo_rotate" ( Cairo::GraphicsContext double ) >
+	<cdecl: const void "cairo_rotate" ( Cairo::GraphicsContext double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primSave: cr 
+primSave: cr
 
-	<cdecl: void "cairo_save" ( Cairo::GraphicsContext ) >
+	<cdecl: const void "cairo_save" ( Cairo::GraphicsContext ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primScale: cr sx: sx sy: sy 
+primScale: cr sx: sx sy: sy
 
-	<cdecl: void "cairo_scale" ( Cairo::GraphicsContext double double ) >
+	<cdecl: const void "cairo_scale" ( Cairo::GraphicsContext double double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primSelectFontFace: cr family: family slant: slant weight: weight 
+primSelectFontFace: cr family: family slant: slant weight: weight
 
-	<cdecl: void "cairo_select_font_face" ( Cairo::GraphicsContext charPointer int32 int32 ) >
+	<cdecl: const void "cairo_select_font_face" ( Cairo::GraphicsContext charPointer int32 int32 ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primSetAntialias: cr antialias: antialias 
+primSetAntialias: cr antialias: antialias
 
-	<cdecl: void "cairo_set_antialias" ( Cairo::GraphicsContext int32 ) >
+	<cdecl: const void "cairo_set_antialias" ( Cairo::GraphicsContext int32 ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primSetDash: cr dashes: dashes numDashes: num_dashes offset: offset 
+primSetDash: cr dashes: dashes numDashes: num_dashes offset: offset
 
-	<cdecl: void "cairo_set_dash" ( Cairo::GraphicsContext pointer int32 double ) >
+	<cdecl: const void "cairo_set_dash" ( Cairo::GraphicsContext pointer int32 double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primSetFillRule: cr fillRule: fill_rule 
+primSetFillRule: cr fillRule: fill_rule
 
-	<cdecl: void "cairo_set_fill_rule" ( Cairo::GraphicsContext int32 ) >
+	<cdecl: const void "cairo_set_fill_rule" ( Cairo::GraphicsContext int32 ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primSetFontFace: cr fontFace: font_face 
+primSetFontFace: cr fontFace: font_face
 
-	<cdecl: void "cairo_set_font_face" ( Cairo::GraphicsContext Cairo::FontFace ) >
+	<cdecl: const void "cairo_set_font_face" ( Cairo::GraphicsContext Cairo::FontFace ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primSetFontMatrix: cr matrix: matrix 
+primSetFontMatrix: cr matrix: matrix
 
-	<cdecl: void "cairo_set_font_matrix" ( Cairo::GraphicsContext Cairo::Matrix ) >
+	<cdecl: const void "cairo_set_font_matrix" ( Cairo::GraphicsContext Cairo::Matrix ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primSetFontOptions: cr options: options 
+primSetFontOptions: cr options: options
 
-	<cdecl: void "cairo_set_font_options" ( Cairo::GraphicsContext Cairo::FontOptions ) >
+	<cdecl: const void "cairo_set_font_options" ( Cairo::GraphicsContext Cairo::FontOptions ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primSetFontSize: cr size: size 
+primSetFontSize: cr size: size
 
-	<cdecl: void "cairo_set_font_size" ( Cairo::GraphicsContext double ) >
+	<cdecl: const void "cairo_set_font_size" ( Cairo::GraphicsContext double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primSetLineCap: cr lineCap: line_cap 
+primSetLineCap: cr lineCap: line_cap
 
-	<cdecl: void "cairo_set_line_cap" ( Cairo::GraphicsContext int32 ) >
+	<cdecl: const void "cairo_set_line_cap" ( Cairo::GraphicsContext int32 ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primSetLineJoin: cr lineJoin: line_join 
+primSetLineJoin: cr lineJoin: line_join
 
-	<cdecl: void "cairo_set_line_join" ( Cairo::GraphicsContext int32 ) >
+	<cdecl: const void "cairo_set_line_join" ( Cairo::GraphicsContext int32 ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primSetLineWidth: cr width: width 
+primSetLineWidth: cr width: width
 
-	<cdecl: void "cairo_set_line_width" ( Cairo::GraphicsContext double ) >
+	<cdecl: const void "cairo_set_line_width" ( Cairo::GraphicsContext double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primSetMatrix: cr matrix: matrix 
+primSetMatrix: cr matrix: matrix
 
-	<cdecl: void "cairo_set_matrix" ( Cairo::GraphicsContext Cairo::Matrix ) >
+	<cdecl: const void "cairo_set_matrix" ( Cairo::GraphicsContext Cairo::Matrix ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primSetMiterLimit: cr limit: limit 
+primSetMiterLimit: cr limit: limit
 
-	<cdecl: void "cairo_set_miter_limit" ( Cairo::GraphicsContext double ) >
+	<cdecl: const void "cairo_set_miter_limit" ( Cairo::GraphicsContext double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primSetOperator: cr op: op 
+primSetOperator: cr op: op
 
-	<cdecl: void "cairo_set_operator" ( Cairo::GraphicsContext int32 ) >
+	<cdecl: const void "cairo_set_operator" ( Cairo::GraphicsContext int32 ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primSetScaledFont: cr scaledFont: scaled_font 
+primSetScaledFont: cr scaledFont: scaled_font
 
-	<cdecl: void "cairo_set_scaled_font" ( Cairo::GraphicsContext Cairo::ScaledFont ) >
+	<cdecl: const void "cairo_set_scaled_font" ( Cairo::GraphicsContext Cairo::ScaledFont ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primSetSource: cr source: source 
+primSetSource: cr source: source
 
-	<cdecl: void "cairo_set_source" ( Cairo::GraphicsContext Cairo::Pattern ) >
+	<cdecl: const void "cairo_set_source" ( Cairo::GraphicsContext Cairo::Pattern ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primSetSourceRgb: cr red: red green: green blue: blue 
+primSetSourceRgb: cr red: red green: green blue: blue
 
-	<cdecl: void "cairo_set_source_rgb" ( Cairo::GraphicsContext double double double ) >
+	<cdecl: const void "cairo_set_source_rgb" ( Cairo::GraphicsContext double double double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primSetSourceRgba: cr red: red green: green blue: blue alpha: alpha 
+primSetSourceRgba: cr red: red green: green blue: blue alpha: alpha
 
-	<cdecl: void "cairo_set_source_rgba" ( Cairo::GraphicsContext double double double double ) >
+	<cdecl: const void "cairo_set_source_rgba" ( Cairo::GraphicsContext double double double double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primSetSourceSurface: cr surface: surface x: x y: y 
+primSetSourceSurface: cr surface: surface x: x y: y
 
-	<cdecl: void "cairo_set_source_surface" ( Cairo::GraphicsContext Cairo::Surface double double ) >
+	<cdecl: const void "cairo_set_source_surface" ( Cairo::GraphicsContext Cairo::Surface double double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primSetTolerance: cr tolerance: tolerance 
+primSetTolerance: cr tolerance: tolerance
 
-	<cdecl: void "cairo_set_tolerance" ( Cairo::GraphicsContext double ) >
+	<cdecl: const void "cairo_set_tolerance" ( Cairo::GraphicsContext double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primSetUserData: cr key: key userData: user_data destroy: destroy 
+primSetUserData: cr key: key userData: user_data destroy: destroy
 
-	<cdecl: int32 "cairo_set_user_data" ( Cairo::GraphicsContext Cairo::UserDataKey pointer pointer ) >
+	<cdecl: const int32 "cairo_set_user_data" ( Cairo::GraphicsContext Cairo::UserDataKey pointer pointer ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primShowGlyphs: cr glyphs: glyphs numGlyphs: num_glyphs 
+primShowGlyphs: cr glyphs: glyphs numGlyphs: num_glyphs
 
-	<cdecl: void "cairo_show_glyphs" ( Cairo::GraphicsContext Cairo::Glyph int32 ) >
+	<cdecl: const void "cairo_show_glyphs" ( Cairo::GraphicsContext Cairo::Glyph int32 ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primShowPage: cr 
+primShowPage: cr
 
-	<cdecl: void "cairo_show_page" ( Cairo::GraphicsContext ) >
+	<cdecl: const void "cairo_show_page" ( Cairo::GraphicsContext ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primShowText: cr utf8: utf8 
+primShowText: cr utf8: utf8
 
-	<cdecl: void "cairo_show_text" ( Cairo::GraphicsContext charPointer ) >
+	<cdecl: const void "cairo_show_text" ( Cairo::GraphicsContext charPointer ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primStatus: cr 
+primStatus: cr
 
-	<cdecl: int32 "cairo_status" ( Cairo::GraphicsContext ) >
+	<cdecl: const int32 "cairo_status" ( Cairo::GraphicsContext ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primStroke: cr 
+primStroke: cr
 
-	<cdecl: void "cairo_stroke" ( Cairo::GraphicsContext ) >
+	<cdecl: const void "cairo_stroke" ( Cairo::GraphicsContext ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primStrokeExtents: cr x1: x1 y1: y1 x2: x2 y2: y2 
+primStrokeExtents: cr x1: x1 y1: y1 x2: x2 y2: y2
 
-	<cdecl: void "cairo_stroke_extents" ( Cairo::GraphicsContext pointer pointer pointer pointer ) >
+	<cdecl: const void "cairo_stroke_extents" ( Cairo::GraphicsContext pointer pointer pointer pointer ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primStrokePreserve: cr 
+primStrokePreserve: cr
 
-	<cdecl: void "cairo_stroke_preserve" ( Cairo::GraphicsContext ) >
+	<cdecl: const void "cairo_stroke_preserve" ( Cairo::GraphicsContext ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primTextExtents: cr utf8: utf8 extents: extents 
+primTextExtents: cr utf8: utf8 extents: extents
 
-	<cdecl: void "cairo_text_extents" ( Cairo::GraphicsContext charPointer Cairo::TextExtents ) >
+	<cdecl: const void "cairo_text_extents" ( Cairo::GraphicsContext charPointer Cairo::TextExtents ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primTextPath: cr utf8: utf8 
+primTextPath: cr utf8: utf8
 
-	<cdecl: void "cairo_text_path" ( Cairo::GraphicsContext charPointer ) >
+	<cdecl: const void "cairo_text_path" ( Cairo::GraphicsContext charPointer ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primTransform: cr matrix: matrix 
+primTransform: cr matrix: matrix
 
-	<cdecl: void "cairo_transform" ( Cairo::GraphicsContext Cairo::Matrix ) >
+	<cdecl: const void "cairo_transform" ( Cairo::GraphicsContext Cairo::Matrix ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primTranslate: cr tx: tx ty: ty 
+primTranslate: cr tx: tx ty: ty
 
-	<cdecl: void "cairo_translate" ( Cairo::GraphicsContext double double ) >
+	<cdecl: const void "cairo_translate" ( Cairo::GraphicsContext double double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primUserToDevice: cr x: x y: y 
+primUserToDevice: cr x: x y: y
 
-	<cdecl: void "cairo_user_to_device" ( Cairo::GraphicsContext pointer pointer ) >
+	<cdecl: const void "cairo_user_to_device" ( Cairo::GraphicsContext pointer pointer ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-primUserToDeviceDistance: cr dx: dx dy: dy 
+primUserToDeviceDistance: cr dx: dx dy: dy
 
-	<cdecl: void "cairo_user_to_device_distance" ( Cairo::GraphicsContext pointer pointer ) >
+	<cdecl: const void "cairo_user_to_device_distance" ( Cairo::GraphicsContext pointer pointer ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -956,7 +956,7 @@
 
 paint: aColor
 
-    ^self 
+    ^self
         paintRed:   (aColor red / 100) asDouble
         green:      (aColor green / 100) asDouble
         blue:       (aColor blue / 100) asDouble
@@ -1014,7 +1014,7 @@
 
 paintRed: red green: green blue: blue alpha: alpha
 
-    ^self class 
+    ^self class
         primSetSourceRgba: self red: red green: green blue: blue alpha: alpha
 
     "Created: / 10-07-2008 / 11:10:45 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -1044,13 +1044,13 @@
     "Modified: / 17-06-2012 / 22:33:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
-rectangleX: x y: y width: width height: height 
+rectangleX: x y: y width: width height: height
 
-    ^self class 
-        primRectangle: self 
-        x: x asDouble 
-        y: y asDouble 
-        width: width asDouble 
+    ^self class
+        primRectangle: self
+        x: x asDouble
+        y: y asDouble
+        width: width asDouble
         height: height asDouble
 
     "Created: / 10-07-2008 / 09:41:50 / Jan Vrany <vranyj1@fel.cvut.cz>"
--- a/Cairo__Matrix.st	Wed Jun 20 06:37:21 2012 +0000
+++ b/Cairo__Matrix.st	Sun Sep 21 00:44:10 2014 +0100
@@ -72,7 +72,7 @@
 
 primInit: matrix xx: xx yx: yx xy: xy yy: yy x0: x0 y0: y0 
 
-	<cdecl: void "cairo_matrix_init" ( Cairo::Matrix double double double double double double ) >
+	<cdecl: const void "cairo_matrix_init" ( Cairo::Matrix double double double double double double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -80,7 +80,7 @@
 
 primInitIdentity: matrix 
 
-	<cdecl: void "cairo_matrix_init_identity" ( Cairo::Matrix ) >
+	<cdecl: const void "cairo_matrix_init_identity" ( Cairo::Matrix ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -88,7 +88,7 @@
 
 primInitRotate: matrix radians: radians 
 
-	<cdecl: void "cairo_matrix_init_rotate" ( Cairo::Matrix double ) >
+	<cdecl: const void "cairo_matrix_init_rotate" ( Cairo::Matrix double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -96,7 +96,7 @@
 
 primInitScale: matrix sx: sx sy: sy 
 
-	<cdecl: void "cairo_matrix_init_scale" ( Cairo::Matrix double double ) >
+	<cdecl: const void "cairo_matrix_init_scale" ( Cairo::Matrix double double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -104,7 +104,7 @@
 
 primInitTranslate: matrix tx: tx ty: ty 
 
-	<cdecl: void "cairo_matrix_init_translate" ( Cairo::Matrix double double ) >
+	<cdecl: const void "cairo_matrix_init_translate" ( Cairo::Matrix double double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -112,7 +112,7 @@
 
 primInvert: matrix 
 
-	<cdecl: int32 "cairo_matrix_invert" ( Cairo::Matrix ) >
+	<cdecl: const int32 "cairo_matrix_invert" ( Cairo::Matrix ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -120,7 +120,7 @@
 
 primMultiply: result a: a b: b 
 
-	<cdecl: void "cairo_matrix_multiply" ( Cairo::Matrix Cairo::Matrix Cairo::Matrix ) >
+	<cdecl: const void "cairo_matrix_multiply" ( Cairo::Matrix Cairo::Matrix Cairo::Matrix ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -128,7 +128,7 @@
 
 primRotate: matrix radians: radians 
 
-	<cdecl: void "cairo_matrix_rotate" ( Cairo::Matrix double ) >
+	<cdecl: const void "cairo_matrix_rotate" ( Cairo::Matrix double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -136,7 +136,7 @@
 
 primScale: matrix sx: sx sy: sy 
 
-	<cdecl: void "cairo_matrix_scale" ( Cairo::Matrix double double ) >
+	<cdecl: const void "cairo_matrix_scale" ( Cairo::Matrix double double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -144,7 +144,7 @@
 
 primTransformDistance: matrix dx: dx dy: dy 
 
-	<cdecl: void "cairo_matrix_transform_distance" ( Cairo::Matrix pointer pointer ) >
+	<cdecl: const void "cairo_matrix_transform_distance" ( Cairo::Matrix pointer pointer ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -152,7 +152,7 @@
 
 primTransformPoint: matrix x: x y: y 
 
-	<cdecl: void "cairo_matrix_transform_point" ( Cairo::Matrix pointer pointer ) >
+	<cdecl: const void "cairo_matrix_transform_point" ( Cairo::Matrix pointer pointer ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -160,7 +160,7 @@
 
 primTranslate: matrix tx: tx ty: ty 
 
-	<cdecl: void "cairo_matrix_translate" ( Cairo::Matrix double double ) >
+	<cdecl: const void "cairo_matrix_translate" ( Cairo::Matrix double double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
--- a/Cairo__Path.st	Wed Jun 20 06:37:21 2012 +0000
+++ b/Cairo__Path.st	Sun Sep 21 00:44:10 2014 +0100
@@ -72,7 +72,7 @@
 
 primDestroy: path 
 
-	<cdecl: void "cairo_path_destroy" ( Cairo::Path ) >
+	<cdecl: const void "cairo_path_destroy" ( Cairo::Path ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
--- a/Cairo__Pattern.st	Wed Jun 20 06:37:21 2012 +0000
+++ b/Cairo__Pattern.st	Sun Sep 21 00:44:10 2014 +0100
@@ -72,7 +72,7 @@
 
 primAddColorStopRgb: pattern offset: offset red: red green: green blue: blue 
 
-	<cdecl: void "cairo_pattern_add_color_stop_rgb" ( Cairo::Pattern double double double double ) >
+	<cdecl: const void "cairo_pattern_add_color_stop_rgb" ( Cairo::Pattern double double double double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -80,7 +80,7 @@
 
 primAddColorStopRgba: pattern offset: offset red: red green: green blue: blue alpha: alpha 
 
-	<cdecl: void "cairo_pattern_add_color_stop_rgba" ( Cairo::Pattern double double double double double ) >
+	<cdecl: const void "cairo_pattern_add_color_stop_rgba" ( Cairo::Pattern double double double double double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -88,7 +88,7 @@
 
 primDestroy: pattern 
 
-	<cdecl: void "cairo_pattern_destroy" ( Cairo::Pattern ) >
+	<cdecl: const void "cairo_pattern_destroy" ( Cairo::Pattern ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -96,7 +96,7 @@
 
 primGetColorStopCount: pattern count: count 
 
-	<cdecl: int32 "cairo_pattern_get_color_stop_count" ( Cairo::Pattern pointer ) >
+	<cdecl: const int32 "cairo_pattern_get_color_stop_count" ( Cairo::Pattern pointer ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -104,7 +104,7 @@
 
 primGetColorStopRgba: pattern index: index offset: offset red: red green: green blue: blue alpha: alpha 
 
-	<cdecl: int32 "cairo_pattern_get_color_stop_rgba" ( Cairo::Pattern int32 pointer pointer pointer pointer pointer ) >
+	<cdecl: const int32 "cairo_pattern_get_color_stop_rgba" ( Cairo::Pattern int32 pointer pointer pointer pointer pointer ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -112,7 +112,7 @@
 
 primGetExtend: pattern 
 
-	<cdecl: int32 "cairo_pattern_get_extend" ( Cairo::Pattern ) >
+	<cdecl: const int32 "cairo_pattern_get_extend" ( Cairo::Pattern ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -120,7 +120,7 @@
 
 primGetFilter: pattern 
 
-	<cdecl: int32 "cairo_pattern_get_filter" ( Cairo::Pattern ) >
+	<cdecl: const int32 "cairo_pattern_get_filter" ( Cairo::Pattern ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -128,7 +128,7 @@
 
 primGetLinearPoints: pattern x0: x0 y0: y0 x1: x1 y1: y1 
 
-	<cdecl: int32 "cairo_pattern_get_linear_points" ( Cairo::Pattern pointer pointer pointer pointer ) >
+	<cdecl: const int32 "cairo_pattern_get_linear_points" ( Cairo::Pattern pointer pointer pointer pointer ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -136,7 +136,7 @@
 
 primGetMatrix: pattern matrix: matrix 
 
-	<cdecl: void "cairo_pattern_get_matrix" ( Cairo::Pattern Cairo::Matrix ) >
+	<cdecl: const void "cairo_pattern_get_matrix" ( Cairo::Pattern Cairo::Matrix ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -144,7 +144,7 @@
 
 primGetRadialCircles: pattern x0: x0 y0: y0 r0: r0 x1: x1 y1: y1 r1: r1 
 
-	<cdecl: int32 "cairo_pattern_get_radial_circles" ( Cairo::Pattern pointer pointer pointer pointer pointer pointer ) >
+	<cdecl: const int32 "cairo_pattern_get_radial_circles" ( Cairo::Pattern pointer pointer pointer pointer pointer pointer ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -152,7 +152,7 @@
 
 primGetReferenceCount: pattern 
 
-	<cdecl: uint32 "cairo_pattern_get_reference_count" ( Cairo::Pattern ) >
+	<cdecl: const uint32 "cairo_pattern_get_reference_count" ( Cairo::Pattern ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -160,7 +160,7 @@
 
 primGetRgba: pattern red: red green: green blue: blue alpha: alpha 
 
-	<cdecl: int32 "cairo_pattern_get_rgba" ( Cairo::Pattern pointer pointer pointer pointer ) >
+	<cdecl: const int32 "cairo_pattern_get_rgba" ( Cairo::Pattern pointer pointer pointer pointer ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -168,7 +168,7 @@
 
 primGetSurface: pattern surface: surface 
 
-	<cdecl: int32 "cairo_pattern_get_surface" ( Cairo::Pattern pointer ) >
+	<cdecl: const int32 "cairo_pattern_get_surface" ( Cairo::Pattern pointer ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -176,7 +176,7 @@
 
 primGetType: pattern 
 
-	<cdecl: int32 "cairo_pattern_get_type" ( Cairo::Pattern ) >
+	<cdecl: const int32 "cairo_pattern_get_type" ( Cairo::Pattern ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -184,7 +184,7 @@
 
 primGetUserData: pattern key: key 
 
-	<cdecl: pointer "cairo_pattern_get_user_data" ( Cairo::Pattern Cairo::UserDataKey ) >
+	<cdecl: const pointer "cairo_pattern_get_user_data" ( Cairo::Pattern Cairo::UserDataKey ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -192,7 +192,7 @@
 
 primPatternCreateForSurface: surface 
 
-	<cdecl: Cairo::Pattern "cairo_pattern_create_for_surface" ( Cairo::Surface ) >
+	<cdecl: const Cairo::Pattern "cairo_pattern_create_for_surface" ( Cairo::Surface ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -200,7 +200,7 @@
 
 primPatternCreateLinear: x0 y0: y0 x1: x1 y1: y1 
 
-	<cdecl: Cairo::Pattern "cairo_pattern_create_linear" ( double double double double ) >
+	<cdecl: const Cairo::Pattern "cairo_pattern_create_linear" ( double double double double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -208,7 +208,7 @@
 
 primPatternCreateRadial: cx0 cy0: cy0 radius0: radius0 cx1: cx1 cy1: cy1 radius1: radius1 
 
-	<cdecl: Cairo::Pattern "cairo_pattern_create_radial" ( double double double double double double ) >
+	<cdecl: const Cairo::Pattern "cairo_pattern_create_radial" ( double double double double double double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -216,7 +216,7 @@
 
 primPatternCreateRgb: red green: green blue: blue 
 
-	<cdecl: Cairo::Pattern "cairo_pattern_create_rgb" ( double double double ) >
+	<cdecl: const Cairo::Pattern "cairo_pattern_create_rgb" ( double double double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -224,7 +224,7 @@
 
 primPatternCreateRgba: red green: green blue: blue alpha: alpha 
 
-	<cdecl: Cairo::Pattern "cairo_pattern_create_rgba" ( double double double double ) >
+	<cdecl: const Cairo::Pattern "cairo_pattern_create_rgba" ( double double double double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -232,7 +232,7 @@
 
 primReference: pattern 
 
-	<cdecl: Cairo::Pattern "cairo_pattern_reference" ( Cairo::Pattern ) >
+	<cdecl: const Cairo::Pattern "cairo_pattern_reference" ( Cairo::Pattern ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -240,7 +240,7 @@
 
 primSetExtend: pattern extend: extend 
 
-	<cdecl: void "cairo_pattern_set_extend" ( Cairo::Pattern int32 ) >
+	<cdecl: const void "cairo_pattern_set_extend" ( Cairo::Pattern int32 ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -248,7 +248,7 @@
 
 primSetFilter: pattern filter: filter 
 
-	<cdecl: void "cairo_pattern_set_filter" ( Cairo::Pattern int32 ) >
+	<cdecl: const void "cairo_pattern_set_filter" ( Cairo::Pattern int32 ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -256,7 +256,7 @@
 
 primSetMatrix: pattern matrix: matrix 
 
-	<cdecl: void "cairo_pattern_set_matrix" ( Cairo::Pattern Cairo::Matrix ) >
+	<cdecl: const void "cairo_pattern_set_matrix" ( Cairo::Pattern Cairo::Matrix ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -264,7 +264,7 @@
 
 primSetUserData: pattern key: key userData: user_data destroy: destroy 
 
-	<cdecl: int32 "cairo_pattern_set_user_data" ( Cairo::Pattern Cairo::UserDataKey pointer pointer ) >
+	<cdecl: const int32 "cairo_pattern_set_user_data" ( Cairo::Pattern Cairo::UserDataKey pointer pointer ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -272,7 +272,7 @@
 
 primStatus: pattern 
 
-	<cdecl: int32 "cairo_pattern_status" ( Cairo::Pattern ) >
+	<cdecl: const int32 "cairo_pattern_status" ( Cairo::Pattern ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
--- a/Cairo__RectangleList.st	Wed Jun 20 06:37:21 2012 +0000
+++ b/Cairo__RectangleList.st	Sun Sep 21 00:44:10 2014 +0100
@@ -72,7 +72,7 @@
 
 primDestroy: rectangle_list 
 
-	<cdecl: void "cairo_rectangle_list_destroy" ( Cairo::RectangleList ) >
+	<cdecl: const void "cairo_rectangle_list_destroy" ( Cairo::RectangleList ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
--- a/Cairo__ScaledFont.st	Wed Jun 20 06:37:21 2012 +0000
+++ b/Cairo__ScaledFont.st	Sun Sep 21 00:44:10 2014 +0100
@@ -72,7 +72,7 @@
 
 primDestroy: scaled_font 
 
-	<cdecl: void "cairo_scaled_font_destroy" ( Cairo::ScaledFont ) >
+	<cdecl: const void "cairo_scaled_font_destroy" ( Cairo::ScaledFont ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -80,7 +80,7 @@
 
 primExtents: scaled_font extents: extents 
 
-	<cdecl: void "cairo_scaled_font_extents" ( Cairo::ScaledFont Cairo::FontExtents ) >
+	<cdecl: const void "cairo_scaled_font_extents" ( Cairo::ScaledFont Cairo::FontExtents ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -88,7 +88,7 @@
 
 primFtScaledFontLockFace: scaled_font 
 
-	<cdecl: pointer "cairo_ft_scaled_font_lock_face" ( Cairo::ScaledFont ) >
+	<cdecl: const pointer "cairo_ft_scaled_font_lock_face" ( Cairo::ScaledFont ) >
 	self primitiveFailed
 
     "Created: / 10-07-2008 / 23:05:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -96,7 +96,7 @@
 
 primFtScaledFontUnlockFace: scaled_font 
 
-	<cdecl: void "cairo_ft_scaled_font_unlock_face" ( Cairo::ScaledFont ) >
+	<cdecl: const void "cairo_ft_scaled_font_unlock_face" ( Cairo::ScaledFont ) >
 	self primitiveFailed
 
     "Created: / 10-07-2008 / 23:05:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -104,7 +104,7 @@
 
 primGetCtm: scaled_font ctm: ctm 
 
-	<cdecl: void "cairo_scaled_font_get_ctm" ( Cairo::ScaledFont Cairo::Matrix ) >
+	<cdecl: const void "cairo_scaled_font_get_ctm" ( Cairo::ScaledFont Cairo::Matrix ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -112,7 +112,7 @@
 
 primGetFontFace: scaled_font 
 
-	<cdecl: Cairo::FontFace "cairo_scaled_font_get_font_face" ( Cairo::ScaledFont ) >
+	<cdecl: const Cairo::FontFace "cairo_scaled_font_get_font_face" ( Cairo::ScaledFont ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -120,7 +120,7 @@
 
 primGetFontMatrix: scaled_font fontMatrix: font_matrix 
 
-	<cdecl: void "cairo_scaled_font_get_font_matrix" ( Cairo::ScaledFont Cairo::Matrix ) >
+	<cdecl: const void "cairo_scaled_font_get_font_matrix" ( Cairo::ScaledFont Cairo::Matrix ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -128,7 +128,7 @@
 
 primGetFontOptions: scaled_font options: options 
 
-	<cdecl: void "cairo_scaled_font_get_font_options" ( Cairo::ScaledFont Cairo::FontOptions ) >
+	<cdecl: const void "cairo_scaled_font_get_font_options" ( Cairo::ScaledFont Cairo::FontOptions ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -136,7 +136,7 @@
 
 primGetReferenceCount: scaled_font 
 
-	<cdecl: uint32 "cairo_scaled_font_get_reference_count" ( Cairo::ScaledFont ) >
+	<cdecl: const uint32 "cairo_scaled_font_get_reference_count" ( Cairo::ScaledFont ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -144,7 +144,7 @@
 
 primGetType: scaled_font 
 
-	<cdecl: int32 "cairo_scaled_font_get_type" ( Cairo::ScaledFont ) >
+	<cdecl: const int32 "cairo_scaled_font_get_type" ( Cairo::ScaledFont ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -152,7 +152,7 @@
 
 primGetUserData: scaled_font key: key 
 
-	<cdecl: pointer "cairo_scaled_font_get_user_data" ( Cairo::ScaledFont Cairo::UserDataKey ) >
+	<cdecl: const pointer "cairo_scaled_font_get_user_data" ( Cairo::ScaledFont Cairo::UserDataKey ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -160,7 +160,7 @@
 
 primGlyphExtents: scaled_font glyphs: glyphs numGlyphs: num_glyphs extents: extents 
 
-	<cdecl: void "cairo_scaled_font_glyph_extents" ( Cairo::ScaledFont Cairo::Glyph int32 Cairo::TextExtents ) >
+	<cdecl: const void "cairo_scaled_font_glyph_extents" ( Cairo::ScaledFont Cairo::Glyph int32 Cairo::TextExtents ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -168,7 +168,7 @@
 
 primReference: scaled_font 
 
-	<cdecl: Cairo::ScaledFont "cairo_scaled_font_reference" ( Cairo::ScaledFont ) >
+	<cdecl: const Cairo::ScaledFont "cairo_scaled_font_reference" ( Cairo::ScaledFont ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -176,7 +176,7 @@
 
 primScaledFontCreate: font_face fontMatrix: font_matrix ctm: ctm options: options 
 
-	<cdecl: Cairo::ScaledFont "cairo_scaled_font_create" ( Cairo::FontFace Cairo::Matrix Cairo::Matrix Cairo::FontOptions ) >
+	<cdecl: const Cairo::ScaledFont "cairo_scaled_font_create" ( Cairo::FontFace Cairo::Matrix Cairo::Matrix Cairo::FontOptions ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -184,7 +184,7 @@
 
 primSetUserData: scaled_font key: key userData: user_data destroy: destroy 
 
-	<cdecl: int32 "cairo_scaled_font_set_user_data" ( Cairo::ScaledFont Cairo::UserDataKey pointer pointer ) >
+	<cdecl: const int32 "cairo_scaled_font_set_user_data" ( Cairo::ScaledFont Cairo::UserDataKey pointer pointer ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -192,7 +192,7 @@
 
 primStatus: scaled_font 
 
-	<cdecl: int32 "cairo_scaled_font_status" ( Cairo::ScaledFont ) >
+	<cdecl: const int32 "cairo_scaled_font_status" ( Cairo::ScaledFont ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -200,7 +200,7 @@
 
 primTextExtents: scaled_font utf8: utf8 extents: extents 
 
-	<cdecl: void "cairo_scaled_font_text_extents" ( Cairo::ScaledFont charPointer Cairo::TextExtents ) >
+	<cdecl: const void "cairo_scaled_font_text_extents" ( Cairo::ScaledFont charPointer Cairo::TextExtents ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
--- a/Cairo__Surface.st	Wed Jun 20 06:37:21 2012 +0000
+++ b/Cairo__Surface.st	Sun Sep 21 00:44:10 2014 +0100
@@ -98,7 +98,7 @@
 
 primCopyPage: surface 
 
-	<cdecl: void "cairo_surface_copy_page" ( Cairo::Surface ) >
+	<cdecl: const void "cairo_surface_copy_page" ( Cairo::Surface ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -106,7 +106,7 @@
 
 primCreateSimilar: other content: content width: width height: height 
 
-	<cdecl: Cairo::Surface "cairo_surface_create_similar" ( Cairo::Surface int32 int32 int32 ) >
+	<cdecl: const Cairo::Surface "cairo_surface_create_similar" ( Cairo::Surface int32 int32 int32 ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -114,7 +114,7 @@
 
 primDestroy: surface 
 
-	<cdecl: void "cairo_surface_destroy" ( Cairo::Surface ) >
+	<cdecl: const void "cairo_surface_destroy" ( Cairo::Surface ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -122,7 +122,7 @@
 
 primFinish: surface 
 
-	<cdecl: void "cairo_surface_finish" ( Cairo::Surface ) >
+	<cdecl: const void "cairo_surface_finish" ( Cairo::Surface ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -130,7 +130,7 @@
 
 primFlush: surface 
 
-	<cdecl: void "cairo_surface_flush" ( Cairo::Surface ) >
+	<cdecl: const void "cairo_surface_flush" ( Cairo::Surface ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -138,7 +138,7 @@
 
 primGetContent: surface 
 
-	<cdecl: int32 "cairo_surface_get_content" ( Cairo::Surface ) >
+	<cdecl: const int32 "cairo_surface_get_content" ( Cairo::Surface ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -146,7 +146,7 @@
 
 primGetDeviceOffset: surface xOffset: x_offset yOffset: y_offset 
 
-	<cdecl: void "cairo_surface_get_device_offset" ( Cairo::Surface pointer pointer ) >
+	<cdecl: const void "cairo_surface_get_device_offset" ( Cairo::Surface pointer pointer ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -154,7 +154,7 @@
 
 primGetFontOptions: surface options: options 
 
-	<cdecl: void "cairo_surface_get_font_options" ( Cairo::Surface Cairo::FontOptions ) >
+	<cdecl: const void "cairo_surface_get_font_options" ( Cairo::Surface Cairo::FontOptions ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -162,7 +162,7 @@
 
 primGetReferenceCount: surface 
 
-	<cdecl: uint32 "cairo_surface_get_reference_count" ( Cairo::Surface ) >
+	<cdecl: const uint32 "cairo_surface_get_reference_count" ( Cairo::Surface ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -170,7 +170,7 @@
 
 primGetType: surface 
 
-	<cdecl: int32 "cairo_surface_get_type" ( Cairo::Surface ) >
+	<cdecl: const int32 "cairo_surface_get_type" ( Cairo::Surface ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -178,7 +178,7 @@
 
 primGetUserData: surface key: key 
 
-	<cdecl: pointer "cairo_surface_get_user_data" ( Cairo::Surface Cairo::UserDataKey ) >
+	<cdecl: const pointer "cairo_surface_get_user_data" ( Cairo::Surface Cairo::UserDataKey ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -186,7 +186,7 @@
 
 primImageSurfaceCreate: format width: width height: height 
 
-	<cdecl: Cairo::Surface "cairo_image_surface_create" ( int32 int32 int32 ) >
+	<cdecl: const Cairo::Surface "cairo_image_surface_create" ( int32 int32 int32 ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -194,7 +194,7 @@
 
 primImageSurfaceCreateForData: data format: format width: width height: height stride: stride 
 
-	<cdecl: Cairo::Surface "cairo_image_surface_create_for_data" ( pointer int32 int32 int32 int32 ) >
+	<cdecl: const Cairo::Surface "cairo_image_surface_create_for_data" ( pointer int32 int32 int32 int32 ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -202,7 +202,7 @@
 
 primImageSurfaceCreateFromPng: filename 
 
-	<cdecl: Cairo::Surface "cairo_image_surface_create_from_png" ( charPointer ) >
+	<cdecl: const Cairo::Surface "cairo_image_surface_create_from_png" ( charPointer ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -210,7 +210,7 @@
 
 primImageSurfaceCreateFromPngStream: read_func closure: closure 
 
-	<cdecl: Cairo::Surface "cairo_image_surface_create_from_png_stream" ( pointer pointer ) >
+	<cdecl: const Cairo::Surface "cairo_image_surface_create_from_png_stream" ( pointer pointer ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -218,7 +218,7 @@
 
 primImageSurfaceGetData: surface 
 
-	<cdecl: pointer "cairo_image_surface_get_data" ( Cairo::Surface ) >
+	<cdecl: const pointer "cairo_image_surface_get_data" ( Cairo::Surface ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -226,7 +226,7 @@
 
 primImageSurfaceGetFormat: surface 
 
-	<cdecl: int32 "cairo_image_surface_get_format" ( Cairo::Surface ) >
+	<cdecl: const int32 "cairo_image_surface_get_format" ( Cairo::Surface ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -234,7 +234,7 @@
 
 primImageSurfaceGetHeight: surface 
 
-	<cdecl: int32 "cairo_image_surface_get_height" ( Cairo::Surface ) >
+	<cdecl: const int32 "cairo_image_surface_get_height" ( Cairo::Surface ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -242,7 +242,7 @@
 
 primImageSurfaceGetStride: surface 
 
-	<cdecl: int32 "cairo_image_surface_get_stride" ( Cairo::Surface ) >
+	<cdecl: const int32 "cairo_image_surface_get_stride" ( Cairo::Surface ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -250,7 +250,7 @@
 
 primImageSurfaceGetWidth: surface 
 
-	<cdecl: int32 "cairo_image_surface_get_width" ( Cairo::Surface ) >
+	<cdecl: const int32 "cairo_image_surface_get_width" ( Cairo::Surface ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -258,7 +258,7 @@
 
 primMarkDirty: surface 
 
-	<cdecl: void "cairo_surface_mark_dirty" ( Cairo::Surface ) >
+	<cdecl: const void "cairo_surface_mark_dirty" ( Cairo::Surface ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -266,7 +266,7 @@
 
 primMarkDirtyRectangle: surface x: x y: y width: width height: height 
 
-	<cdecl: void "cairo_surface_mark_dirty_rectangle" ( Cairo::Surface int32 int32 int32 int32 ) >
+	<cdecl: const void "cairo_surface_mark_dirty_rectangle" ( Cairo::Surface int32 int32 int32 int32 ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -274,7 +274,7 @@
 
 primPdfSurfaceCreate: filename widthInPoints: width_in_points heightInPoints: height_in_points 
 
-	<cdecl: Cairo::Surface "cairo_pdf_surface_create" ( charPointer double double ) >
+	<cdecl: const Cairo::Surface "cairo_pdf_surface_create" ( charPointer double double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -282,7 +282,7 @@
 
 primPdfSurfaceCreateForStream: write_func closure: closure widthInPoints: width_in_points heightInPoints: height_in_points 
 
-	<cdecl: Cairo::Surface "cairo_pdf_surface_create_for_stream" ( pointer pointer double double ) >
+	<cdecl: const Cairo::Surface "cairo_pdf_surface_create_for_stream" ( pointer pointer double double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -290,7 +290,7 @@
 
 primPdfSurfaceSetSize: surface widthInPoints: width_in_points heightInPoints: height_in_points 
 
-	<cdecl: void "cairo_pdf_surface_set_size" ( Cairo::Surface double double ) >
+	<cdecl: const void "cairo_pdf_surface_set_size" ( Cairo::Surface double double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -298,7 +298,7 @@
 
 primReference: surface 
 
-	<cdecl: Cairo::Surface "cairo_surface_reference" ( Cairo::Surface ) >
+	<cdecl: const Cairo::Surface "cairo_surface_reference" ( Cairo::Surface ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -306,7 +306,7 @@
 
 primSetDeviceOffset: surface xOffset: x_offset yOffset: y_offset 
 
-	<cdecl: void "cairo_surface_set_device_offset" ( Cairo::Surface double double ) >
+	<cdecl: const void "cairo_surface_set_device_offset" ( Cairo::Surface double double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -314,7 +314,7 @@
 
 primSetFallbackResolution: surface xPixelsPerInch: x_pixels_per_inch yPixelsPerInch: y_pixels_per_inch 
 
-	<cdecl: void "cairo_surface_set_fallback_resolution" ( Cairo::Surface double double ) >
+	<cdecl: const void "cairo_surface_set_fallback_resolution" ( Cairo::Surface double double ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -322,7 +322,7 @@
 
 primSetUserData: surface key: key userData: user_data destroy: destroy 
 
-	<cdecl: int32 "cairo_surface_set_user_data" ( Cairo::Surface Cairo::UserDataKey pointer pointer ) >
+	<cdecl: const int32 "cairo_surface_set_user_data" ( Cairo::Surface Cairo::UserDataKey pointer pointer ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -330,7 +330,7 @@
 
 primShowPage: surface 
 
-	<cdecl: void "cairo_surface_show_page" ( Cairo::Surface ) >
+	<cdecl: const void "cairo_surface_show_page" ( Cairo::Surface ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -338,7 +338,7 @@
 
 primStatus: surface 
 
-	<cdecl: int32 "cairo_surface_status" ( Cairo::Surface ) >
+	<cdecl: const int32 "cairo_surface_status" ( Cairo::Surface ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -346,7 +346,7 @@
 
 primSvgSurfaceCreate: filename widthInPoints: width_in_points heightInPoints: height_in_points 
 
-	<cdecl: Cairo::Surface "cairo_svg_surface_create" ( charPointer double double ) >
+	<cdecl: const Cairo::Surface "cairo_svg_surface_create" ( charPointer double double ) >
 	self primitiveFailed
 
     "Modified: / 10-07-2008 / 23:05:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -354,7 +354,7 @@
 
 primSvgSurfaceCreateForStream: write_func closure: closure widthInPoints: width_in_points heightInPoints: height_in_points 
 
-	<cdecl: Cairo::Surface "cairo_svg_surface_create_for_stream" ( pointer pointer double double ) >
+	<cdecl: const Cairo::Surface "cairo_svg_surface_create_for_stream" ( pointer pointer double double ) >
 	self primitiveFailed
 
     "Modified: / 10-07-2008 / 23:05:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -362,7 +362,7 @@
 
 primSvgSurfaceRestrictToVersion: surface version: version 
 
-	<cdecl: void "cairo_svg_surface_restrict_to_version" ( Cairo::Surface int32 ) >
+	<cdecl: const void "cairo_svg_surface_restrict_to_version" ( Cairo::Surface int32 ) >
 	self primitiveFailed
 
     "Modified: / 10-07-2008 / 23:05:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -370,7 +370,7 @@
 
 primWriteToPng: surface filename: filename 
 
-	<cdecl: int32 "cairo_surface_write_to_png" ( Cairo::Surface charPointer ) >
+	<cdecl: const int32 "cairo_surface_write_to_png" ( Cairo::Surface charPointer ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -378,7 +378,7 @@
 
 primWriteToPngStream: surface writeFunc: write_func closure: closure 
 
-	<cdecl: int32 "cairo_surface_write_to_png_stream" ( Cairo::Surface pointer pointer ) >
+	<cdecl: const int32 "cairo_surface_write_to_png_stream" ( Cairo::Surface pointer pointer ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -386,7 +386,7 @@
 
 primXlibSurfaceCreate: dpy drawable: drawable visual: visual width: width height: height 
 
-	<cdecl: Cairo::Surface "cairo_xlib_surface_create" ( pointer int32 pointer int32 int32 ) >
+	<cdecl: const Cairo::Surface "cairo_xlib_surface_create" ( pointer int32 pointer int32 int32 ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -394,7 +394,7 @@
 
 primXlibSurfaceCreateForBitmap: dpy bitmap: bitmap screen: screen width: width height: height 
 
-	<cdecl: Cairo::Surface "cairo_xlib_surface_create_for_bitmap" ( pointer int32 pointer int32 int32 ) >
+	<cdecl: const Cairo::Surface "cairo_xlib_surface_create_for_bitmap" ( pointer int32 pointer int32 int32 ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -402,7 +402,7 @@
 
 primXlibSurfaceGetDepth: surface 
 
-	<cdecl: int32 "cairo_xlib_surface_get_depth" ( Cairo::Surface ) >
+	<cdecl: const int32 "cairo_xlib_surface_get_depth" ( Cairo::Surface ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -410,7 +410,7 @@
 
 primXlibSurfaceGetDisplay: surface 
 
-	<cdecl: pointer "cairo_xlib_surface_get_display" ( Cairo::Surface ) >
+	<cdecl: const pointer "cairo_xlib_surface_get_display" ( Cairo::Surface ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -418,7 +418,7 @@
 
 primXlibSurfaceGetDrawable: surface 
 
-	<cdecl: int32 "cairo_xlib_surface_get_drawable" ( Cairo::Surface ) >
+	<cdecl: const int32 "cairo_xlib_surface_get_drawable" ( Cairo::Surface ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -426,7 +426,7 @@
 
 primXlibSurfaceGetGc: surface 
 
-	<cdecl: pointer "cairo_xlib_surface_get_gc" ( Cairo::Surface ) >
+	<cdecl: const pointer "cairo_xlib_surface_get_gc" ( Cairo::Surface ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -434,7 +434,7 @@
 
 primXlibSurfaceGetHeight: surface 
 
-	<cdecl: int32 "cairo_xlib_surface_get_height" ( Cairo::Surface ) >
+	<cdecl: const int32 "cairo_xlib_surface_get_height" ( Cairo::Surface ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -442,7 +442,7 @@
 
 primXlibSurfaceGetScreen: surface 
 
-	<cdecl: pointer "cairo_xlib_surface_get_screen" ( Cairo::Surface ) >
+	<cdecl: const pointer "cairo_xlib_surface_get_screen" ( Cairo::Surface ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -450,7 +450,7 @@
 
 primXlibSurfaceGetVisual: surface 
 
-	<cdecl: pointer "cairo_xlib_surface_get_visual" ( Cairo::Surface ) >
+	<cdecl: const pointer "cairo_xlib_surface_get_visual" ( Cairo::Surface ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -458,7 +458,7 @@
 
 primXlibSurfaceGetWidth: surface 
 
-	<cdecl: int32 "cairo_xlib_surface_get_width" ( Cairo::Surface ) >
+	<cdecl: const int32 "cairo_xlib_surface_get_width" ( Cairo::Surface ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -466,7 +466,7 @@
 
 primXlibSurfaceSetDrawable: surface drawable: drawable width: width height: height 
 
-	<cdecl: void "cairo_xlib_surface_set_drawable" ( Cairo::Surface int32 int32 int32 ) >
+	<cdecl: const void "cairo_xlib_surface_set_drawable" ( Cairo::Surface int32 int32 int32 ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -474,7 +474,7 @@
 
 primXlibSurfaceSetSize: surface width: width height: height 
 
-	<cdecl: void "cairo_xlib_surface_set_size" ( Cairo::Surface int32 int32 ) >
+	<cdecl: const void "cairo_xlib_surface_set_size" ( Cairo::Surface int32 int32 ) >
 	self primitiveFailed
 
     "Modified: / 10-09-2008 / 18:19:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
--- a/Make.proto	Wed Jun 20 06:37:21 2012 +0000
+++ b/Make.proto	Sun Sep 21 00:44:10 2014 +0100
@@ -63,7 +63,7 @@
 
 all:: preMake classLibRule postMake
 
-pre_objs::  
+pre_objs::
 
 
 
@@ -78,13 +78,13 @@
 		echo -n exported > .svnversion; \
 	fi
 
-stx_goodies_libcairo.o: stx_goodies_libcairo.st .svnversion 
+stx_goodies_libcairo.o: stx_goodies_libcairo.st .svnversion
 	if [ -d .svn ]; then \
 		rev2="$(shell printf "%-16s" $$(cat .svnversion))"; \
 		sed -e "s/\"\$$SVN\-Revision:\".*\"\$$\"/\"\$$SVN-Revision:\"\'$$rev2\'\"\$$\"/g" $< > .stx_goodies_libcairo.svn.st; \
 	fi
 	$(MAKE) CC="$(CLASSLIB_CC)" OPT="$(OPT)" SEPINITCODE="$(SEPINITCODE)" STC="$(STC)" STFILE=.stx_goodies_libcairo.svn $(O_RULE);
-	mv .stx_goodies_libcairo.svn.$(O) stx_goodies_libcairo.$(O) 
+	mv .stx_goodies_libcairo.svn.$(O) stx_goodies_libcairo.$(O)
 endif
 
 
@@ -161,7 +161,7 @@
 $(OUTDIR)Cairo__Pattern.$(O) Cairo__Pattern.$(H): Cairo__Pattern.st $(INCLUDE_TOP)/stx/goodies/libcairo/Cairo__RefCountedStructure.$(H) $(INCLUDE_TOP)/stx/libbasic/ExternalStructure.$(H) $(INCLUDE_TOP)/stx/libbasic/ExternalBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)Cairo__ScaledFont.$(O) Cairo__ScaledFont.$(H): Cairo__ScaledFont.st $(INCLUDE_TOP)/stx/goodies/libcairo/Cairo__RefCountedStructure.$(H) $(INCLUDE_TOP)/stx/libbasic/ExternalStructure.$(H) $(INCLUDE_TOP)/stx/libbasic/ExternalBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)Cairo__Surface.$(O) Cairo__Surface.$(H): Cairo__Surface.st $(INCLUDE_TOP)/stx/goodies/libcairo/Cairo__SurfaceType.$(H) $(INCLUDE_TOP)/stx/goodies/libcairo/Cairo__RefCountedStructure.$(H) $(INCLUDE_TOP)/stx/libbasic/ExternalStructure.$(H) $(INCLUDE_TOP)/stx/libbasic/ExternalBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsDevice.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/XWorkstation.$(H) $(INCLUDE_TOP)/stx/libview/DeviceWorkstation.$(H) $(INCLUDE_TOP)/stx/libview/HostGraphicsDevice.$(H) $(INCLUDE_TOP)/nil/Cairo.$(H) $(INCLUDE_TOP)/stx/libbasic/NameSpace.$(H) $(STCHDR)
+$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsDevice.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/XWorkstation.$(H) $(INCLUDE_TOP)/stx/libview/DeviceWorkstation.$(H) $(INCLUDE_TOP)/stx/libview/HostGraphicsDevice.$(H)  $(INCLUDE_TOP)/stx/libbasic/NameSpace.$(H) $(STCHDR)
 
 # ENDMAKEDEPEND --- do not remove this line
 
--- a/extensions.st	Wed Jun 20 06:37:21 2012 +0000
+++ b/extensions.st	Sun Sep 21 00:44:10 2014 +0100
@@ -1,6 +1,6 @@
 "{ Package: 'stx:goodies/libcairo' }"!
 
-!Cairo class methodsFor:'accessing'!
+!Cairo::GraphicsContext class methodsFor:'x-accessing'!
 
 libraryName
 
@@ -13,57 +13,57 @@
     "Created: / 10-09-2008 / 19:29:18 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
-!Cairo class methodsFor:'primitives'!
+!Cairo::GraphicsContext class methodsFor:'x-primitives'!
 
 primDebugResetStaticData
 
-	<cdecl: void "cairo_debug_reset_static_data" ( ) >
+	<cdecl: const void "cairo_debug_reset_static_data" ( ) >
 	self primitiveFailed
 
     "Created: / 10-09-2008 / 19:08:49 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
-!Cairo class methodsFor:'primitives'!
+!Cairo::GraphicsContext class methodsFor:'x-primitives'!
 
 primFormatStrideForWidth: format width: width
 
-	<cdecl: int32 "cairo_format_stride_for_width" ( int32 int32 ) >
+	<cdecl: const int32 "cairo_format_stride_for_width" ( int32 int32 ) >
 	self primitiveFailed
 
     "Created: / 10-09-2008 / 19:08:49 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
-!Cairo class methodsFor:'primitives'!
+!Cairo::GraphicsContext class methodsFor:'x-primitives'!
 
 primStatusToString: status
 
-	<cdecl: charPointer "cairo_status_to_string" ( int32 ) >
+	<cdecl: const charPointer "cairo_status_to_string" ( int32 ) >
 	self primitiveFailed
 
     "Created: / 10-09-2008 / 19:08:50 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
-!Cairo class methodsFor:'primitives'!
+!Cairo::GraphicsContext class methodsFor:'x-primitives'!
 
 primVersion
 
-	<cdecl: int32 "cairo_version" ( ) >
+	<cdecl: const int32 "cairo_version" ( ) >
 	self primitiveFailed
 
     "Created: / 10-09-2008 / 19:08:50 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
-!Cairo class methodsFor:'primitives'!
+!Cairo::GraphicsContext class methodsFor:'x-primitives'!
 
 primVersionString
 
-	<cdecl: charPointer "cairo_version_string" ( ) >
+	<cdecl: const charPointer "cairo_version_string" ( ) >
 	self primitiveFailed
 
     "Created: / 10-09-2008 / 19:08:50 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
-!Cairo class methodsFor:'accessing'!
+!Cairo::GraphicsContext class methodsFor:'x-accessing'!
 
 statusToString: status
 
@@ -72,7 +72,7 @@
     "Created: / 10-09-2008 / 19:33:31 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
-!Cairo class methodsFor:'accessing'!
+!Cairo::GraphicsContext class methodsFor:'x-accessing'!
 
 version
 
@@ -81,7 +81,7 @@
     "Created: / 10-09-2008 / 19:32:34 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
-!Cairo class methodsFor:'accessing'!
+!Cairo::GraphicsContext class methodsFor:'x-accessing'!
 
 versionString
 
@@ -157,4 +157,4 @@
 
 extensionsVersion_SVN
     ^ '$Id::                                                                                                                        $'
-! !
\ No newline at end of file
+! !