- stx_goodies_libcairo
authorJan Vrany <jan.vrany@fit.cvut.cz>
Sun, 17 Jun 2012 07:04:40 +0000
changeset 15 c1db2c8aa2ed
parent 14 142818deac55
child 16 a810555a635c
- stx_goodies_libcairo changed: #classNamesAndAttributes #extensionMethodNames #preRequisites - Cairo::Surface added: #finish - Cairo::ClockView added: #initialize #new #redraw #version_SVN - Cairo::GraphicsContext added: #showPage - extensions ...
Cairo__ClockView.st
Cairo__GraphicsContext.st
Cairo__Surface.st
Make.proto
Make.spec
abbrev.stc
bc.mak
libInit.cc
libcairo.rc
stx_goodies_libcairo.st
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Cairo__ClockView.st	Sun Jun 17 07:04:40 2012 +0000
@@ -0,0 +1,46 @@
+"{ Package: 'stx:goodies/libcairo' }"
+
+"{ NameSpace: Cairo }"
+
+SimpleView subclass:#ClockView
+	instanceVariableNames:'cr'
+	classVariableNames:''
+	poolDictionaries:''
+	category:'Cairo-Examples'
+!
+
+
+!ClockView class methodsFor:'instance creation'!
+
+new
+    "return an initialized instance"
+
+    ^ self basicNew initialize.
+! !
+
+!ClockView methodsFor:'redrawing'!
+
+redraw
+
+    cr isNil ifTrue:[cr := self cairo].
+
+    cr paint: Color black.
+    cr moveToX: 30 y: 50.
+    cr fontFaceFamily: 'Times' slant: (Cairo::FontSlant FONT_SLANT_ITALIC) weight: 2.
+    cr fontSize: 30.
+    cr showText: 'Cairo in Smalltalk/X'.
+    cr paint: (Color red alpha: 0.5).
+    cr rectangleX: 10 y: 15 width: 150 height: 60.
+    cr fill.
+    cr paint: (Color red alpha: 0.75).
+    cr rectangleX: 10 y: 15 width: 150 height: 60.
+    cr stroke.
+
+    "Created: / 16-06-2012 / 23:25:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!ClockView class methodsFor:'documentation'!
+
+version_SVN
+    ^ '$Id::                                                                                                                        $'
+! !
--- a/Cairo__GraphicsContext.st	Sat Jun 16 06:58:56 2012 +0000
+++ b/Cairo__GraphicsContext.st	Sun Jun 17 07:04:40 2012 +0000
@@ -1041,6 +1041,14 @@
     "Created: / 10-07-2008 / 09:42:50 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
+showPage
+    "Makes sense only for PDF surfaces"
+
+    ^self class primShowPage: self.
+
+    "Created: / 17-06-2012 / 08:44:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 stroke
 
     ^self class primStroke: self
--- a/Cairo__Surface.st	Sat Jun 16 06:58:56 2012 +0000
+++ b/Cairo__Surface.st	Sun Jun 17 07:04:40 2012 +0000
@@ -521,6 +521,13 @@
 
 !Surface methodsFor:'initialization & release'!
 
+finish
+
+    ^self class primFinish: self
+
+    "Created: / 17-06-2012 / 08:49:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 flush
 
     ^self class primFlush: self
--- a/Make.proto	Sat Jun 16 06:58:56 2012 +0000
+++ b/Make.proto	Sun Jun 17 07:04:40 2012 +0000
@@ -122,6 +122,7 @@
 
 # BEGINMAKEDEPEND --- do not remove this line; make depend needs it
 $(OUTDIR)Cairo__Antialias.$(O) Cairo__Antialias.$(H): Cairo__Antialias.st $(INCLUDE_TOP)/stx/libbasic/SharedPool.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)Cairo__ClockView.$(O) Cairo__ClockView.$(H): Cairo__ClockView.st $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)Cairo__Content.$(O) Cairo__Content.$(H): Cairo__Content.st $(INCLUDE_TOP)/stx/libbasic/SharedPool.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)Cairo__Extend.$(O) Cairo__Extend.$(H): Cairo__Extend.st $(INCLUDE_TOP)/stx/libbasic/SharedPool.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)Cairo__FillRule.$(O) Cairo__FillRule.$(H): Cairo__FillRule.st $(INCLUDE_TOP)/stx/libbasic/SharedPool.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
--- a/Make.spec	Sat Jun 16 06:58:56 2012 +0000
+++ b/Make.spec	Sun Jun 17 07:04:40 2012 +0000
@@ -88,6 +88,7 @@
 	Cairo::Pattern \
 	Cairo::ScaledFont \
 	Cairo::Surface \
+	Cairo::ClockView \
 
 
 
@@ -131,6 +132,7 @@
     $(OUTDIR)Cairo__Pattern.$(O) \
     $(OUTDIR)Cairo__ScaledFont.$(O) \
     $(OUTDIR)Cairo__Surface.$(O) \
