[Gtk2hs-commit] gtk2hs/mogul Makefile,1.6,1.7 Mogul.hs,1.7,1.8 NewWidget.hs,1.8,1.9 GetWidget.hs,1.4,1.5

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

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

Modified Files:
	Makefile Mogul.hs NewWidget.hs GetWidget.hs 
Log Message:
Make mogul build with --disabled-deprecated.


Index: GetWidget.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mogul/GetWidget.hs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- GetWidget.hs	25 May 2004 00:33:35 -0000	1.4
+++ GetWidget.hs	8 Aug 2004 20:29:00 -0000	1.5
@@ -1,3 +1,4 @@
+{-# OPTIONS -cpp #-}
 -- -*-haskell-*-
 --  The Monad GUI Library (Mogul): Retrieving a widget from the global store.
 --
@@ -28,7 +29,9 @@
   getMisc,
   getLabel,
   getAccelLabel,
+#ifndef DISABLE_DEPRECATED
   getTipsQuery,
+#endif
   getArrow,
   getImage,
   getContainer,
@@ -40,13 +43,17 @@
   getToggleButton,
   getCheckButton,
   getRadioButton,
+#ifndef DISABLE_DEPRECATED
   getOptionMenu,
+#endif
   getItem,
   getMenuItem,
   getCheckMenuItem,
   getRadioMenuItem,
   getTearoffMenuItem,
+#ifndef DISABLE_DEPRECATED
   getListItem,
+#endif
   getWindow,
   getDialog,
   getColorSelectionDialog,
@@ -68,16 +75,22 @@
   getFontSelection,
   getGammaCurve,
   getHBox,
+#ifndef DISABLE_DEPRECATED
   getCombo,
+#endif
   getStatusbar,
+#ifndef DISABLE_DEPRECATED
   getCList,
   getCTree,
+#endif
   getFixed,
   getPaned,
   getHPaned,
   getVPaned,
   getLayout,
+#ifndef DISABLE_DEPRECATED
   getList,
+#endif
   getMenuShell,
   getMenu,
   getMenuBar,
@@ -106,7 +119,9 @@
   getHSeparator,
   getVSeparator,
   getInvisible,
+#ifndef DISABLE_DEPRECATED
   getPreview,
+#endif
   getProgressBar
   ) where
 
@@ -130,9 +145,11 @@
 getAccelLabel name = 
   widgetLookup name "AccelLabel" mkAccelLabel
 
+#ifndef DISABLE_DEPRECATED
 getTipsQuery :: String -> IO TipsQuery
 getTipsQuery name = 
   widgetLookup name "TipsQuery" mkTipsQuery
+#endif
 
 getArrow :: String -> IO Arrow
 getArrow name = 
@@ -178,9 +195,11 @@
 getRadioButton name = 
   widgetLookup name "RadioButton" mkRadioButton
 
+#ifndef DISABLE_DEPRECATED
 getOptionMenu :: String -> IO OptionMenu
 getOptionMenu name = 
   widgetLookup name "OptionMenu" mkOptionMenu
+#endif
 
 getItem :: String -> IO Item
 getItem name = 
@@ -202,9 +221,11 @@
 getTearoffMenuItem name = 
   widgetLookup name "TearoffMenuItem" mkTearoffMenuItem
 
+#ifndef DISABLE_DEPRECATED
 getListItem :: String -> IO ListItem
 getListItem name = 
   widgetLookup name "ListItem" mkListItem
+#endif
 
 getWindow :: String -> IO Window
 getWindow name = 
@@ -290,14 +311,17 @@
 getHBox name = 
   widgetLookup name "HBox" mkHBox
 
+#ifndef DISABLE_DEPRECATED
 getCombo :: String -> IO Combo
 getCombo name = 
   widgetLookup name "Combo" mkCombo
+#endif
 
 getStatusbar :: String -> IO Statusbar
 getStatusbar name = 
   widgetLookup name "Statusbar" mkStatusbar
 
+#ifndef DISABLE_DEPRECATED
 getCList :: String -> IO CList
 getCList name = 
   widgetLookup name "CList" mkCList
@@ -305,6 +329,7 @@
 getCTree :: String -> IO CTree
 getCTree name = 
   widgetLookup name "CTree" mkCTree
+#endif
 
 getFixed :: String -> IO Fixed
 getFixed name = 
