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