gtk2hs-commit — Mailing list for Darcs commit messages.

[Gtk2hs-commit] gtk2hs ChangeLog,1.453,1.454 Makefile.am,1.68,1.69

[Axel S. <as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28511

Modified Files:
	ChangeLog Makefile.am 
Log Message:
Add a comment on why make clean builds dependencies.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- Makefile.am	8 Apr 2005 12:10:32 -0000	1.68
+++ Makefile.am	8 Apr 2005 16:00:40 -0000	1.69
@@ -1,6 +1,20 @@
 AUTOMAKE_OPTIONS = 1.8 foreign subdir-objects
 SUFFIXES = .hs.uncpp .chs.pp .chs .hsc .deps .dep
 MOSTLYCLEANFILES = */*.deps.bak tools/*/*.deps.bak
+
+# Note about running "make clean" and dependencies: It would be nice if
+# "make clean" would clear all dependency files. However, this turns out
+# to be a bad idea since cleaning the dependencies mean rebuilding them
+# if "make clean" is run again. They shouldn't be rebuilt in the first
+# place but that can only be done by not -including the dependency files.
+# Unfortunately, automake chokes if we try to use GNU make conditionals.
+# We cannot incorporate the conditionals into the dependency building
+# rules .deps and .dep in mk/common.mk either since that triggers the
+# rebuild of the typeGen and hierarchyGen every second time we run
+# a "make clean" that wipes dependencies. Hence we only wipe dependencies
+# on "make distclean" and hope that nobody notices that dependencies are
+# built when running "make clean" on a clean tree.
+
 CLEANFILES =
 DISTCLEANFILES = */*.precomp
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.453
retrieving revision 1.454
diff -u -d -r1.453 -r1.454
--- ChangeLog	8 Apr 2005 14:42:20 -0000	1.453
+++ ChangeLog	8 Apr 2005 16:00:40 -0000	1.454
@@ -34,6 +34,9 @@
 
 2005-04-08 Axel Simon <A....@ke...>
 
+	* Makefile.am: Add a comment on why make clean builds
+	dependencies.
+	
 	* gtk/Graphics/UI/Gtk/Buttons/Button.chs.pp,
 	gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs.pp,
 	gtk/Graphics/UI/Gtk/Multiline/TextView.chs.pp,

[Gtk2hs-commit] gtk2hs/gtk/Graphics/UI/Gtk/MenuComboToolbar Combo.chs.pp,1.5,1.6

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/MenuComboToolbar
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17325/gtk/Graphics/UI/Gtk/MenuComboToolbar

Modified Files:
	Combo.chs.pp 
Log Message:
Fix compilation with DISABLE_DEPRECATED.


Index: Combo.chs.pp
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/MenuComboToolbar/Combo.chs.pp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Combo.chs.pp	2 Apr 2005 16:52:49 -0000	1.5
+++ Combo.chs.pp	8 Apr 2005 14:42:22 -0000	1.6
@@ -92,7 +92,10 @@
 import Graphics.UI.Gtk.Abstract.Container	(containerAdd)
 {#import Graphics.UI.Gtk.Types#}
 {#import Graphics.UI.Gtk.Signals#}
+
+#ifndef DISABLE_DEPRECATED
 import Graphics.UI.Gtk.General.Structs		(comboGetList)
+#endif
 
 {# context lib="gtk" prefix="gtk" #}
 

[Gtk2hs-commit] gtk2hs/gtk/Graphics/UI/Gtk/Misc Calendar.chs.pp,1.5,1.6

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17325/gtk/Graphics/UI/Gtk/Misc

Modified Files:
	Calendar.chs.pp 
Log Message:
Fix compilation with DISABLE_DEPRECATED.


Index: Calendar.chs.pp
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Misc/Calendar.chs.pp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Calendar.chs.pp	2 Apr 2005 18:55:23 -0000	1.5
+++ Calendar.chs.pp	8 Apr 2005 14:42:22 -0000	1.6
@@ -73,7 +73,9 @@
   calendarMarkDay,
   calendarUnmarkDay,
   calendarClearMarks,
+#ifndef DISABLE_DEPRECATED
   calendarDisplayOptions,
+#endif
 #if GTK_CHECK_VERSION(2,4,0)
   calendarSetDisplayOptions,
   calendarGetDisplayOptions,

[Gtk2hs-commit] gtk2hs ChangeLog,1.452,1.453

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17325

Modified Files:
	ChangeLog 
Log Message:
Fix compilation with DISABLE_DEPRECATED.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.452
retrieving revision 1.453
diff -u -d -r1.452 -r1.453
--- ChangeLog	8 Apr 2005 14:21:52 -0000	1.452
+++ ChangeLog	8 Apr 2005 14:42:20 -0000	1.453
@@ -28,6 +28,10 @@
 	trivial	change so that these modules are exactly the same as those
 	produced by the code generator!
 
+	* gtk/Graphics/UI/Gtk/Misc/Calendar.chs.pp,
+	gtk/Graphics/UI/Gtk/MenuComboToolbar/Combo.chs.pp: fix compilation
+	with DISABLE_DEPRECATED.
+
 2005-04-08 Axel Simon <A....@ke...>
 
 	* gtk/Graphics/UI/Gtk/Buttons/Button.chs.pp,

[Gtk2hs-commit] gtk2hs/gtk/Graphics/UI/Gtk/Windows Window.chs.pp,1.7,1.8

[Axel S. <as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Windows
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6688/gtk/Graphics/UI/Gtk/Windows

Modified Files:
	Window.chs.pp 
Log Message:
Corrected conditional compilation so that it compiles with Gtk 2.4


Index: Window.chs.pp
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Windows/Window.chs.pp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Window.chs.pp	7 Apr 2005 00:50:32 -0000	1.7
+++ Window.chs.pp	8 Apr 2005 14:21:53 -0000	1.8
@@ -143,6 +143,17 @@
 
 -- * Properties
   windowResizable,
+  windowModal,
+  windowDestroyWithParent,
+  windowIcon,
+  windowScreen,
+  windowTypeHint,
+  windowSkipTaskbarHint,
+  windowSkipPagerHint,
+  windowAcceptFocus,
+#if GTK_CHECK_VERSION(2,6,0)
+  windowFocusOnMap,
+#endif
 
 -- * Signals
   onFrameEvent,
@@ -1325,6 +1336,7 @@
   windowGetAcceptFocus
   windowSetAcceptFocus
 
+#if GTK_CHECK_VERSION(2,6,0)
 -- | @True@ if the window should receive the input focus when mapped.
 --
 -- Default value: @True@
@@ -1333,6 +1345,7 @@
 windowFocusOnMap = Attr 
   windowGetFocusOnMap
   windowSetFocusOnMap
+#endif
 
 #if GTK_CHECK_VERSION(2,4,0)
 -- | Whether the window should be decorated by the window manager.

[Gtk2hs-commit] gtk2hs/tools/hierarchyGen hierarchy.list,1.16,1.17

[Axel S. <as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/tools/hierarchyGen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6688/tools/hierarchyGen

Modified Files:
	hierarchy.list 
Log Message:
Corrected conditional compilation so that it compiles with Gtk 2.4


Index: hierarchy.list
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/tools/hierarchyGen/hierarchy.list,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- hierarchy.list	6 Apr 2005 20:14:22 -0000	1.16
+++ hierarchy.list	8 Apr 2005 14:21:53 -0000	1.17
@@ -56,8 +56,8 @@
                             GtkToggleButton
                                 GtkCheckButton
                                     GtkRadioButton
-                            GtkColorButton		if gtk-2.6
-                            GtkFontButton		if gtk-2.6
+                            GtkColorButton		if gtk-2.4
+                            GtkFontButton		if gtk-2.4
                             GtkOptionMenu		if deprecated
                         GtkItem
                             GtkMenuItem

[Gtk2hs-commit] gtk2hs ChangeLog,1.451,1.452

[Axel S. <as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6688

Modified Files:
	ChangeLog 
Log Message:
Corrected conditional compilation so that it compiles with Gtk 2.4


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.451
retrieving revision 1.452
diff -u -d -r1.451 -r1.452
--- ChangeLog	8 Apr 2005 14:14:59 -0000	1.451
+++ ChangeLog	8 Apr 2005 14:21:52 -0000	1.452
@@ -31,8 +31,11 @@
 2005-04-08 Axel Simon <A....@ke...>
 
 	* gtk/Graphics/UI/Gtk/Buttons/Button.chs.pp,
-	gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs.pp: Make it
-	compile with Gtk 2.4 headers.
+	gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs.pp,
+	gtk/Graphics/UI/Gtk/Multiline/TextView.chs.pp,
+	gtk/Graphics/UI/Gtk/Windows/Window.chs.pp,
+	tools/hierarchyGen/hierarchy.list: Corrected conditional
+	compilation so that it compiles with Gtk 2.4.
 	
 2005-04-7 Duncan Coutts <du...@co...>
 

[Gtk2hs-commit] gtk2hs/gtk/Graphics/UI/Gtk/Multiline TextView.chs.pp,1.2,1.3

[Axel S. <as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Multiline
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6688/gtk/Graphics/UI/Gtk/Multiline

Modified Files:
	TextView.chs.pp 
Log Message:
Corrected conditional compilation so that it compiles with Gtk 2.4


Index: TextView.chs.pp
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Multiline/TextView.chs.pp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- TextView.chs.pp	7 Apr 2005 00:50:31 -0000	1.2
+++ TextView.chs.pp	8 Apr 2005 14:21:53 -0000	1.3
@@ -126,7 +126,9 @@
   textViewGetDefaultAttributes,
   textViewGetVisibleRect,
   textViewGetIterLocation,
+#if GTK_CHECK_VERSION(2,6,0)
   textViewGetIterAtPosition,
+#endif
 #if GTK_CHECK_VERSION(2,4,0)
   textViewSetOverwrite,
   textViewGetOverwrite,

[Gtk2hs-commit] gtk2hs ChangeLog,1.450,1.451

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2392

Modified Files:
	ChangeLog 
Log Message:
Just for fun, last trivial change so that these modules are exactly the same as
those produced by the code generator!		


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.450
retrieving revision 1.451
diff -u -d -r1.450 -r1.451
--- ChangeLog	8 Apr 2005 14:00:46 -0000	1.450
+++ ChangeLog	8 Apr 2005 14:14:59 -0000	1.451
@@ -10,11 +10,24 @@
 
 	* glib/System/Glib/FFI.hs, tools/hierarchyGen/TypeGen.hs,
 	tools/hierarchyGen/Hierarchy.chs.template,
+	gtk/Graphics/UI/Gtk/General/Structs.hsc,
 	mogul/Graphics/UI/Gtk/Mogul/WidgetTable.hs,
 	sourceview/Graphics/UI/Gtk/SourceView/SourceTagTable.chs: change use
 	of foreignPtrToPtr to unsafeForeignPtrToPtr and provide backwards
 	compatability for GHC pre-6.2.
 
+	* gtk/Graphics/UI/Gtk/Entry/HScale.chs,
+	gtk/Graphics/UI/Gtk/Layout/HBox.chs,
+	gtk/Graphics/UI/Gtk/Layout/HButtonBox.chs,
+	gtk/Graphics/UI/Gtk/Layout/HPaned.chs,
+	gtk/Graphics/UI/Gtk/Layout/VBox.chs,
+	gtk/Graphics/UI/Gtk/Layout/VButtonBox.chs,
+	gtk/Graphics/UI/Gtk/Layout/VPaned.chs,
+	gtk/Graphics/UI/Gtk/Ornaments/HSeparator.chs,
+	gtk/Graphics/UI/Gtk/Ornaments/VSeparator.chs: just for fun, last
+	trivial	change so that these modules are exactly the same as those
+	produced by the code generator!
+
 2005-04-08 Axel Simon <A....@ke...>
 
 	* gtk/Graphics/UI/Gtk/Buttons/Button.chs.pp,

[Gtk2hs-commit] gtk2hs/gtk/Graphics/UI/Gtk/Entry HScale.chs,1.5,1.6

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Entry
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2392/gtk/Graphics/UI/Gtk/Entry

Modified Files:
	HScale.chs 
Log Message:
Just for fun, last trivial change so that these modules are exactly the same as
those produced by the code generator!		


Index: HScale.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Entry/HScale.chs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- HScale.chs	2 Apr 2005 19:22:04 -0000	1.5
+++ HScale.chs	8 Apr 2005 14:15:00 -0000	1.6
@@ -53,7 +53,7 @@
 
 -- * Constructors
   hScaleNew,
-  hScaleNewWithRange
+  hScaleNewWithRange,
   ) where
 
 import Monad	(liftM)

[Gtk2hs-commit] gtk2hs/gtk/Graphics/UI/Gtk/Layout HBox.chs,1.4,1.5 HButtonBox.chs,1.3,1.4 HPaned.chs,1.4,1.5 VBox.chs,1.4,1.5 VButtonBox.chs,1.3,1.4 VPaned.chs,1.4,1.5

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Layout
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2392/gtk/Graphics/UI/Gtk/Layout

Modified Files:
	HBox.chs HButtonBox.chs HPaned.chs VBox.chs VButtonBox.chs 
	VPaned.chs 
Log Message:
Just for fun, last trivial change so that these modules are exactly the same as
those produced by the code generator!		


Index: VBox.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Layout/VBox.chs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- VBox.chs	24 Mar 2005 17:31:00 -0000	1.4
+++ VBox.chs	8 Apr 2005 14:15:16 -0000	1.5
@@ -57,7 +57,7 @@
   castToVBox,
 
 -- * Constructors
-  vBoxNew
+  vBoxNew,
   ) where
 
 import Monad	(liftM)

Index: HButtonBox.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Layout/HButtonBox.chs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- HButtonBox.chs	24 Mar 2005 17:31:00 -0000	1.3
+++ HButtonBox.chs	8 Apr 2005 14:15:00 -0000	1.4
@@ -63,7 +63,7 @@
   castToHButtonBox,
 
 -- * Constructors
-  hButtonBoxNew
+  hButtonBoxNew,
   ) where
 
 import Monad (liftM)

Index: VPaned.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Layout/VPaned.chs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- VPaned.chs	24 Mar 2005 17:31:00 -0000	1.4
+++ VPaned.chs	8 Apr 2005 14:15:16 -0000	1.5
@@ -50,7 +50,7 @@
   castToVPaned,
 
 -- * Constructors
-  vPanedNew
+  vPanedNew,
   ) where
 
 import Monad	(liftM)

Index: HPaned.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Layout/HPaned.chs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- HPaned.chs	24 Mar 2005 17:31:00 -0000	1.4
+++ HPaned.chs	8 Apr 2005 14:15:16 -0000	1.5
@@ -50,7 +50,7 @@
   castToHPaned,
 
 -- * Constructors
-  hPanedNew
+  hPanedNew,
   ) where
 
 import Monad	(liftM)

Index: HBox.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Layout/HBox.chs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- HBox.chs	24 Mar 2005 17:30:59 -0000	1.4
+++ HBox.chs	8 Apr 2005 14:15:00 -0000	1.5
@@ -56,7 +56,7 @@
   castToHBox,
 
 -- * Constructors
-  hBoxNew
+  hBoxNew,
   ) where
 
 import Monad	(liftM)

Index: VButtonBox.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Layout/VButtonBox.chs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- VButtonBox.chs	24 Mar 2005 17:31:00 -0000	1.3
+++ VButtonBox.chs	8 Apr 2005 14:15:16 -0000	1.4
@@ -63,7 +63,7 @@
   castToVButtonBox,
 
 -- * Constructors
-  vButtonBoxNew
+  vButtonBoxNew,
   ) where
 
 import Monad (liftM)

[Gtk2hs-commit] gtk2hs/gtk/Graphics/UI/Gtk/Ornaments HSeparator.chs,1.4,1.5 VSeparator.chs,1.4,1.5

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Ornaments
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2392/gtk/Graphics/UI/Gtk/Ornaments

Modified Files:
	HSeparator.chs VSeparator.chs 
Log Message:
Just for fun, last trivial change so that these modules are exactly the same as
those produced by the code generator!		


Index: HSeparator.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Ornaments/HSeparator.chs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- HSeparator.chs	24 Mar 2005 15:21:09 -0000	1.4
+++ HSeparator.chs	8 Apr 2005 14:15:17 -0000	1.5
@@ -49,7 +49,7 @@
   castToHSeparator,
 
 -- * Constructors
-  hSeparatorNew
+  hSeparatorNew,
   ) where
 
 import Monad	(liftM)

Index: VSeparator.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Ornaments/VSeparator.chs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- VSeparator.chs	24 Mar 2005 15:21:09 -0000	1.4
+++ VSeparator.chs	8 Apr 2005 14:15:17 -0000	1.5
@@ -49,7 +49,7 @@
   castToVSeparator,
 
 -- * Constructors
-  vSeparatorNew
+  vSeparatorNew,
   ) where
 
 import Monad	(liftM)

[Gtk2hs-commit] gtk2hs/gtk/Graphics/UI/Gtk/General Structs.hsc,1.3,1.4

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/General
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30003/gtk/Graphics/UI/Gtk/General

Modified Files:
	Structs.hsc 
Log Message:
Change use of foreignPtrToPtr to unsafeForeignPtrToPtr and provide backwards
compatability for GHC pre-6.2.


Index: Structs.hsc
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/General/Structs.hsc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Structs.hsc	15 Mar 2005 20:33:46 -0000	1.3
+++ Structs.hsc	8 Apr 2005 14:05:55 -0000	1.4
@@ -164,24 +164,12 @@
     gdkColormapAllocColor cPtr ptr 0 1
     return ()
 
-#if __GLASGOW_HASKELL__>=504
-
 foreign import ccall unsafe "gdk_colormap_get_system"
   gdkColormapGetSystem :: IO (Ptr ())
 
 foreign import ccall unsafe "gdk_colormap_alloc_color"
   gdkColormapAllocColor :: Ptr () -> Ptr Color -> CInt -> CInt -> IO CInt
 
-#else
-
-foreign import ccall "gdk_colormap_get_system" unsafe
-  gdkColormapGetSystem :: IO (Ptr ())
-
-foreign import ccall "gdk_colormap_alloc_color" unsafe
-  gdkColormapAllocColor :: Ptr () -> Ptr Color -> CInt -> CInt -> IO CInt
-
-#endif
-
 -- entry GC
 
 -- | Intermediate data structure for 'GC's.
@@ -303,13 +291,13 @@
       (fromIntegral (fromEnum fill_):: #{type GdkFill})
     add r #{const GDK_GC_TILE} $
       #{poke GdkGCValues, tile} ptr $
-        maybe nullPtr (foreignPtrToPtr.unPixmap) tile_
+        maybe nullPtr (unsafeForeignPtrToPtr.unPixmap) tile_
     add r #{const GDK_GC_STIPPLE} $
       #{poke GdkGCValues, stipple} ptr $
-        maybe nullPtr (foreignPtrToPtr.unPixmap) stipple_
+        maybe nullPtr (unsafeForeignPtrToPtr.unPixmap) stipple_
     add r #{const GDK_GC_CLIP_MASK } $
       #{poke GdkGCValues, clip_mask} ptr $
-        maybe nullPtr (foreignPtrToPtr.unPixmap) clipMask_
+        maybe nullPtr (unsafeForeignPtrToPtr.unPixmap) clipMask_
     add r #{const GDK_GC_SUBWINDOW } $
       #{poke GdkGCValues, subwindow_mode} ptr
       (fromIntegral (fromEnum subwindow_):: #{type GdkSubwindowMode})

[Gtk2hs-commit] gtk2hs ChangeLog,1.449,1.450

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26467

Modified Files:
	ChangeLog 
Log Message:
Change use of foreignPtrToPtr to unsafeForeignPtrToPtr and provide backwards
compatability for GHC pre-6.2.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.449
retrieving revision 1.450
diff -u -d -r1.449 -r1.450
--- ChangeLog	8 Apr 2005 13:40:09 -0000	1.449
+++ ChangeLog	8 Apr 2005 14:00:46 -0000	1.450
@@ -8,6 +8,13 @@
 	* glib/System/Glib/GList.chs: add readGList function needed for some
 	new modules. Remove unused ptrToInt function.
 
+	* glib/System/Glib/FFI.hs, tools/hierarchyGen/TypeGen.hs,
+	tools/hierarchyGen/Hierarchy.chs.template,
+	mogul/Graphics/UI/Gtk/Mogul/WidgetTable.hs,
+	sourceview/Graphics/UI/Gtk/SourceView/SourceTagTable.chs: change use
+	of foreignPtrToPtr to unsafeForeignPtrToPtr and provide backwards
+	compatability for GHC pre-6.2.
+
 2005-04-08 Axel Simon <A....@ke...>
 
 	* gtk/Graphics/UI/Gtk/Buttons/Button.chs.pp,

[Gtk2hs-commit] gtk2hs/sourceview/Graphics/UI/Gtk/SourceView SourceTagTable.chs,1.1,1.2

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/sourceview/Graphics/UI/Gtk/SourceView
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26467/sourceview/Graphics/UI/Gtk/SourceView

Modified Files:
	SourceTagTable.chs 
Log Message:
Change use of foreignPtrToPtr to unsafeForeignPtrToPtr and provide backwards
compatability for GHC pre-6.2.


Index: SourceTagTable.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/sourceview/Graphics/UI/Gtk/SourceView/SourceTagTable.chs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SourceTagTable.chs	8 Jan 2005 16:05:07 -0000	1.1
+++ SourceTagTable.chs	8 Apr 2005 14:00:49 -0000	1.2
@@ -55,8 +55,8 @@
 -- 
 sourceTagTableAddTags :: SourceTagTable -> [SourceTag] -> IO ()
 sourceTagTableAddTags tt tags = do
-  let tagForeignPtrs = map (unSourceTag . toSourceTag) tags
-  tagList <- toGSList (map foreignPtrToPtr tagForeignPtrs)
+  let tagForeignPtrs = map unSourceTag tags
+  tagList <- toGSList (map unsafeForeignPtrToPtr tagForeignPtrs)
   {#call source_tag_table_add_tags#} tt tagList
   -- destroy the list
   fromGSList tagList

[Gtk2hs-commit] gtk2hs/tools/hierarchyGen TypeGen.hs,1.12,1.13 Hierarchy.chs.template,1.3,1.4

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/tools/hierarchyGen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26467/tools/hierarchyGen

Modified Files:
	TypeGen.hs Hierarchy.chs.template 
Log Message:
Change use of foreignPtrToPtr to unsafeForeignPtrToPtr and provide backwards
compatability for GHC pre-6.2.


Index: Hierarchy.chs.template
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/tools/hierarchyGen/Hierarchy.chs.template,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Hierarchy.chs.template	25 Feb 2005 01:20:17 -0000	1.3
+++ Hierarchy.chs.template	8 Apr 2005 14:00:48 -0000	1.4
@@ -32,7 +32,7 @@
 @MODULE_EXPORTS@
   ) where
 
-import System.Glib.FFI		(ForeignPtr, castForeignPtr, foreignPtrToPtr,
+import System.Glib.FFI		(ForeignPtr, castForeignPtr, unsafeForeignPtrToPtr,
                                  CULong, withForeignPtr)
 import System.Glib.GType	(typeInstanceIsA)
 import GHC.Base			(unsafeCoerce#)

Index: TypeGen.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/tools/hierarchyGen/TypeGen.hs,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- TypeGen.hs	25 Feb 2005 01:20:17 -0000	1.12
+++ TypeGen.hs	8 Apr 2005 14:00:47 -0000	1.13
@@ -199,7 +199,7 @@
 makeUpcast table (obj:_:_) = 
   indent 0.ss "castTo".ss obj.ss " :: GObjectClass obj => obj -> ".ss obj.
   indent 0.ss "castTo".ss obj.ss " obj =".
-  indent 1.ss "if typeInstanceIsA ((foreignPtrToPtr.castForeignPtr.unGObject.toGObject) obj)".
+  indent 1.ss "if typeInstanceIsA ((unsafeForeignPtrToPtr.castForeignPtr.unGObject.toGObject) obj)".
   indent 2.ss "{#call fun unsafe ".
     ss (case lookup obj table of 
          (Just (_, Just get_type_func)) -> get_type_func

[Gtk2hs-commit] gtk2hs/mogul/Graphics/UI/Gtk/Mogul WidgetTable.hs,1.2,1.3

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/mogul/Graphics/UI/Gtk/Mogul
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26467/mogul/Graphics/UI/Gtk/Mogul

Modified Files:
	WidgetTable.hs 
Log Message:
Change use of foreignPtrToPtr to unsafeForeignPtrToPtr and provide backwards
compatability for GHC pre-6.2.


Index: WidgetTable.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mogul/Graphics/UI/Gtk/Mogul/WidgetTable.hs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- WidgetTable.hs	16 Jan 2005 21:32:32 -0000	1.2
+++ WidgetTable.hs	8 Apr 2005 14:00:48 -0000	1.3
@@ -82,7 +82,7 @@
   let wId = (mkWidgetId name)
   table <- takeMVar widgetTable
   putMVar widgetTable (addToFM table wId
-    ((foreignPtrToPtr.unWidget.toWidget) w))
+    ((unsafeForeignPtrToPtr.unWidget.toWidget) w))
   w `onUnrealize` (do
     table <- takeMVar widgetTable
     putMVar widgetTable (table `delFromFM` wId))

[Gtk2hs-commit] gtk2hs/glib/System/Glib FFI.hs,1.3,1.4

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/glib/System/Glib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26467/glib/System/Glib

Modified Files:
	FFI.hs 
Log Message:
Change use of foreignPtrToPtr to unsafeForeignPtrToPtr and provide backwards
compatability for GHC pre-6.2.


Index: FFI.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/glib/System/Glib/FFI.hs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- FFI.hs	15 Mar 2005 19:45:01 -0000	1.3
+++ FFI.hs	8 Apr 2005 14:00:47 -0000	1.4
@@ -31,7 +31,7 @@
   maybeNull,
   foreignFree,
   newForeignPtr,
-  foreignPtrToPtr,
+  unsafeForeignPtrToPtr,
 # if __GLASGOW_HASKELL__<600
   -- ghc 6 exports unsafePerformIO from module Foreign
   -- provide it here for ghc 5
@@ -46,10 +46,9 @@
 import Foreign.C
 import qualified Foreign
 # if __GLASGOW_HASKELL__>=602
-import Foreign	 hiding		(with, newForeignPtr)
-import qualified Foreign hiding	(newForeignPtr)
+import Foreign  hiding	(with, newForeignPtr)
 # else
-import Foreign	 hiding (with)
+import Foreign  hiding (with)
 # endif
 
 with :: (Storable a) => a -> (Ptr a -> IO b) -> IO b
@@ -57,8 +56,10 @@
 
 #if __GLASGOW_HASKELL__>=602
 newForeignPtr = flip Foreign.newForeignPtr
+#endif
 
-foreignPtrToPtr = unsafeForeignPtrToPtr
+#if __GLASGOW_HASKELL__<602
+unsafeForeignPtrToPtr = foreignPtrToPtr
 #endif
 
 #if __GLASGOW_HASKELL__>=600

[Gtk2hs-commit] gtk2hs ChangeLog,1.448,1.449

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15809

Modified Files:
	ChangeLog 
Log Message:
Add readGList function needed for some new modules. Remove unused ptrToInt
function.	


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.448
retrieving revision 1.449
diff -u -d -r1.448 -r1.449
--- ChangeLog	8 Apr 2005 12:10:30 -0000	1.448
+++ ChangeLog	8 Apr 2005 13:40:09 -0000	1.449
@@ -5,6 +5,9 @@
 	committed the .chs file rather than the .chs.pp file and was using
 	that in Makefile.am as well. So fix all that.
 
+	* glib/System/Glib/GList.chs: add readGList function needed for some
+	new modules. Remove unused ptrToInt function.
+
 2005-04-08 Axel Simon <A....@ke...>
 
 	* gtk/Graphics/UI/Gtk/Buttons/Button.chs.pp,

[Gtk2hs-commit] gtk2hs/glib/System/Glib GList.chs,1.1,1.2

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/glib/System/Glib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15809/glib/System/Glib

Modified Files:
	GList.chs 
Log Message:
Add readGList function needed for some new modules. Remove unused ptrToInt
function.	


Index: GList.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/glib/System/Glib/GList.chs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- GList.chs	8 Jan 2005 17:45:06 -0000	1.1
+++ GList.chs	8 Apr 2005 13:40:10 -0000	1.2
@@ -25,8 +25,8 @@
 -- * The same for GSList.
 --
 module System.Glib.GList (
-  ptrToInt,
   GList,
+  readGList,
   fromGList,
   toGList,
   GSList,
@@ -46,12 +46,18 @@
 
 -- methods
 
--- Convert a pointer to an Int.
+-- Turn a GList into a list of pointers but don't destroy the list.
 --
-ptrToInt :: Ptr a -> Int
-ptrToInt ptr = minusPtr ptr nullPtr 
+readGList :: GList -> IO [Ptr a]
+readGList glist
+  | glist==nullPtr = return []
+  | otherwise	    = do
+    x <- {#get GList->data#} glist
+    glist' <- {#get GList->next#} glist
+    xs <- readGList glist'
+    return (castPtr x:xs)
 
--- Turn a GList into a list of pointers.
+-- Turn a GList into a list of pointers (freeing the GList in the process).
 --
 fromGList :: GList -> IO [Ptr a]
 fromGList glist = do
@@ -76,7 +82,7 @@
     xs <- readGSList gslist'
     return (castPtr x:xs)
 
--- Turn a GSList into a list of pointers.
+-- Turn a GSList into a list of pointers (freeing the GSList in the process).
 --
 fromGSList :: GSList -> IO [Ptr a]
 fromGSList gslist

[Gtk2hs-commit] gtk2hs ChangeLog,1.447,1.448 Makefile.am,1.67,1.68

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29149

Modified Files:
	ChangeLog Makefile.am 
Log Message:
I was accidentally committed the .chs file rather than the .chs.pp file and
was using that in Makefile.am as well. So fix all that.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- Makefile.am	7 Apr 2005 01:19:38 -0000	1.67
+++ Makefile.am	8 Apr 2005 12:10:32 -0000	1.68
@@ -412,7 +412,7 @@
 	gtk/Graphics/UI/Gtk/TreeList/TreeView.chs.pp			\
 	gtk/Graphics/UI/Gtk/TreeList/IconView.chs.pp			\
 	gtk/Graphics/UI/Gtk/TreeList/CellView.chs.pp			\
-	gtk/Graphics/UI/Gtk/Windows/AboutDialog.chs			\
+	gtk/Graphics/UI/Gtk/Windows/AboutDialog.chs.pp			\
 	gtk/Graphics/UI/Gtk/Windows/Dialog.chs				\
 	gtk/Graphics/UI/Gtk/Windows/Window.chs.pp			\
 	gtk/Graphics/UI/Gtk/Windows/WindowGroup.chs			\

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.447
retrieving revision 1.448
diff -u -d -r1.447 -r1.448
--- ChangeLog	8 Apr 2005 09:20:25 -0000	1.447
+++ ChangeLog	8 Apr 2005 12:10:30 -0000	1.448
@@ -1,3 +1,10 @@
+2005-04-8 Duncan Coutts <du...@co...>
+
+	* gtk/Graphics/UI/Gtk/Windows/AboutDialog.chs.pp,
+	gtk/Graphics/UI/Gtk/Windows/AboutDialog.chs, Makefile.am: accidentally
+	committed the .chs file rather than the .chs.pp file and was using
+	that in Makefile.am as well. So fix all that.
+
 2005-04-08 Axel Simon <A....@ke...>
 
 	* gtk/Graphics/UI/Gtk/Buttons/Button.chs.pp,

[Gtk2hs-commit] gtk2hs/gtk/Graphics/UI/Gtk/Windows AboutDialog.chs.pp,NONE,1.1 AboutDialog.chs,1.1,NONE

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Windows
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29149/gtk/Graphics/UI/Gtk/Windows

Added Files:
	AboutDialog.chs.pp 
Removed Files:
	AboutDialog.chs 
Log Message:
I was accidentally committed the .chs file rather than the .chs.pp file and
was using that in Makefile.am as well. So fix all that.


--- AboutDialog.chs DELETED ---

--- NEW FILE: AboutDialog.chs.pp ---
-- -*-haskell-*-
--  GIMP Toolkit (GTK) Widget AboutDialog
--
--  Author : Duncan Coutts
--
--  Created: 1 March 2005
--
--  Version $Revision: 1.1 $ from $Date: 2005/04/08 12:10:34 $
--
--  Copyright (C) 2005 Duncan Coutts
--
--  This library is free software; you can redistribute it and/or
--  modify it under the terms of the GNU Lesser General Public
--  License as published by the Free Software Foundation; either
--  version 2.1 of the License, or (at your option) any later version.
--
--  This library is distributed in the hope that it will be useful,
--  but WITHOUT ANY WARRANTY; without even the implied warranty of
--  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--  Lesser General Public License for more details.
--
-- |
-- Maintainer  : gtk...@li...
-- Stability   : provisional
-- Portability : portable (depends on GHC)
--
-- Display information about an application
--
-- * Module available since Gtk+ version 2.6
--
module Graphics.UI.Gtk.Windows.AboutDialog (
-- * Detail
-- 
-- | The 'AboutDialog' offers a simple way to display information about a
-- program like its logo, name, copyright, website and license. It is also
-- possible to give credits to the authors, documenters, translators and
-- artists who have worked on the program. An about dialog is typically opened
-- when the user selects the @About@ option from the @Help@ menu. All parts of
-- the dialog are optional.
--
-- About dialog often contain links and email addresses. 'AboutDialog'
-- supports this by offering global hooks, which are called when the user
-- clicks on a link or email address, see 'aboutDialogSetEmailHook' and
-- 'aboutDialogSetUrlHook'. Email addresses in the authors, documenters and
-- artists properties are recognized by looking for @\<user\@host>@, URLs are
-- recognized by looking for @http:\/\/url@, with @url@ extending to the next
-- space, tab or line break.

-- * Class Hierarchy
-- |
-- @
-- |  'GObject'
-- |   +----'Object'
-- |         +----'Widget'
-- |               +----'Container'
-- |                     +----'Bin'
-- |                           +----'Window'
-- |                                 +----'Dialog'
-- |                                       +----AboutDialog
-- @

#if GTK_CHECK_VERSION(2,6,0)
-- * Types
  AboutDialog,
  AboutDialogClass,
  castToAboutDialog,

-- * Constructors
  aboutDialogNew,

-- * Methods
  aboutDialogGetName,
  aboutDialogSetName,
  aboutDialogGetVersion,
  aboutDialogSetVersion,
  aboutDialogGetCopyright,
  aboutDialogSetCopyright,
  aboutDialogGetComments,
  aboutDialogSetComments,
  aboutDialogGetLicense,
  aboutDialogSetLicense,
  aboutDialogGetWebsite,
  aboutDialogSetWebsite,
  aboutDialogGetWebsiteLabel,
  aboutDialogSetWebsiteLabel,
  aboutDialogSetAuthors,
  aboutDialogSetArtists,
  aboutDialogSetDocumenters,
  aboutDialogGetTranslatorCredits,
  aboutDialogSetTranslatorCredits,
  aboutDialogGetLogo,
  aboutDialogSetLogo,
  aboutDialogGetLogoIconName,
  aboutDialogSetLogoIconName,
  aboutDialogSetEmailHook,
  aboutDialogSetUrlHook,

-- * Properties
  aboutDialogName,
  aboutDialogVersion,
  aboutDialogCopyright,
  aboutDialogComments,
  aboutDialogWebsite,
  aboutDialogWebsiteLabel,
  aboutDialogTranslatorCredits,
--  aboutDialogLogoIconName
#endif
  ) where

import Monad	(liftM)
import Maybe	(fromMaybe)

import System.Glib.FFI
import System.Glib.UTFString
import System.Glib.Attributes		(Attr(..))
import System.Glib.GObject      	(makeNewGObject, mkFunPtrDestructor)
import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)
{#import Graphics.UI.Gtk.Types#}

{# context lib="gtk" prefix="gtk" #}

#if GTK_CHECK_VERSION(2,6,0)
--------------------
-- Constructors

-- | Creates a new 'AboutDialog'.
--
aboutDialogNew :: IO AboutDialog
aboutDialogNew =
  makeNewObject mkAboutDialog $
  liftM (castPtr :: Ptr Widget -> Ptr AboutDialog) $
  {# call gtk_about_dialog_new #}

--------------------
-- Methods

-- | Returns the program name displayed in the about dialog.
--
aboutDialogGetName :: AboutDialogClass self => self
 -> IO String -- ^ returns The program name.
aboutDialogGetName self =
  {# call gtk_about_dialog_get_name #}
    (toAboutDialog self)
  >>= peekUTFString

-- | Sets the name to display in the about dialog. If this is not set, it
-- defaults to the program executable name.
--
aboutDialogSetName :: AboutDialogClass self => self
 -> String -- ^ @name@ - the program name
 -> IO ()
aboutDialogSetName self name =
  withUTFString name $ \namePtr ->
  {# call gtk_about_dialog_set_name #}
    (toAboutDialog self)
    namePtr

-- | Returns the version string.
--
aboutDialogGetVersion :: AboutDialogClass self => self
 -> IO String -- ^ returns The version string.
aboutDialogGetVersion self =
  {# call gtk_about_dialog_get_version #}
    (toAboutDialog self)
  >>= peekUTFString

-- | Sets the version string to display in the about dialog.
--
aboutDialogSetVersion :: AboutDialogClass self => self
 -> String -- ^ @version@ - the version string
 -> IO ()
aboutDialogSetVersion self version =
  withUTFString version $ \versionPtr ->
  {# call gtk_about_dialog_set_version #}
    (toAboutDialog self)
    versionPtr

-- | Returns the copyright string.
--
aboutDialogGetCopyright :: AboutDialogClass self => self
 -> IO String -- ^ returns The copyright string.
aboutDialogGetCopyright self =
  {# call gtk_about_dialog_get_copyright #}
    (toAboutDialog self)
  >>= peekUTFString

-- | Sets the copyright string to display in the about dialog. This should be
-- a short string of one or two lines.
--
aboutDialogSetCopyright :: AboutDialogClass self => self
 -> String -- ^ @copyright@ - the copyright string
 -> IO ()
aboutDialogSetCopyright self copyright =
  withUTFString copyright $ \copyrightPtr ->
  {# call gtk_about_dialog_set_copyright #}
    (toAboutDialog self)
    copyrightPtr

-- | Returns the comments string.
--
aboutDialogGetComments :: AboutDialogClass self => self
 -> IO String -- ^ returns The comments.
aboutDialogGetComments self =
  {# call gtk_about_dialog_get_comments #}
    (toAboutDialog self)
  >>= peekUTFString

-- | Sets the comments string to display in the about dialog. This should be a
-- short string of one or two lines.
--
aboutDialogSetComments :: AboutDialogClass self => self
 -> String -- ^ @comments@ - a comments string
 -> IO ()
aboutDialogSetComments self comments =
  withUTFString comments $ \commentsPtr ->
  {# call gtk_about_dialog_set_comments #}
    (toAboutDialog self)
    commentsPtr

-- | Returns the license information.
--
aboutDialogGetLicense :: AboutDialogClass self => self
 -> IO String -- ^ returns The license information.
aboutDialogGetLicense self =
  {# call gtk_about_dialog_get_license #}
    (toAboutDialog self)
  >>= peekUTFString

-- | Sets the license information to be displayed in the secondary license
-- dialog. If @license@ is @Nothing@, the license button is hidden.
--
aboutDialogSetLicense :: AboutDialogClass self => self
 -> Maybe String -- ^ @license@ - the license information or @Nothing@
 -> IO ()
aboutDialogSetLicense self license =
  maybeWith withUTFString license $ \licensePtr ->
  {# call gtk_about_dialog_set_license #}
    (toAboutDialog self)
    licensePtr

-- | Returns the website URL.
--
aboutDialogGetWebsite :: AboutDialogClass self => self
 -> IO String -- ^ returns The website URL.
aboutDialogGetWebsite self =
  {# call gtk_about_dialog_get_website #}
    (toAboutDialog self)
  >>= peekUTFString

-- | Sets the URL to use for the website link.
--
aboutDialogSetWebsite :: AboutDialogClass self => self
 -> String -- ^ @website@ - a URL string starting with \"http:\/\/\"
 -> IO ()
aboutDialogSetWebsite self website =
  withUTFString website $ \websitePtr ->
  {# call gtk_about_dialog_set_website #}
    (toAboutDialog self)
    websitePtr

-- | Returns the label used for the website link.
--
aboutDialogGetWebsiteLabel :: AboutDialogClass self => self
 -> IO String -- ^ returns The label used for the website link.
aboutDialogGetWebsiteLabel self =
  {# call gtk_about_dialog_get_website_label #}
    (toAboutDialog self)
  >>= peekUTFString

-- | Sets the label to be used for the website link. It defaults to the
-- website URL.
--
aboutDialogSetWebsiteLabel :: AboutDialogClass self => self
 -> String -- ^ @websiteLabel@ - the label used for the website link
 -> IO ()
aboutDialogSetWebsiteLabel self websiteLabel =
  withUTFString websiteLabel $ \websiteLabelPtr ->
  {# call gtk_about_dialog_set_website_label #}
    (toAboutDialog self)
    websiteLabelPtr

-- | Sets the strings which are displayed in the authors tab of the secondary
-- credits dialog.
--
aboutDialogSetAuthors :: AboutDialogClass self => self
 -> [String] -- ^ @authors@ - a list of author names
 -> IO ()
aboutDialogSetAuthors self authors =
  withUTFStringArray0 authors $ \authorsPtr ->
  {# call gtk_about_dialog_set_authors #}
    (toAboutDialog self)
    authorsPtr

-- | Sets the strings which are displayed in the artists tab of the secondary
-- credits dialog.
--
aboutDialogSetArtists :: AboutDialogClass self => self
 -> [String] -- ^ @artists@ - a list of artist names
 -> IO ()
aboutDialogSetArtists self artists =
  withUTFStringArray0 artists $ \artistsPtr ->
  {# call gtk_about_dialog_set_artists #}
    (toAboutDialog self)
    artistsPtr

-- | Sets the strings which are displayed in the documenters tab of the
-- secondary credits dialog.
--
aboutDialogSetDocumenters :: AboutDialogClass self => self
 -> [String] -- ^ @artists@ - a list of documenter names
 -> IO ()
aboutDialogSetDocumenters self documenters =
  withUTFStringArray0 documenters $ \documentersPtr ->
  {# call gtk_about_dialog_set_documenters #}
    (toAboutDialog self)
    documentersPtr

-- | Returns the translator credits string which is displayed in the
-- translators tab of the secondary credits dialog.
--
aboutDialogGetTranslatorCredits :: AboutDialogClass self => self
 -> IO String -- ^ returns The translator credits string.
aboutDialogGetTranslatorCredits self =
  {# call gtk_about_dialog_get_translator_credits #}
    (toAboutDialog self)
  >>= peekUTFString

-- | Sets the translator credits string which is displayed in the translators
-- tab of the secondary credits dialog.
--
-- The intended use for this string is to display the translator of the
-- language which is currently used in the user interface.
--
aboutDialogSetTranslatorCredits :: AboutDialogClass self => self
 -> String -- ^ @translatorCredits@ - the translator credits
 -> IO ()
aboutDialogSetTranslatorCredits self translatorCredits =
  withUTFString translatorCredits $ \translatorCreditsPtr ->
  {# call gtk_about_dialog_set_translator_credits #}
    (toAboutDialog self)
    translatorCreditsPtr

-- | Returns the pixbuf displayed as logo in the about dialog.
--
aboutDialogGetLogo :: AboutDialogClass self => self
 -> IO Pixbuf -- ^ returns the pixbuf displayed as logo.
aboutDialogGetLogo self =
  makeNewGObject mkPixbuf $
  {# call gtk_about_dialog_get_logo #}
    (toAboutDialog self)

-- | Sets the pixbuf to be displayed as logo in the about dialog. If it is
-- @Nothing@, the default window icon set with 'windowSetDefaultIcon' will be
-- used.
--
aboutDialogSetLogo :: AboutDialogClass self => self
 -> Maybe Pixbuf -- ^ @logo@ - a 'Pixbuf', or @Nothing@
 -> IO ()
aboutDialogSetLogo self logo =
  {# call gtk_about_dialog_set_logo #}
    (toAboutDialog self)
    (fromMaybe (Pixbuf nullForeignPtr) logo)

-- | Returns the icon name displayed as logo in the about dialog.
--
aboutDialogGetLogoIconName :: AboutDialogClass self => self
 -> IO String -- ^ returns the icon name displayed as logo. 
aboutDialogGetLogoIconName self =
  {# call gtk_about_dialog_get_logo_icon_name #}
    (toAboutDialog self)
  >>= peekUTFString

-- | Sets the pixbuf to be displayed as logo in the about dialog. If it is
-- @Nothing@, the default window icon set with 'windowSetDefaultIcon' will be
-- used.
--
aboutDialogSetLogoIconName :: AboutDialogClass self => self
 -> Maybe String -- ^ @iconName@ - an icon name, or @Nothing@
 -> IO ()
aboutDialogSetLogoIconName self iconName =
  maybeWith withUTFString iconName $ \iconNamePtr ->
  {# call gtk_about_dialog_set_logo_icon_name #}
    (toAboutDialog self)
    iconNamePtr

-- | Installs a global function to be called whenever the user activates an
-- email link in an about dialog.
--
aboutDialogSetEmailHook :: 
    (String -> IO ()) -- ^ @(\url -> ...)@ - a function to call when an email
                      -- link is activated.
 -> IO ()
aboutDialogSetEmailHook func = do
  funcPtr <- mkAboutDialogActivateLinkFunc (\_ linkPtr _ -> do
    link <- peekUTFString linkPtr
    func link
    )
  destroyPtr <- mkFunPtrDestructor funcPtr
  {# call gtk_about_dialog_set_email_hook #}
    funcPtr
    nullPtr
    destroyPtr
  return ()

-- | Installs a global function to be called whenever the user activates a URL
-- link in an about dialog.
--
aboutDialogSetUrlHook :: 
    (String -> IO ()) -- ^ @(\url -> ...)@ - a function to call when a URL link
                      -- is activated.
 -> IO ()
aboutDialogSetUrlHook func = do
  funcPtr <- mkAboutDialogActivateLinkFunc (\_ linkPtr _ -> do
    link <- peekUTFString linkPtr
    func link
    )
  destroyPtr <- mkFunPtrDestructor funcPtr
  {# call gtk_about_dialog_set_url_hook #}
    funcPtr
    nullPtr
    destroyPtr
  return ()

{# pointer AboutDialogActivateLinkFunc #}

foreign import ccall "wrapper" mkAboutDialogActivateLinkFunc ::
  (Ptr AboutDialog -> CString -> Ptr () -> IO ()) -> IO AboutDialogActivateLinkFunc

--------------------
-- Properties

-- | The name of the program. If this is not set, it defaults to
-- 'gGetApplicationName'.
--
aboutDialogName :: AboutDialogClass self => Attr self String
aboutDialogName = Attr 
  aboutDialogGetName
  aboutDialogSetName

-- | The version of the program.
--
aboutDialogVersion :: AboutDialogClass self => Attr self String
aboutDialogVersion = Attr 
  aboutDialogGetVersion
  aboutDialogSetVersion

-- | Copyright information for the program.
--
aboutDialogCopyright :: AboutDialogClass self => Attr self String
aboutDialogCopyright = Attr 
  aboutDialogGetCopyright
  aboutDialogSetCopyright

-- | Comments about the program. This string is displayed in a label in the
-- main dialog, thus it should be a short explanation of the main purpose of
-- the program, not a detailed list of features.
--
aboutDialogComments :: AboutDialogClass self => Attr self String
aboutDialogComments = Attr 
  aboutDialogGetComments
  aboutDialogSetComments

-- | The URL for the link to the website of the program. This should be a
-- string starting with \"http:\/\/.
--
aboutDialogWebsite :: AboutDialogClass self => Attr self String
aboutDialogWebsite = Attr 
  aboutDialogGetWebsite
  aboutDialogSetWebsite

-- | The label for the link to the website of the program. If this is not set,
-- it defaults to the URL specified in the website property.
--
aboutDialogWebsiteLabel :: AboutDialogClass self => Attr self String
aboutDialogWebsiteLabel = Attr 
  aboutDialogGetWebsiteLabel
  aboutDialogSetWebsiteLabel

-- | Credits to the translators. This string should be marked as translatable.
-- The string may contain email addresses and URLs, which will be displayed as
-- links, see the introduction for more details.
--
aboutDialogTranslatorCredits :: AboutDialogClass self => Attr self String
aboutDialogTranslatorCredits = Attr 
  aboutDialogGetTranslatorCredits
  aboutDialogSetTranslatorCredits
#endif

[Gtk2hs-commit] gtk2hs/gtk/Graphics/UI/Gtk/MenuComboToolbar ComboBox.chs.pp,1.6,1.7

[Axel S. <as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/MenuComboToolbar
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5617/gtk/Graphics/UI/Gtk/MenuComboToolbar

Modified Files:
	ComboBox.chs.pp 
Log Message:
Corrected some #ifdef to make it compile with Gtk 2.4


Index: ComboBox.chs.pp
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs.pp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ComboBox.chs.pp	7 Apr 2005 00:34:41 -0000	1.6
+++ ComboBox.chs.pp	8 Apr 2005 09:20:26 -0000	1.7
@@ -96,11 +96,11 @@
   comboBoxGetRowSpanColumn,
   comboBoxGetColumnSpanColumn,
   comboBoxGetActiveText,
+  comboBoxSetAddTearoffs,
+  comboBoxGetAddTearoffs,
   comboBoxSetFocusOnClick,
   comboBoxGetFocusOnClick,
-  comboBoxSetAddTearoffs,
 #endif
-  comboBoxGetAddTearoffs,
 
 -- * Properties
 #if GTK_CHECK_VERSION(2,6,0)
@@ -395,7 +395,6 @@
   {# call gtk_combo_box_set_add_tearoffs #}
     (toComboBox self)
     (fromBool addTearoffs)
-#endif
 
 -- | Gets the current value of the :add-tearoffs property.
 --
@@ -405,7 +404,6 @@
   {# call gtk_combo_box_get_add_tearoffs #}
     (toComboBox self)
 
-#if GTK_CHECK_VERSION(2,6,0)
 -- | Sets whether the combo box will grab focus when it is clicked with the
 -- mouse. Making mouse clicks not grab focus is useful in places like toolbars
 -- where you don't want the keyboard focus removed from the main area of the

[Gtk2hs-commit] gtk2hs ChangeLog,1.446,1.447

[Axel S. <as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5617

Modified Files:
	ChangeLog 
Log Message:
Corrected some #ifdef to make it compile with Gtk 2.4


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.446
retrieving revision 1.447
diff -u -d -r1.446 -r1.447
--- ChangeLog	7 Apr 2005 01:19:37 -0000	1.446
+++ ChangeLog	8 Apr 2005 09:20:25 -0000	1.447
@@ -1,3 +1,9 @@
+2005-04-08 Axel Simon <A....@ke...>
+
+	* gtk/Graphics/UI/Gtk/Buttons/Button.chs.pp,
+	gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs.pp: Make it
+	compile with Gtk 2.4 headers.
+	
 2005-04-7 Duncan Coutts <du...@co...>
 
 	* gtk/Graphics/UI/Gtk/Abstract/Paned.chs.pp: add several new signals

[Gtk2hs-commit] gtk2hs/gtk/Graphics/UI/Gtk/Buttons Button.chs.pp,1.7,1.8

[Axel S. <as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Buttons
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5617/gtk/Graphics/UI/Gtk/Buttons

Modified Files:
	Button.chs.pp 
Log Message:
Corrected some #ifdef to make it compile with Gtk 2.4


Index: Button.chs.pp
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Buttons/Button.chs.pp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Button.chs.pp	7 Apr 2005 00:14:00 -0000	1.7
+++ Button.chs.pp	8 Apr 2005 09:20:26 -0000	1.8
@@ -383,6 +383,7 @@
   return (realToFrac xalign, realToFrac yalign)
 #endif
 
+#if GTK_CHECK_VERSION(2,6,0)
 -- | Gets the widget that is currenty set as the image of the button. This may
 -- have been explicitly set by 'buttonSetImage' or constructed by
 -- 'buttonNewFromStock'.
@@ -406,6 +407,7 @@
   {# call gtk_button_set_image #}
     (toButton self)
     (toWidget image)
+#endif
 
 --------------------
 -- Properties