From: Duncan C. <dun...@us...> - 2004-08-08 19:04:47
|
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 |