@@ -326,9 +351,11 @@
 getLayout name = 
   widgetLookup name "Layout" mkLayout
 
+#ifndef DISABLE_DEPRECATED
 getList :: String -> IO List
 getList name = 
   widgetLookup name "List" mkList
+#endif
 
 getMenuShell :: String -> IO MenuShell
 getMenuShell name = 
@@ -442,9 +469,11 @@
 getInvisible name = 
   widgetLookup name "Invisible" mkInvisible
 
+#ifndef DISABLE_DEPRECATED
 getPreview :: String -> IO Preview
 getPreview name = 
   widgetLookup name "Preview" mkPreview
+#endif
 
 getProgressBar :: String -> IO ProgressBar
 getProgressBar name = 

Index: NewWidget.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mogul/NewWidget.hs,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- NewWidget.hs	25 May 2004 00:33:35 -0000	1.8
+++ NewWidget.hs	8 Aug 2004 20:29:00 -0000	1.9
@@ -1,3 +1,4 @@
+{-# OPTIONS -cpp #-}
 --  The Monad GUI Library (Mogul): Creation of new widgets.
 --
 --  Author : Axel Simon
@@ -71,8 +72,10 @@
   newNamedRadioButtonJoinGroup,
   newRadioButtonJoinGroupWithLabel,
   newNamedRadioButtonJoinGroupWithLabel,
+#ifndef DISABLE_DEPRECATED
   newOptionMenu,
   newNamedOptionMenu,
+#endif
   newMenuItem,
   newNamedMenuItem,
   newMenuItemWithLabel,
@@ -114,8 +117,10 @@
   --newFontSelection,
   newHBox,
   newNamedHBox,
+#ifndef DISABLE_DEPRECATED
   newCombo,
   newNamedCombo,
+#endif
   newStatusbar,
   newNamedStatusbar,
   newHPaned,
@@ -467,6 +472,7 @@
 newRadioButtonJoinGroupWithLabel grp lbl = 
   radioButtonNewJoinGroupWithLabel grp lbl
 
+#ifndef DISABLE_DEPRECATED
 -- | see 'optionMenuNew'
 --
 -- * The supplied name can later be used to lookup the widget in the global
@@ -479,6 +485,7 @@
 --
 newOptionMenu :: IO OptionMenu
 newOptionMenu = optionMenuNew
+#endif
 
 -- | see 'menuItemNew'
 --
@@ -751,6 +758,7 @@
 newHBox :: Bool -> Int -> IO HBox
 newHBox homogeneous spacing = hBoxNew homogeneous spacing
 
+#ifndef DISABLE_DEPRECATED
 -- | see 'comboNew'
 --
 -- * The supplied name can later be used to lookup the widget in the global
@@ -763,6 +771,7 @@
 --
 newCombo :: IO Combo
 newCombo = comboNew
+#endif
 
 -- | see 'statusbarNew'
 --

Index: Makefile
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mogul/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile	6 Aug 2004 01:28:18 -0000	1.6
+++ Makefile	8 Aug 2004 20:29:00 -0000	1.7
@@ -8,4 +8,8 @@
 
 NEEDPACKAGES = gtk2
 
+ifeq ($(DISABLE_DEPRECATED),yes)
+EXTRAHC_FLAGS += -DDISABLE_DEPRECATED
+endif
+
 include $(TOP)/mk/common.mk

Index: Mogul.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mogul/Mogul.hs,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Mogul.hs	25 May 2004 00:33:35 -0000	1.7
+++ Mogul.hs	8 Aug 2004 20:29:00 -0000	1.8
@@ -1,3 +1,4 @@
+{-# OPTIONS -cpp #-}
 -- -*-haskell-*-
 --  The Monad GUI Library (Mogul): The all importing main file.
 --
@@ -61,7 +62,9 @@
   radioButtonNewWithLabel,
   radioButtonNewJoinGroup,
   radioButtonNewJoinGroupWithLabel,
+#ifndef DISABLE_DEPRECATED
   optionMenuNew,
+#endif
   menuItemNew,
   menuItemNewWithLabel,
   checkMenuItemNew,
@@ -85,7 +88,9 @@
   --colorSelectionNew,
   --fontSelectionNew,
   hBoxNew,
+#ifndef DISABLE_DEPRECATED
   comboNew,
+#endif
   statusbarNew,
   hPanedNew,
   vPanedNew,