From: Duncan C. <dun...@us...> - 2004-08-08 19:34:25
|
Update of /cvsroot/gtk2hs/gtk2hs/gtk/general In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6171/gtk/general Modified Files: Enums.chs Structs.hsc Log Message: Add #ifndef DISABLE_DEPRECATED bits so everything should build now with ./configure --disabled-deprecated. Index: Structs.hsc =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/general/Structs.hsc,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- Structs.hsc 3 Aug 2004 04:01:52 -0000 1.26 +++ Structs.hsc 8 Aug 2004 19:34:14 -0000 1.27 @@ -73,7 +73,9 @@ iconSizeLargeToolbar, iconSizeButton, iconSizeDialog, +#ifndef DISABLE_DEPRECATED comboGetList, +#endif priorityLow, priorityDefault, priorityHigh, @@ -591,12 +593,13 @@ -- entry Widget Combo --- | Extract the List container from a 'Combo' --- box. +#ifndef DISABLE_DEPRECATED +-- | Extract the List container from a 'Combo' box. -- comboGetList :: Combo -> IO List comboGetList c = withForeignPtr (unCombo c) $ \cPtr -> makeNewObject mkList $ #{peek GtkCombo, list} cPtr +#endif -- General related constants Index: Enums.chs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/general/Enums.chs,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Enums.chs 23 May 2004 15:58:48 -0000 1.8 +++ Enums.chs 8 Aug 2004 19:34:14 -0000 1.9 @@ -1,3 +1,4 @@ +{-# OPTIONS -cpp #-} -- -*-haskell-*- -- GIMP Toolkit (GTK) Enumerations -- @@ -39,7 +40,9 @@ DeleteType(..), DirectionType(..), Justification(..), +#ifndef DISABLE_DEPRECATED MatchType(..), +#endif MenuDirectionType(..), MetricType(..), MovementStep(..), @@ -57,8 +60,10 @@ SelectionMode(..), ShadowType(..), StateType(..), +#ifndef DISABLE_DEPRECATED SubmenuDirection(..), SubmenuPlacement(..), +#endif SpinButtonUpdatePolicy(..), SpinType(..), TextDirection(..), @@ -160,9 +165,11 @@ -- {#enum Justification {underscoreToCase}#} +#ifndef DISABLE_DEPRECATED -- | some kind of string search options -- {#enum MatchType {underscoreToCase}#} +#endif -- | From where was a menu item entered? -- @@ -251,6 +258,7 @@ -- {#enum StateType {underscoreToCase}#} +#ifndef DISABLE_DEPRECATED -- | Submenu direction policies -- {#enum SubmenuDirection {underscoreToCase}#} @@ -258,6 +266,7 @@ -- | Submenu placement policies -- {#enum SubmenuPlacement {underscoreToCase}#} +#endif -- | Whether to clamp or ignore illegal values. -- |