gtk2hs-commit — Mailing list for Darcs commit messages.

[Gtk2hs-commit] gtk2hs/gtk/windows FileChooserDialog.chs,1.3,1.4

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

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

Modified Files:
	FileChooserDialog.chs 
Log Message:
Axel's patches to get the build to work for gtk-2.2, exclude new module bodies
so c2hs doesn't see the new functions, and change the way _stub.o files are
found so we don't try to link non-existant ones.
Everything should build for gtk-2.0 and gtk-2.2 now.


Index: FileChooserDialog.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/windows/FileChooserDialog.chs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- FileChooserDialog.chs	23 May 2004 16:17:53 -0000	1.3
+++ FileChooserDialog.chs	8 Aug 2004 19:04:38 -0000	1.4
@@ -1,3 +1,4 @@
+{-# OPTIONS -cpp #-}
 -- -*-haskell-*-
 --  GIMP Toolkit (GTK) entry Widget FileChooserDialog
 --
@@ -27,13 +28,19 @@
 -- * Added in GTK+ 2.4
 --
 
+#include<gtk/gtkversion.h>
+
 module FileChooserDialog (
+#if GTK_CHECK_VERSION(2,4,0)
   FileChooserDialogClass,
   FileChooserDialog,
   fileChooserDialogNew,
   fileChooserDialogNewWithBackend
+#endif
 ) where
 
+#if GTK_CHECK_VERSION(2,4,0)
+
 import Monad (liftM, when)
 import Maybe (isJust, fromJust)
 import FFI
@@ -53,22 +60,22 @@
 instance FileChooserClass FileChooserDialog
 
 fileChooserDialogNew
-  :: Maybe String ->           -- Title of the dialog (or default)
-     Maybe Window ->           -- Transient parent of the dialog (or none)
-     FileChooserAction ->      -- Open or save mode for the dialog
-     [(String, ResponseId)] -> -- buttons and their response codes
-     IO FileChooserDialog
+  :: Maybe String            -- ^ Title of the dialog (or default)
+  -> Maybe Window            -- ^ Transient parent of the dialog (or none)
+  -> FileChooserAction       -- ^ Open or save mode for the dialog
+  -> [(String, ResponseId)]  -- ^ Buttons and their response codes
+  -> IO FileChooserDialog
 fileChooserDialogNew title parent action buttons =
   internalFileChooserDialogNew title parent action buttons Nothing
 
 
 fileChooserDialogNewWithBackend
-  :: Maybe String ->           -- Title of the dialog (or default)
-     Maybe Window ->           -- Transient parent of the dialog (or none)
-     FileChooserAction ->      -- Open or save mode for the dialog
-     [(String, ResponseId)] -> -- buttons and their response codes
-     String ->                 -- The name of the specific filesystem backend to use
-     IO FileChooserDialog
+  :: Maybe String              -- ^ Title of the dialog (or default)
+  -> Maybe Window              -- ^ Transient parent of the dialog (or none)
+  -> FileChooserAction         -- ^ Open or save mode for the dialog
+  -> [(String, ResponseId)]    -- ^ Buttons and their response codes
+  -> String                    -- ^ The name of the filesystem backend to use
+  -> IO FileChooserDialog
 fileChooserDialogNewWithBackend title parent action buttons backend =
   internalFileChooserDialogNew title parent action buttons (Just backend)
   
@@ -78,12 +85,13 @@
 -- bug, see <http://bugzilla.gnome.org/show_bug.cgi?id=141004>
 -- The solution is to call objectNew and add the buttons manually.
 
-internalFileChooserDialogNew :: Maybe String ->           -- Title of the dialog (or default)
-                                Maybe Window ->           -- Transient parent of the dialog (or none)
-                                FileChooserAction ->      -- Open or save mode for the dialog
-                                [(String, ResponseId)] -> -- buttons and their response codes
-				Maybe String ->           -- The name of the backend to use (optional)
-                                IO FileChooserDialog
+internalFileChooserDialogNew ::
+  Maybe String ->           -- Title of the dialog (or default)
+  Maybe Window ->           -- Transient parent of the dialog (or none)
+  FileChooserAction ->      -- Open or save mode for the dialog
+  [(String, ResponseId)] -> -- Buttons and their response codes
+  Maybe String ->           -- The name of the backend to use (optional)
+  IO FileChooserDialog
 internalFileChooserDialogNew title parent action buttons backend = do
   objType <- {# call unsafe gtk_file_chooser_dialog_get_type #}
   dialog <-makeNewObject mkFileChooserDialog $ liftM castPtr $
@@ -99,3 +107,5 @@
   mapM_ (\(btnName, btnResponse) ->
           dialogAddButton dialog btnName btnResponse) buttons
   return dialog
+
+#endif

[Gtk2hs-commit] gtk2hs/gtk/menuComboToolbar ToolItem.chs,1.1,1.2 ComboBoxEntry.chs,1.3,1.4 ComboBox.chs,1.3,1.4

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

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

Modified Files:
	ToolItem.chs ComboBoxEntry.chs ComboBox.chs 
Log Message:
Axel's patches to get the build to work for gtk-2.2, exclude new module bodies
so c2hs doesn't see the new functions, and change the way _stub.o files are
found so we don't try to link non-existant ones.
Everything should build for gtk-2.0 and gtk-2.2 now.


Index: ComboBoxEntry.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/menuComboToolbar/ComboBoxEntry.chs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ComboBoxEntry.chs	23 May 2004 16:05:21 -0000	1.3
+++ ComboBoxEntry.chs	8 Aug 2004 19:04:37 -0000	1.4
@@ -1,3 +1,4 @@
+{-# OPTIONS -cpp #-}
 -- -*-haskell-*-
 --  GIMP Toolkit (GTK) entry Widget ComboBoxEntry
 --
@@ -23,7 +24,10 @@
 -- * Added in gtk 2.4
 --
 
+#include<gtk/gtkversion.h>
+
 module ComboBoxEntry (
+#if GTK_CHECK_VERSION(2,4,0)
   ComboBoxEntryClass,
   ComboBoxEntry,
   comboBoxEntryNew,
@@ -31,8 +35,10 @@
   comboBoxEntryNewText,
   comboBoxEntrySetTextColumn,
   comboBoxEntryGetTextColumn,
+#endif
 ) where
 
+#if GTK_CHECK_VERSION(2,4,0)
 import Monad	(liftM)
 import FFI
 
@@ -68,3 +74,5 @@
 comboBoxEntryGetTextColumn combo =
   liftM fromIntegral $ 
   {# call gtk_combo_box_entry_get_text_column #} (toComboBoxEntry combo)
+
+#endif

Index: ToolItem.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/menuComboToolbar/ToolItem.chs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ToolItem.chs	3 Aug 2004 04:16:57 -0000	1.1
+++ ToolItem.chs	8 Aug 2004 19:04:37 -0000	1.2
@@ -1,3 +1,4 @@
+{-# OPTIONS -cpp #-}
 -- -*-haskell-*-
 -- GIMP Toolkit (GTK) Widget ToolItem
 --
@@ -32,8 +33,10 @@
 --
 -- * Added in GTK+ 2.4
 --
+#include<gtk/gtkversion.h>
 
 module ToolItem (
+#if GTK_CHECK_VERSION(2,4,0)
   toolItemNew,
   toolItemSetHomogeneous,
   toolItemGetHomogeneous,
@@ -48,7 +51,7 @@
   toolItemGetVisibleVertical,
   toolItemSetIsImportant,
   toolItemGetIsImportant,
-  IconSize(..),
+  IconSize,
   toolItemGetIconSize,
   Orientation(..),
   toolItemGetOrientation,
@@ -59,15 +62,18 @@
   toolItemRetrieveProxyMenuItem,
   toolItemGetProxyMenuItem,
   toolItemSetProxyMenuItem
+#endif
   ) where
 
+#if GTK_CHECK_VERSION(2,4,0)
+
 import Monad	(liftM)
 import FFI
 
 import Object	(makeNewObject)
 {#import Hierarchy#}
 {#import Signal#}
-import Structs  (IconSize(..))
+import Structs  (IconSize)
 import Enums	  (Orientation(..), ToolbarStyle(..), ReliefStyle(..))
 
 {# context lib="gtk" prefix="gtk" #}
@@ -238,3 +244,5 @@
   withCString menuItemId $ \strPtr ->
   {#call tool_item_set_proxy_menu_item#} (toToolItem item)
     strPtr (toWidget menuItem)
+
+#endif

Index: ComboBox.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/menuComboToolbar/ComboBox.chs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ComboBox.chs	23 May 2004 16:05:21 -0000	1.3
+++ ComboBox.chs	8 Aug 2004 19:04:37 -0000	1.4
@@ -1,3 +1,4 @@
+{-# OPTIONS -cpp #-}
 -- -*-haskell-*-
 --  GIMP Toolkit (GTK) entry Widget ComboBox
 --
@@ -23,7 +24,10 @@
 -- * Added in Gtk 2.4
 --
 
+#include<gtk/gtkversion.h>
+
 module ComboBox (
+#if GTK_CHECK_VERSION(2,4,0)
   ComboBoxClass,
   ComboBox,
   comboBoxNew,
@@ -44,8 +48,11 @@
   comboBoxRemoveText,
   comboBoxPopup,
   comboBoxPopdown
+#endif
 ) where
 
+#if GTK_CHECK_VERSION(2,4,0)
+
 import Monad	(liftM)
 import FFI
 
@@ -150,3 +157,5 @@
 comboBoxPopdown :: ComboBoxClass combo => combo -> IO ()
 comboBoxPopdown combo =
   {# call gtk_combo_box_popdown #} (toComboBox combo)
+
+#endif

[Gtk2hs-commit] gtk2hs/gtk/entry EntryCompletion.chs,1.3,1.4

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

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

Modified Files:
	EntryCompletion.chs 
Log Message:
Axel's patches to get the build to work for gtk-2.2, exclude new module bodies
so c2hs doesn't see the new functions, and change the way _stub.o files are
found so we don't try to link non-existant ones.
Everything should build for gtk-2.0 and gtk-2.2 now.


Index: EntryCompletion.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/entry/EntryCompletion.chs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- EntryCompletion.chs	23 May 2004 15:51:53 -0000	1.3
+++ EntryCompletion.chs	8 Aug 2004 19:04:38 -0000	1.4
@@ -24,7 +24,10 @@
 -- * Added in GTK+ 2.4
 --
 
+#include<gtk/gtkversion.h>
+
 module EntryCompletion (
+#if GTK_CHECK_VERSION(2,4,0)
   EntryCompletion,
   EntryCompletionClass,
   entryCompletionNew,
@@ -39,8 +42,11 @@
   entryCompletionInsertActionMarkup,
   entryCompletionDeleteAction,
   entryCompletionSetTextColumn
+#endif
 ) where
 
+#if GTK_CHECK_VERSION(2,4,0)
+
 import Monad	(liftM)
 import FFI
 import LocalData (newIORef, readIORef, writeIORef)
@@ -157,3 +163,4 @@
   writeIORef dRef dPtr
   {# call gtk_entry_completion_set_match_func #} ec
     (castFunPtr hPtr) nullPtr dPtr
+#endif

[Gtk2hs-commit] gtk2hs/gtk/abstract FileChooser.chs,1.8,1.9

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

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

Modified Files:
	FileChooser.chs 
Log Message:
Axel's patches to get the build to work for gtk-2.2, exclude new module bodies
so c2hs doesn't see the new functions, and change the way _stub.o files are
found so we don't try to link non-existant ones.
Everything should build for gtk-2.0 and gtk-2.2 now.


Index: FileChooser.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/abstract/FileChooser.chs,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- FileChooser.chs	3 Aug 2004 02:36:39 -0000	1.8
+++ FileChooser.chs	8 Aug 2004 19:04:38 -0000	1.9
@@ -1,3 +1,4 @@
+{-# OPTIONS -cpp #-}
 -- GIMP Toolkit (GTK) Binding for Haskell: binding to GConf   -*-haskell-*-
 --    for storing and retrieving configuartion information
 --
@@ -29,7 +30,10 @@
 -- * Added in GTK+ 2.4
 --
 
+#include<gtk/gtkversion.h>
+
 module FileChooser (
+#if GTK_CHECK_VERSION(2,4,0)
   FileChooserClass,
   FileChooser,
   FileChooserAction(..),
@@ -85,8 +89,11 @@
 --  afterSelectionChanged,
   onUpdatePreview,
   afterUpdatePreview
+#endif
 ) where
 
+#if GTK_CHECK_VERSION(2,4,0)
+
 import Monad (liftM, when)
 import FFI
 {#import Hierarchy#}
@@ -363,3 +370,6 @@
 toStringGSList strs = do
   strPtrs <- mapM newCString strs
   toGSList strPtrs
+
+#endif
+

[Gtk2hs-commit] gtk2hs/gtk/layout Expander.chs,1.3,1.4

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

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

Modified Files:
	Expander.chs 
Log Message:
Axel's patches to get the build to work for gtk-2.2, exclude new module bodies
so c2hs doesn't see the new functions, and change the way _stub.o files are
found so we don't try to link non-existant ones.
Everything should build for gtk-2.0 and gtk-2.2 now.


Index: Expander.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/layout/Expander.chs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Expander.chs	23 May 2004 16:02:58 -0000	1.3
+++ Expander.chs	8 Aug 2004 19:04:38 -0000	1.4
@@ -1,3 +1,4 @@
+{-# OPTIONS -cpp #-}
 -- -*-haskell-*-
 --  GIMP Toolkit (GTK) Widget Expander
 --
@@ -29,7 +30,10 @@
 -- * Added in GTK+ 2.4
 --
 
+#include<gtk/gtkversion.h>
+
 module Expander (
+#if GTK_CHECK_VERSION(2,4,0)
   Expander,
   ExpanderClass,
   expanderNew,
@@ -48,8 +52,11 @@
   expanderGetLabelWidget,
   onActivate,
   afterActivate
+#endif
 ) where
 
+#if GTK_CHECK_VERSION(2,4,0)
+
 import Monad (liftM)
 import FFI
 import Object
@@ -125,3 +132,5 @@
 afterActivate :: Expander -> IO () -> IO (ConnectId Expander)
 onActivate = connect_NONE__NONE "activate" False
 afterActivate = connect_NONE__NONE "activate" True
+
+#endif

[Gtk2hs-commit] gtk2hs/mk library.mk,1.24,1.25 common.mk,1.29,1.30

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

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

Modified Files:
	library.mk common.mk 
Log Message:
Axel's patches to get the build to work for gtk-2.2, exclude new module bodies
so c2hs doesn't see the new functions, and change the way _stub.o files are
found so we don't try to link non-existant ones.
Everything should build for gtk-2.0 and gtk-2.2 now.


Index: common.mk
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mk/common.mk,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- common.mk	28 Jul 2004 02:40:07 -0000	1.29
+++ common.mk	8 Aug 2004 19:04:37 -0000	1.30
@@ -75,25 +75,6 @@
 ALLSOURCEFILES		:= $(ALLCHSFILES) $(HSCFILES) $(HSFILES) \
 			$(EXTRA_HSFILES)
 
-# Compile a list of all generated *_stub.o files. Such a file is generated if
-# a sourcefile contains a foreign export declaration. If there is a standard
-# grep for regexs, then we should match for the beginning of the line. Files
-# specified with EXTRA_... cannot be scanned, thus these STUB files need to
-# be specified explicitly through EXTRA_STUBFILES.
-STUBOFILES		:= $(strip \
-	$(patsubst %.hs,%_stub.o, $(foreach FILE,\
-	$(HSFILES),$(shell $(GREP) -l "foreign export" $(FILE)))) \
-	$(patsubst %.chs,%_stub.o, $(foreach FILE,\
-	$(CHSFILES),$(shell $(GREP) -l "foreign export" $(FILE)))) \
-	$(patsubst %.hsc,%_stub.o, $(foreach FILE,\
-	$(HSCFILES),$(shell $(GREP) -l "foreign export" $(FILE))))\
-	$(patsubst %.chs,%_stub.o, $(EXTRA_STUBFILES)))
-
-# Not needed at the moment: GHC with --make knows that it should pass these
-# files to the C compiler. We only include the header file $(HEADER) and
-# clean the tree through a wildcard. 
-STUBHFILES		:= $(STUBOFILES:.o=.h)
-
 EXTRA_HFILESOK		:= $(sort $(EXTRA_HFILES) $(EXTRA_CFILES:.c=.h))
 
 # C include file paths and other options to CPP.
@@ -271,7 +252,8 @@
 	@echo Explicit header: $(EXPLICIT_HEADER)
 #	@echo all HSC files: $(HSCFILES)
 #	@echo all other HS files: $(HSFILES)
-#	@echo all files generating stubs: $(STUBOFILES)
+	@echo stub-o files: $(filter-out %*_stub.o,\
+	  $(shell echo $(addsuffix *_stub.o,$(SUBDIRSOK))))
 	@echo hi: $(INST_HIDIR) lib: $(INST_LIBDIR) 
 	@echo incl: $(INST_INCLDIR) bin: $(INST_BINDIR)
 #	@echo user install dir: $(INSTALLDIR)
@@ -345,7 +327,8 @@
 
 mostlyclean : noinplace
 	$(strip $(RM) $(TARGETOK) $(ALLHSFILES:.hs=.o) $(ALLHSFILES:.hs=.hi) \
-	  $(EXTRA_CFILES:.c=.o) $(ALLHSFILES:.hs=_stub.*) .depend)
+	  $(EXTRA_CFILES:.c=.o) $(ALLHSFILES:.hs=_stub.*) .depend \
+	  $(ALLCHSFILES:.chs=.dep))
 
 clean	: mostlyclean
 	$(strip $(RM) $(ALLCHSFILES:.chs=.hs) $(ALLCHSFILES:.chs=.chi) \

Index: library.mk
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mk/library.mk,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- library.mk	28 Jul 2004 11:13:40 -0000	1.24
+++ library.mk	8 Aug 2004 19:04:37 -0000	1.25
@@ -34,8 +34,7 @@
 	  include_dirs		= [$(call makeTextList, $(INPL_INCLDIR)\
 	  $(patsubst -I%,%,$(EXTRA_CPPFLAGS_ONLY_I)))],\
 	  c_includes		= [$(call makeTextList,\
-	  			  $(notdir $(STUBHFILES)) $(HEADER)\
-				  $(EXTRA_HFILESOK))],\
+	  			  $(HEADER) $(EXTRA_HFILESOK))],\
 	  package_deps		= [$(call makeTextList,$(NEEDPACKAGES))],\
 	  extra_ghc_opts	= [$(call makeTextList,$(EXTRAHC_FLAGS))],\
 	  extra_cc_opts		= [],\
@@ -66,8 +65,8 @@
 	  $(INSTALL_DATA) $$file $(DESTDIR)$(INST_HIDIR); done;
 	$(INSTALL_DATA) $(TARGETOK) $(DESTDIR)$(INST_LIBDIR)
 	$(TOUCH) -r $(TARGETOK) $(DESTDIR)$(INST_LIBDIR)/$(TARGETOK)
-ifneq ($(strip $(STUBHFILES) $(EXTRA_HFILESOK)),)
-	for file in $(STUBHFILES) $(EXTRA_HFILESOK); do \
+ifneq ($(strip $(EXTRA_HFILESOK)),)
+	for file in $(EXTRA_HFILESOK); do \
 	  $(INSTALL_DATA) $$file $(DESTDIR)$(INST_INCLDIR); done;
 endif
 	$(INSTALL_DATA) $(PACKAGENAME).conf $(DESTDIR)$(INST_LIBDIR)
@@ -86,8 +85,7 @@
 	  include_dirs		= [$(call makeTextList, $(INST_INCLDIR)\
 	  $(patsubst -I%,%,$(EXTRA_CPPFLAGS_ONLY_I)))],\
 	  c_includes		= [$(call makeTextList,\
-	  			  $(notdir $(STUBHFILES)) $(HEADER)\
-				  $(notdir $(EXTRA_HFILESOK)))],\
+	  			   $(HEADER) $(notdir $(EXTRA_HFILESOK)))],\
 	  package_deps		= [$(call makeTextList,$(NEEDPACKAGES))],\
 	  extra_ghc_opts	= [$(call makeTextList,$(EXTRAHC_FLAGS))],\
 	  extra_cc_opts		= [],\
@@ -108,8 +106,7 @@
 uninstallfiles :
 	$(RM) $(addprefix $(DESTDIR)$(INST_INCLDIR)/,$(notdir $(ALLHSFILES:.hs=.hi)))
 	$(RM) $(addprefix $(DESTDIR)$(INST_LIBDIR)/,$(TARGETOK))
-	$(RM) $(addprefix $(DESTDIR)$(INST_INCLDIR)/,$(notdir $(STUBHFILES)\
-	  ) $(EXTRA_CFILES:.c=.h))
+	$(RM) $(addprefix $(DESTDIR)$(INST_INCLDIR)/,$(EXTRA_CFILES:.c=.h))
 	$(strip rmdir -p $(sort $(DESTDIR)$(INST_HIDIR) $(DESTDIR)$(INST_LIBDIR) \
 	  $(DESTDIR)$(INST_INCLDIR)) 2> /dev/null || true)
 
@@ -119,20 +116,23 @@
 uninstallpackage :
 	$(PKG) -r $(PACKAGENAME)
 
-$(TARGETOK) : $(ALLHSFILES) $(EXTRA_CFILES:.c=$(OBJSUFFIX)) $(GHCILIBS:\
+.PHONY: compile
+compile : $(ALLHSFILES) $(EXTRA_CFILES:.c=$(OBJSUFFIX)) $(GHCILIBS:\
 	      $(LIBSUFFIX)=$(OBJSUFFIX)) $(GHCIOBJS)
 	$(RM) $(PACKAGENAME).conf
 	$(runC2HS)
-	$(RM) $@
 	$(strip $(HC) --make $(MAINOK) -package-name $(PACKAGENAME) \
 	  -package-conf $(LOCALPKGCONF) $(HCINCLUDES) \
 	  $(EXTRA_CPPFLAGS_ONLY_I) $(EXTRA_LIBS_ONLY_Ll) \
 	  $(LIBS_ONLY_L) $(CPPFLAGS_ONLY_I) \
 	  $(HC_FLAGS) $(EXTRAHC_FLAGS) -i$(HIDIRSOK) $(NEEDPACKAGESOK))
-	$(strip $(AR) crs $@ $(STUBOFILES) $(ALLHSFILES:.hs=$(OBJSUFFIX)) \
-	  $(EXTRA_CFILES:.c=$(OBJSUFFIX)))
 
-# $(STUBOFILES) $(addprefix -#include ,$(STUBHFILES))
+$(TARGETOK) : compile
+	$(RM) $@
+	$(strip $(AR) crs $@ $(filter-out %*_stub.o,\
+	  $(shell echo $(addsuffix *_stub.o,$(SUBDIRSOK)))) \
+	  $(ALLHSFILES:.hs=$(OBJSUFFIX)) \
+	  $(EXTRA_CFILES:.c=$(OBJSUFFIX)))
 
 # GHCi handling
 # The current version of GHCi cannot load lib<blah>.a files. We have to convert

[Gtk2hs-commit] gtk2hs/gtk/misc FileChooserWidget.chs,1.2,1.3

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

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

Modified Files:
	FileChooserWidget.chs 
Log Message:
Axel's patches to get the build to work for gtk-2.2, exclude new module bodies
so c2hs doesn't see the new functions, and change the way _stub.o files are
found so we don't try to link non-existant ones.
Everything should build for gtk-2.0 and gtk-2.2 now.


Index: FileChooserWidget.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/misc/FileChooserWidget.chs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FileChooserWidget.chs	23 May 2004 16:07:53 -0000	1.2
+++ FileChooserWidget.chs	8 Aug 2004 19:04:37 -0000	1.3
@@ -1,3 +1,4 @@
+{-# OPTIONS -cpp #-}
 -- -*-haskell-*-
 --  GIMP Toolkit (GTK) entry Widget FileChooserWidget
 --
@@ -26,15 +27,20 @@
 --
 -- * Added in GTK+ 2.4
 --
+#include<gtk/gtkversion.h>
 
 module FileChooserWidget (
+#if GTK_CHECK_VERSION(2,4,0)
   FileChooserWidgetClass,
   FileChooserWidget,
   FileChooserAction,
   fileChooserWidgetNew,
   fileChooserWidgetNewWithBackend,
+#endif
 ) where
 
+#if GTK_CHECK_VERSION(2,4,0)
+
 import Monad (liftM)
 import FFI
 import Object
@@ -59,3 +65,5 @@
   withCString backend $ \strPtr ->
   {# call unsafe gtk_file_chooser_widget_new_with_backend #}
     (fromIntegral $ fromEnum action) strPtr
+
+#endif

[Gtk2hs-commit] gtk2hs/gconf/System/Gnome/GConf GConfValue.chs,1.1,1.2 GConfClient.chs,1.1,1.2

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

Update of /cvsroot/gtk2hs/gtk2hs/gconf/System/Gnome/GConf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2888/gconf/System/Gnome/GConf

Modified Files:
	GConfValue.chs GConfClient.chs 
Log Message:
Remove GConfSchema type.  It was never bound properly.
This also fixes compatability with ghc 6.0 and ghc 5.04.x.


Index: GConfValue.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gconf/System/Gnome/GConf/GConfValue.chs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- GConfValue.chs	26 Jul 2004 12:02:31 -0000	1.1
+++ GConfValue.chs	6 Aug 2004 02:03:46 -0000	1.2
@@ -38,7 +38,6 @@
  marshalToGConfValue,
  GConfValue(GConfValue),
  GConfValueDyn(..),
- GConfSchema
  ) where
 
 import Monad (liftM, when)
@@ -51,7 +50,6 @@
 {# enum GConfValueType {underscoreToCase} deriving (Eq, Show) #}
 
 {# pointer *GConfValue newtype #}
-{# pointer *GConfSchema foreign newtype #}
 
 -- | Class of types which can be kept by GConf
 class GConfValueClass value where
@@ -80,7 +78,6 @@
                    | GConfValueInt Int
                    | GConfValueFloat Double
                    | GConfValueBool Bool
-                   | GConfValueSchema GConfSchema
                    | GConfValueList [GConfValueDyn] --must all be of same primitive type
                    | GConfValuePair (GConfValueDyn, GConfValueDyn)  --must both be primitive
 
@@ -150,19 +147,6 @@
       {# call unsafe gconf_value_set_string #} value strPtr
     return value
 
-instance GConfValueClass GConfSchema where
-  typeofGConfValue _ = GconfValueString
-
-  unsafeMarshalFromGConfValue value = do
-    ptr <- {# call unsafe gconf_value_get_schema #} value
-    liftM GConfSchema $ newForeignPtr_ ptr
-
-  marshalToGConfValue s = do
-    value <- {# call unsafe gconf_value_new #}
-      (fromIntegral $ fromEnum GconfValueSchema)
-    {# call unsafe gconf_value_set_schema #} value s
-    return value
-
 instance (GConfPrimitiveValueClass a, GConfPrimitiveValueClass b) => GConfValueClass (a,b) where
   typeofGConfValue _ = GconfValuePair
 
@@ -322,7 +306,6 @@
       GconfValueInt    -> liftM GConfValueInt    $ unsafeMarshalFromGConfValue value
       GconfValueFloat  -> liftM GConfValueFloat  $ unsafeMarshalFromGConfValue value
       GconfValueBool   -> liftM GConfValueBool   $ unsafeMarshalFromGConfValue value
-      GconfValueSchema -> liftM GConfValueSchema $ unsafeMarshalFromGConfValue value
       GconfValueList   -> liftM GConfValueList   $ unsafeMarshalGConfValueDynListFromGConfValue value
       GconfValuePair   -> liftM GConfValuePair   $ unsafeMarshalGConfValueDynPairFromGConfValue value
   
@@ -335,7 +318,6 @@
     (GConfValueInt    v') -> marshalToGConfValue v'
     (GConfValueFloat  v') -> marshalToGConfValue v'
     (GConfValueBool   v') -> marshalToGConfValue v'
-    (GConfValueSchema v') -> marshalToGConfValue v'
     (GConfValueList   v') -> marshalGConfValueDynListToGConfValue v'
     (GConfValuePair   v') -> marshalGConfValueDynPairToGConfValue v'
 
@@ -344,6 +326,5 @@
 gconfValueDynGetType (GConfValueInt    _) = GconfValueInt
 gconfValueDynGetType (GConfValueFloat  _) = GconfValueFloat
 gconfValueDynGetType (GConfValueBool   _) = GconfValueBool
-gconfValueDynGetType (GConfValueSchema _) = GconfValueSchema
 gconfValueDynGetType (GConfValueList   _) = GconfValueList
 gconfValueDynGetType (GConfValuePair   _) = GconfValuePair

Index: GConfClient.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gconf/System/Gnome/GConf/GConfClient.chs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- GConfClient.chs	26 Jul 2004 12:02:31 -0000	1.1
+++ GConfClient.chs	6 Aug 2004 02:03:46 -0000	1.2
@@ -82,12 +82,11 @@
   GConfPrimitiveValueClass,
   GConfValue,
   GConfValueDyn(..),
-  GConfSchema
   
 ) where
 
 import Monad	(liftM, when)
-import LocalData (newIORef, readIORef, writeIORef)
+import LocalData (newIORef, readIORef, writeIORef, unsafePerformIO)
 import FFI
 {#import Hierarchy#}
 {#import Signal#}
@@ -273,9 +272,6 @@
 gconfGetString :: GConf -> String -> IO String
 gconfGetString = gconfGet
 
-gconfGetSchema :: GConf -> String -> IO GConfSchema
-gconfGetSchema = gconfGet
-
 gconfGetPair :: GConfValueClass (a,b) =>
                 GConf -> String -> IO (a, b)
 gconfGetPair = gconfGet
@@ -310,9 +306,6 @@
 gconfSetString :: GConf -> String -> String -> IO ()
 gconfSetString = gconfSet
 
-gconfSetSchema :: GConf -> String -> GConfSchema -> IO ()
-gconfSetSchema = gconfSet
-
 gconfSetPair :: GConfValueClass (a,b) =>
                 GConf -> String -> (a, b) -> IO ()
 gconfSetPair = gconfSet

[Gtk2hs-commit] gtk2hs ChangeLog,1.216,1.217

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

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

Modified Files:
	ChangeLog 
Log Message:
Remove GConfSchema type.  It was never bound properly.
This also fixes compatability with ghc 6.0 and ghc 5.04.x.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -d -r1.216 -r1.217
--- ChangeLog	6 Aug 2004 01:48:02 -0000	1.216
+++ ChangeLog	6 Aug 2004 02:03:45 -0000	1.217
@@ -20,6 +20,11 @@
 	* gtk/abstract/ButtonBox.chs, gtk/entry/Entry.chs: make them build with
 	gtk-2.0 & 2.2.
 
+	* gconf/System/Gnome/GConf/GConfValue.chs,
+	gconf/System/Gnome/GConf/GConfClient.chs: remove GConfSchema type. It
+	was never bound properly. This also fixes compatability with ghc 6.0
+	and ghc 5.04.x.
+
 2004-08-5  Duncan Coutts <du...@co...>
 
 	* gtk/treeList/TreeView.chs, gtk/multiline/TextTag.chs,

[Gtk2hs-commit] gtk2hs/gtk/abstract ButtonBox.chs,1.3,1.4

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

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

Modified Files:
	ButtonBox.chs 
Log Message:
Compatability fixes for gtk-2.2 & 2.0 and for ghc-5.04.x.
Also fix a typo in TreeModel.chs which caused a linker error in apps.


Index: ButtonBox.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/abstract/ButtonBox.chs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ButtonBox.chs	26 Jul 2004 16:12:43 -0000	1.3
+++ ButtonBox.chs	6 Aug 2004 01:48:04 -0000	1.4
@@ -29,10 +29,10 @@
   ButtonBoxClass,
   castToButtonBox,
   buttonBoxGetLayout,
-  buttonBoxGetChildSecondary,
   buttonBoxSetLayout,
+  buttonBoxSetChildSecondary,
 #if GTK_CHECK_VERSION(2,4,0)
-  buttonBoxSetChildSecondary
+  buttonBoxGetChildSecondary
 #endif
   ) where
 

[Gtk2hs-commit] gtk2hs/gtk/entry Entry.chs,1.11,1.12

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

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

Modified Files:
	Entry.chs 
Log Message:
Compatability fixes for gtk-2.2 & 2.0 and for ghc-5.04.x.
Also fix a typo in TreeModel.chs which caused a linker error in apps.


Index: Entry.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/entry/Entry.chs,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Entry.chs	4 Aug 2004 19:11:21 -0000	1.11
+++ Entry.chs	6 Aug 2004 01:48:04 -0000	1.12
@@ -52,6 +52,8 @@
   entryGetWidthChars,
   entrySetWidthChars,
 #if GTK_CHECK_VERSION(2,4,0)
+  entrySetAlignment,
+  entryGetAlignment,
   entrySetCompletion,
   entryGetCompletion,
 #endif
@@ -197,6 +199,7 @@
 entrySetWidthChars ec setting = {#call entry_set_width_chars#}
   (toEntry ec) (fromIntegral setting)
 
+#if GTK_CHECK_VERSION(2,4,0)
 -- | Sets the alignment for the contents of the entry. This controls the
 -- horizontal positioning of the contents when the displayed text is shorter
 -- than the width of the entry.
@@ -211,7 +214,6 @@
 entryGetAlignment ec =
   liftM realToFrac $ {#call unsafe entry_get_alignment#} (toEntry ec)
 
-#if GTK_CHECK_VERSION(2,4,0)
 -- | Sets the auxiliary completion object to use with the entry. All further
 -- configuration of the completion mechanism is done on completion using the
 -- "EntryCompletion" API.

[Gtk2hs-commit] gtk2hs/tools/hierarchyGen hierarchy.list,1.10,1.11

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

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

Modified Files:
	hierarchy.list 
Log Message:
Compatability fixes for gtk-2.2 & 2.0 and for ghc-5.04.x.
Also fix a typo in TreeModel.chs which caused a linker error in apps.


Index: hierarchy.list
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/tools/hierarchyGen/hierarchy.list,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- hierarchy.list	4 Aug 2004 18:46:33 -0000	1.10
+++ hierarchy.list	6 Aug 2004 01:48:03 -0000	1.11
@@ -165,7 +165,7 @@
 	GtkTreeModelSort
 	GtkIconFactory
 	GtkSizeGroup
-	GtkClipboard
+	GtkClipboard			if gtk-2.2
 	GtkAccelGroup
 	GtkAccelMap			if gtk-2.4
 	GtkEntryCompletion		if gtk-2.4

[Gtk2hs-commit] gtk2hs/gtk/treeList TreeModel.chs,1.13,1.14

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

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

Modified Files:
	TreeModel.chs 
Log Message:
Compatability fixes for gtk-2.2 & 2.0 and for ghc-5.04.x.
Also fix a typo in TreeModel.chs which caused a linker error in apps.


Index: TreeModel.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/treeList/TreeModel.chs,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- TreeModel.chs	4 Aug 2004 18:42:00 -0000	1.13
+++ TreeModel.chs	6 Aug 2004 01:48:03 -0000	1.14
@@ -171,7 +171,7 @@
 #else
 
 foreign export dynamic mkTreeModelForeachFunc ::
-  (Ptr () -> Ptr () -> Ptr TreePath -> Ptr () -> IO CInt)-> IO TreeModelForeachFunc
+  (Ptr () -> Ptr () -> Ptr TreeIter -> Ptr () -> IO CInt)-> IO TreeModelForeachFunc
 
 #endif
 
@@ -342,10 +342,23 @@
 treeRowReferenceNew tm path = do
   rowRefPtr <- throwIfNull "treeRowReferenceNew: invalid path given" $
     {#call unsafe gtk_tree_row_reference_new#} (toTreeModel tm) path
-  liftM TreeRowReference $ newForeignPtr rowRefPtr tree_row_reference_free
+  liftM TreeRowReference $
+    newForeignPtr rowRefPtr (tree_row_reference_free rowRefPtr)
 
-foreign import ccall unsafe "&tree_row_reference_free"
-  tree_row_reference_free :: FinalizerPtr TreeRowReference
+#if __GLASGOW_HASKELL__>=600
+
+foreign import ccall unsafe "&gtk_tree_row_reference_free"
+  tree_row_reference_free' :: FinalizerPtr TreeRowReference
+
+tree_row_reference_free :: Ptr TreeRowReference -> FinalizerPtr TreeRowReference
+tree_row_reference_free _ = tree_row_reference_free'
+
+#else
+
+foreign import ccall unsafe "gtk_tree_row_reference_free"
+  tree_row_reference_free :: Ptr TreeRowReference -> IO ()
+
+#endif
 
 -- | Returns a path that the row reference currently points to, or @Nothing@ if
 -- the path pointed to is no longer valid.

[Gtk2hs-commit] gtk2hs/gtk/multiline TextTagTable.chs,1.7,1.8

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

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

Modified Files:
	TextTagTable.chs 
Log Message:
Compatability fixes for gtk-2.2 & 2.0 and for ghc-5.04.x.
Also fix a typo in TreeModel.chs which caused a linker error in apps.


Index: TextTagTable.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/multiline/TextTagTable.chs,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- TextTagTable.chs	5 Aug 2004 14:24:28 -0000	1.7
+++ TextTagTable.chs	6 Aug 2004 01:48:03 -0000	1.8
@@ -94,7 +94,7 @@
 #else
 
 foreign export dynamic mkTextTagTableForeach ::
-  (Ptr Widget -> Ptr () -> IO ()) -> IO TextTagTableForeach
+  (Ptr TextTag -> Ptr () -> IO ()) -> IO TextTagTableForeach
 
 #endif
 

[Gtk2hs-commit] gtk2hs/gtk/glib GError.chs,1.3,1.4

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

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

Modified Files:
	GError.chs 
Log Message:
Compatability fixes for gtk-2.2 & 2.0 and for ghc-5.04.x.
Also fix a typo in TreeModel.chs which caused a linker error in apps.


Index: GError.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/glib/GError.chs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- GError.chs	24 Jul 2004 02:31:05 -0000	1.3
+++ GError.chs	6 Aug 2004 01:48:03 -0000	1.4
@@ -1,3 +1,4 @@
+{-# OPTIONS -cpp #-}
 -- -*-haskell-*-
 --  GIMP Toolkit (GTK) GError API
 --
@@ -86,13 +87,20 @@
 
 import Control.Exception
 import Data.Dynamic
-import Data.Typeable
 
 {# context lib="gtk" prefix ="gtk" #}
 
 -- | A GError consists of a domain, code and a human readable message.
 data GError = GError !GErrorDomain !GErrorCode !GErrorMessage
+# if __GLASGOW_HASKELL__>=600
   deriving Typeable
+#else
+{-# NOINLINE gerrorTypeRep #-}
+gerrorTypeRep :: TypeRep
+gerrorTypeRep = mkAppTy (mkTyCon "Graphics.UI.Gtk.GError.GError") []
+instance Typeable GError where
+  typeOf _ = gerrorTypeRep
+#endif
 
 type GQuark = {#type GQuark #}
 
@@ -198,7 +206,7 @@
 -- | Use this if you need to explicitly throw a GError or re-throw an existing
 --   GError that you do not wish to handle.
 throwGError :: GError -> IO a
-throwGError gerror = throwIO (DynException (toDyn gerror))
+throwGError gerror = evaluate (throwDyn gerror)
 
 -- | This will catch any GError exception. The handler function will receive the
 --   raw GError. This is probably only useful when you want to take some action

[Gtk2hs-commit] gtk2hs ChangeLog,1.215,1.216

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

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

Modified Files:
	ChangeLog 
Log Message:
Compatability fixes for gtk-2.2 & 2.0 and for ghc-5.04.x.
Also fix a typo in TreeModel.chs which caused a linker error in apps.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -d -r1.215 -r1.216
--- ChangeLog	6 Aug 2004 01:31:41 -0000	1.215
+++ ChangeLog	6 Aug 2004 01:48:02 -0000	1.216
@@ -7,6 +7,19 @@
 	* gtk/menuComboToolbar/Menu.chs, gtk/layout/Fixed.chs,
 	gtk/display/Label.chs: haddock markup fixes.
 
+	* gtk/glib/GError.chs, gtk/multiline/TextTagTable.chs: ghc 5.04.x
+	compatability fixes.
+
+	* gtk/treeList/TreeModel.chs: ghc 5.04.x compatability and C symbol name
+	typo fix.
+
+	* tools/hierarchyGen/hierarchy.list: gtk_clipboard_get_type() was
+	missing	from gtk-2.0, it apeared in gtk-2.2 so we can only bind
+	GtkClipboard from gtk-2.2 onwards.
+
+	* gtk/abstract/ButtonBox.chs, gtk/entry/Entry.chs: make them build with
+	gtk-2.0 & 2.2.
+
 2004-08-5  Duncan Coutts <du...@co...>
 
 	* gtk/treeList/TreeView.chs, gtk/multiline/TextTag.chs,

[Gtk2hs-commit] gtk2hs/gtk/display Label.chs,1.7,1.8

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

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

Modified Files:
	Label.chs 
Log Message:
Haddock markup fixes. Haddock docs build ok now.


Index: Label.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/display/Label.chs,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Label.chs	1 Aug 2004 16:08:14 -0000	1.7
+++ Label.chs	6 Aug 2004 01:31:42 -0000	1.8
@@ -88,7 +88,7 @@
 labelSetText l str =
   withUTFString str $ {#call label_set_text#} (toLabel l)
 
--- | The label is interpreted as including embedded underlines and/or Pango
+-- | The label is interpreted as including embedded underlines and\/or Pango
 -- markup depending on the markup and underline properties.
 --
 labelSetLabel :: LabelClass l => l -> String -> IO ()

[Gtk2hs-commit] gtk2hs/gtk/layout Fixed.chs,1.1,1.2

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

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

Modified Files:
	Fixed.chs 
Log Message:
Haddock markup fixes. Haddock docs build ok now.


Index: Fixed.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/layout/Fixed.chs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Fixed.chs	3 Aug 2004 04:16:56 -0000	1.1
+++ Fixed.chs	6 Aug 2004 01:31:41 -0000	1.2
@@ -43,7 +43,7 @@
 -- that with 'Fixed'. So your application will not be usable in right-to-left
 -- languages.
 --
--- Finally, fixed positioning makes it kind of annoying to add/remove GUI
+-- Finally, fixed positioning makes it kind of annoying to add\/remove GUI
 -- elements, since you have to reposition all the other elements. This is a
 -- long-term maintenance problem for your application.
 --

[Gtk2hs-commit] gtk2hs/gtk/menuComboToolbar Menu.chs,1.8,1.9

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

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

Modified Files:
	Menu.chs 
Log Message:
Haddock markup fixes. Haddock docs build ok now.


Index: Menu.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/menuComboToolbar/Menu.chs,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Menu.chs	3 Aug 2004 04:01:52 -0000	1.8
+++ Menu.chs	6 Aug 2004 01:31:41 -0000	1.9
@@ -134,8 +134,8 @@
 --
 -- > menu `menuSetAccelPath` "<Gnumeric-Sheet>/File"
 --
--- assign its items the accel paths: "<Gnumeric-Sheet>/File/New" and
--- "<Gnumeric-Sheet>/File/Exit".
+-- assign its items the accel paths: \"<Gnumeric-Sheet>\/File\/New\" and
+-- \"<Gnumeric-Sheet>\/File\/Exit\".
 --
 -- Assigning accel paths to menu items then enables the user to change their
 -- accelerators at runtime. More details about accelerator paths and their

[Gtk2hs-commit] gtk2hs ChangeLog,1.214,1.215

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

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

Modified Files:
	ChangeLog 
Log Message:
Haddock markup fixes. Haddock docs build ok now.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -d -r1.214 -r1.215
--- ChangeLog	6 Aug 2004 01:28:17 -0000	1.214
+++ ChangeLog	6 Aug 2004 01:31:41 -0000	1.215
@@ -4,6 +4,9 @@
 	glade/Makefile, sourceview/Makefile: drop support for ghc 5.02.x.
 	the minimum version required is now 5.04.x.
 
+	* gtk/menuComboToolbar/Menu.chs, gtk/layout/Fixed.chs,
+	gtk/display/Label.chs: haddock markup fixes.
+
 2004-08-5  Duncan Coutts <du...@co...>
 
 	* gtk/treeList/TreeView.chs, gtk/multiline/TextTag.chs,

[Gtk2hs-commit] gtk2hs/sourceview Makefile,1.10,1.11

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

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

Modified Files:
	Makefile 
Log Message:
Drop support for ghc 5.02.x, the minimum version required is now 5.04.x


Index: Makefile
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/sourceview/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile	26 Jul 2004 12:14:47 -0000	1.10
+++ Makefile	6 Aug 2004 01:28:19 -0000	1.11
@@ -37,11 +37,7 @@
 
 EXTRA_LIBS	= $(SOURCEVIEW_LIBS)
 
-ifeq ($(strip $(NEW_MODULE_SYS)),yes)
 NEEDPACKAGES = gtk2
-else
-NEEDPACKAGES = gtk2 lang data
-endif
 
 EXTRA_CHSFILES	+=  SourceViewType.chs
 TYPE_TAGS += sourceview

[Gtk2hs-commit] gtk2hs/glade Makefile,1.5,1.6

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

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

Modified Files:
	Makefile 
Log Message:
Drop support for ghc 5.02.x, the minimum version required is now 5.04.x


Index: Makefile
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/glade/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile	27 Jul 2004 08:21:15 -0000	1.5
+++ Makefile	6 Aug 2004 01:28:18 -0000	1.6
@@ -30,11 +30,7 @@
 
 EXTRA_LIBS	= $(LIBGLADE_LIBS)
 
-ifeq ($(strip $(NEW_MODULE_SYS)),yes)
 NEEDPACKAGES = gtk2
-else
-NEEDPACKAGES = gtk2 lang data
-endif
 
 EXTRA_CHSFILES	+=  GladeType.chs
 TYPE_TAGS += libglade

[Gtk2hs-commit] gtk2hs/gtk Makefile,1.31,1.32

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

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

Modified Files:
	Makefile 
Log Message:
Drop support for ghc 5.02.x, the minimum version required is now 5.04.x


Index: Makefile
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Makefile,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- Makefile	4 Aug 2004 18:46:34 -0000	1.31
+++ Makefile	6 Aug 2004 01:28:18 -0000	1.32
@@ -166,11 +166,7 @@
 	  treeList/TreeModel treeList/TreeViewColumn multiline/TextIter \
 	  gdk/Region
 
-ifneq (x$(NEW_MODULE_SYS),xyes)
-NEEDPACKAGES = data lang
-else
 NEEDPACKAGES = data
-endif
 
 # options that are needed when compiling this or with this package:
 EXTRAHC_FLAGS = -fglasgow-exts 

[Gtk2hs-commit] gtk2hs/mogul Makefile,1.5,1.6

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

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

Modified Files:
	Makefile 
Log Message:
Drop support for ghc 5.02.x, the minimum version required is now 5.04.x


Index: Makefile
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mogul/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile	4 Nov 2003 04:05:27 -0000	1.5
+++ Makefile	6 Aug 2004 01:28:18 -0000	1.6
@@ -6,10 +6,6 @@
 
 MAIN = Mogul.hs
 
-ifeq ($(strip $(NEW_MODULE_SYS)),yes)
 NEEDPACKAGES = gtk2
-else
-NEEDPACKAGES = gtk2 lang data
-endif
 
 include $(TOP)/mk/common.mk

[Gtk2hs-commit] gtk2hs ChangeLog,1.213,1.214 configure.in,1.38,1.39

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

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

Modified Files:
	ChangeLog configure.in 
Log Message:
Drop support for ghc 5.02.x, the minimum version required is now 5.04.x


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -d -r1.213 -r1.214
--- ChangeLog	5 Aug 2004 14:24:27 -0000	1.213
+++ ChangeLog	6 Aug 2004 01:28:17 -0000	1.214
@@ -1,4 +1,10 @@
-2004-08-4  Duncan Coutts <du...@co...>
+2004-08-6  Duncan Coutts <du...@co...>
+
+	* configure.in, mk/config.mk.in, gtk/Makefile, mogul/Makefile,
+	glade/Makefile, sourceview/Makefile: drop support for ghc 5.02.x.
+	the minimum version required is now 5.04.x.
+
+2004-08-5  Duncan Coutts <du...@co...>
 
 	* gtk/treeList/TreeView.chs, gtk/multiline/TextTag.chs,
 	gtk/multiline/TextTagTable.chs, gtk/multiline/TextView.chs: add missing

Index: configure.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/configure.in,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- configure.in	4 Aug 2004 18:46:32 -0000	1.38
+++ configure.in	6 Aug 2004 01:28:17 -0000	1.39
@@ -119,13 +119,13 @@
 
 
 
-dnl Check for GHC-5.02 or greater.
+dnl Check for GHC-5.04 or greater.
 dnl (The next command is not executed, if $HC is already set.)
 AC_PATH_PROG(HC, [$HC ghc], ghc-not-found)
 if test $HC = ghc-not-found; then
  AC_MSG_ERROR([
 Could not find GHC!  This is the only supported compiler.
-You need GHC 5.02 upwards.])
+You need GHC 5.04 upwards.])
 fi
 
 GHC=$HC
@@ -135,8 +135,8 @@
 GHC_VERSION=`$GHC --version | $SED "s/[[a-zA-Z ,]*\([0-9.]*\)[a-zA-Z ]]*/\1/"`
 AC_MSG_RESULT([$GHC_VERSION])
 
-GTKHS_PROG_CHECK_VERSION($GHC_VERSION, -lt, 5.0.2, [
-  AC_MSG_ERROR([I need the FFI of GHC 5.02 upwards!])])
+GTKHS_PROG_CHECK_VERSION($GHC_VERSION, -lt, 5.0.4, [
+  AC_MSG_ERROR([I need the FFI of GHC 5.04 upwards!])])
 
 dnl Calculate a version number with 3 digits (i.e. 502 for 5.2)
 GHC_VERSION_NUMBER=`echo $GHC_VERSION | $SED "s/[[0-9]*\.\([0-9]]*\).*/0\1/"`
@@ -164,13 +164,6 @@
   DLPREFIX="lib";
 ])
 
-dnl Check if this ghc uses the new hierachical module system. If so, we don't
-dnl need to depend on the "lang" or "data" package (which don't exist anymore).
-AC_MSG_CHECKING([new module system])
-NEW_MODULE_SYSTEM=no;
-GTKHS_PROG_CHECK_VERSION($GHC_VERSION, -ge, 5.04.0,[NEW_MODULE_SYSTEM=yes;]);
-AC_MSG_RESULT([$NEW_MODULE_SYSTEM])
-
 GHCBARE=`basename $GHC`
 GHCDIR=`dirname $GHC`
 GHCPKGNAME=ghc-pkg`echo $GHCBARE | $SED s/ghc//`
@@ -542,7 +535,6 @@
 AC_SUBST(BUILT_IN_C2HS)
 AC_SUBST(MULTIPLE_CHS)
 AC_SUBST(FOUR_WORD_CALLBACK)
-AC_SUBST(NEW_MODULE_SYSTEM)
 AC_SUBST(GHCPKG_LISTLOCAL)
 AC_SUBST(LOCALPKGCONF)
 AC_SUBST(HCFLAGS)