+    $(OUTDIR)Cairo__ClockView.$(O) \
     $(OUTDIR)extensions.$(O) \
 
 
--- a/abbrev.stc	Sat Jun 16 06:58:56 2012 +0000
+++ b/abbrev.stc	Sun Jun 17 07:04:40 2012 +0000
@@ -39,3 +39,4 @@
 Cairo::Pattern Cairo__Pattern stx:goodies/libcairo 'Cairo-Objects' 1
 Cairo::ScaledFont Cairo__ScaledFont stx:goodies/libcairo 'Cairo-Objects' 1
 Cairo::Surface Cairo__Surface stx:goodies/libcairo 'Cairo-Objects' 1
+Cairo::ClockView Cairo__ClockView stx:goodies/libcairo 'Cairo-Examples' 2
--- a/bc.mak	Sat Jun 16 06:58:56 2012 +0000
+++ b/bc.mak	Sun Jun 17 07:04:40 2012 +0000
@@ -61,6 +61,7 @@
 
 # BEGINMAKEDEPEND --- do not remove this line; make depend needs it
 $(OUTDIR)Cairo__Antialias.$(O) Cairo__Antialias.$(H): Cairo__Antialias.st $(INCLUDE_TOP)\stx\libbasic\SharedPool.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)Cairo__ClockView.$(O) Cairo__ClockView.$(H): Cairo__ClockView.st $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)Cairo__Content.$(O) Cairo__Content.$(H): Cairo__Content.st $(INCLUDE_TOP)\stx\libbasic\SharedPool.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)Cairo__Extend.$(O) Cairo__Extend.$(H): Cairo__Extend.st $(INCLUDE_TOP)\stx\libbasic\SharedPool.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)Cairo__FillRule.$(O) Cairo__FillRule.$(H): Cairo__FillRule.st $(INCLUDE_TOP)\stx\libbasic\SharedPool.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
--- a/libInit.cc	Sat Jun 16 06:58:56 2012 +0000
+++ b/libInit.cc	Sun Jun 17 07:04:40 2012 +0000
@@ -28,6 +28,7 @@
 OBJ snd; struct __vmData__ *__pRT__; {
 __BEGIN_PACKAGE2__("libstx_goodies_libcairo", _libstx_goodies_libcairo_Init, "stx:goodies/libcairo");
 _Cairo__Antialias_Init(pass,__pRT__,snd);
+_Cairo__ClockView_Init(pass,__pRT__,snd);
 _Cairo__Content_Init(pass,__pRT__,snd);
 _Cairo__Extend_Init(pass,__pRT__,snd);
 _Cairo__FillRule_Init(pass,__pRT__,snd);
--- a/libcairo.rc	Sat Jun 16 06:58:56 2012 +0000
+++ b/libcairo.rc	Sun Jun 17 07:04:40 2012 +0000
@@ -3,7 +3,7 @@
 // automagically generated from the projectDefinition: stx_goodies_libcairo.
 //
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION     6,2,14,14
+  FILEVERSION     6,2,16,16
   PRODUCTVERSION  6,2,1,1
 #if (__BORLANDC__)
   FILEFLAGSMASK   VS_FF_DEBUG | VS_FF_PRERELEASE
@@ -20,12 +20,12 @@
     BEGIN
       VALUE "CompanyName", "CTU FEI\0"
       VALUE "FileDescription", "Cairo bindings (http://www.cairographics.org) (LIB)\0"
-      VALUE "FileVersion", "6.2.14.14\0"
+      VALUE "FileVersion", "6.2.16.16\0"
       VALUE "InternalName", "stx:goodies/libcairo\0"
       VALUE "LegalCopyright", "Copyright Jan Vrany 2008\0"
       VALUE "ProductName", "Cairo\0"
       VALUE "ProductVersion", "6.2.1.1\0"
-      VALUE "ProductDate", "Sat, 16 Jun 2012 07:02:23 GMT\0"
+      VALUE "ProductDate", "Sun, 17 Jun 2012 07:08:20 GMT\0"
     END
 
   END
--- a/stx_goodies_libcairo.st	Sat Jun 16 06:58:56 2012 +0000
+++ b/stx_goodies_libcairo.st	Sun Jun 17 07:04:40 2012 +0000
@@ -49,8 +49,8 @@
      exclude individual packages in the #excludedFromPrerequisites method."
 
     ^ #(
-        #'stx:libbasic'    "Collection - superclass of Cairo::Matrix "
-        #'stx:libview'    "DeviceGraphicsContext - superclass of extended SimpleView "
+        #'stx:libbasic'    "SequenceableCollection - superclass of Cairo::Path "
+        #'stx:libview'    "GraphicsMedium - superclass of Cairo::ClockView "
     )
 ! !
 
@@ -102,6 +102,7 @@
         #'Cairo::Pattern'
         #'Cairo::ScaledFont'
         #'Cairo::Surface'
+        #'Cairo::ClockView'
     )
 !