[Gtk2hs-commit] gtk2hs/gtk/menuComboToolbar Combo.chs,1.4,1.5 OptionMenu.chs,1.4,1.5 Toolbar.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-serv6171/gtk/menuComboToolbar

Modified Files:
	Combo.chs OptionMenu.chs Toolbar.chs 
Log Message:
Add #ifndef DISABLE_DEPRECATED bits so everything should build now with
./configure --disabled-deprecated.


Index: Combo.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/menuComboToolbar/Combo.chs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Combo.chs	23 May 2004 16:05:21 -0000	1.4
+++ Combo.chs	8 Aug 2004 19:34:14 -0000	1.5
@@ -1,3 +1,4 @@
+{-# OPTIONS -cpp #-}
 -- -*-haskell-*-
 --  GIMP Toolkit (GTK) Widget Combo
 --
@@ -34,6 +35,7 @@
 --   arbitrary widgets yet.
 --
 module Combo(
+#ifndef DISABLE_DEPRECATED
   Combo,
   ComboClass,
   castToCombo,
@@ -44,7 +46,9 @@
   comboSetUseArrowsAlways,
   comboSetCaseSensitive,
   comboDisableActivate
+#endif
   ) where
+#ifndef DISABLE_DEPRECATED
 
 import Monad	(liftM, mapM_)
 import FFI
@@ -117,3 +121,4 @@
 comboDisableActivate :: ComboClass c => c -> IO ()
 comboDisableActivate  = {#call unsafe combo_disable_activate#}.toCombo
 
+#endif

Index: Toolbar.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/menuComboToolbar/Toolbar.chs,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Toolbar.chs	3 Aug 2004 04:01:52 -0000	1.8
+++ Toolbar.chs	8 Aug 2004 19:34:14 -0000	1.9
@@ -43,6 +43,7 @@
 -- Creating a context menu for the toolbar can be done using
 -- 'onPopupContextMenu'.
 --
+#ifndef DISABLE_DEPRECATED
 -- * The following information applies to the /old/ interface only.
 --
 -- 'Button's, 'RadioButton's and 'ToggleButton's can be added by refering to
@@ -61,6 +62,7 @@
 -- image lookup is done manually. A mnemonic in the labels is sadly not
 -- honored this way.
 --
+#endif
 #include <gtk/gtkversion.h>
 
 module Toolbar(
@@ -95,7 +97,9 @@
   iconSizeInvalid,
   iconSizeSmallToolbar,
   iconSizeLargeToolbar,
+#ifndef DISABLE_DEPRECATED
   toolbarSetIconSize,
+#endif
   toolbarGetIconSize,
 #if GTK_CHECK_VERSION(2,4,0)
   toolbarInsert,
@@ -148,6 +152,7 @@
 mkToolText (Just (text,private)) fun = withUTFString text $ \txtPtr -> 
   withUTFString private $ \prvPtr -> fun txtPtr prvPtr
 
+#ifndef DISABLE_DEPRECATED
 -- | Insert a new 'Button' into the 'Toolbar'.
 --
 -- * The new 'Button' is created at position @pos@, counting
@@ -323,6 +328,7 @@
 toolbarPrependNewWidget :: (ToolbarClass tb, WidgetClass w) => tb -> w ->
                            Maybe (String,String) -> IO ()
 toolbarPrependNewWidget tb = toolbarInsertNewWidget tb 0
+#endif
 
 
 -- | Set the direction of the 'Toolbar'.
@@ -369,6 +375,7 @@
 toolbarGetTooltips tb =
   liftM toBool $ {#call unsafe toolbar_get_tooltips#} (toToolbar tb)
 
+#ifndef DISABLE_DEPRECATED
 -- | Set the size of the icons.
 --
 -- * It might be sensible to restrict oneself to 'IconSizeSmallToolbar' and
@@ -377,6 +384,7 @@
 toolbarSetIconSize :: ToolbarClass tb => tb -> IconSize -> IO ()
 toolbarSetIconSize tb is = {#call toolbar_set_icon_size#} (toToolbar tb)
   (fromIntegral is)
+#endif
 
 -- | Retrieve the current icon size that the 'Toolbar' shows.
 --

Index: OptionMenu.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/menuComboToolbar/OptionMenu.chs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- OptionMenu.chs	23 May 2004 16:05:21 -0000	1.4
+++ OptionMenu.chs	8 Aug 2004 19:34:14 -0000	1.5
@@ -1,3 +1,4 @@
+{-# OPTIONS -cpp #-}
 -- -*-haskell-*-
 --  GIMP Toolkit (GTK) Widget OptionMenu
 --
@@ -23,6 +24,7 @@
 --
 
 module OptionMenu(
+#ifndef DISABLE_DEPRECATED
   OptionMenu,
   OptionMenuClass,
   castToOptionMenu,
@@ -34,7 +36,9 @@
   optionMenuGetHistory,
   onOMChanged,
   afterOMChanged
+#endif
   ) where
+#ifndef DISABLE_DEPRECATED
 
 import Monad	(liftM)
 import FFI
@@ -88,10 +92,11 @@
 
 -- signals
 
--- | This signal is called if the selected option
--- has changed.
+-- | This signal is called if the selected option has changed.
 --
 onOMChanged, afterOMChanged :: OptionMenuClass om => om -> IO () ->
                                IO (ConnectId om)
 onOMChanged = connect_NONE__NONE "changed" False
 afterOMChanged = connect_NONE__NONE "changed" True
+
+#endif