Menu
▾
▴
gtk2hs-commit — Mailing list for Darcs commit messages.
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(4) |
Jun
|
Jul
(68) |
Aug
(4) |
Sep
|
Oct
(23) |
Nov
(95) |
Dec
(9) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(3) |
Feb
|
Mar
|
Apr
(51) |
May
(81) |
Jun
(2) |
Jul
(86) |
Aug
(143) |
Sep
(3) |
Oct
(31) |
Nov
(63) |
Dec
(90) |
| 2005 |
Jan
(277) |
Feb
(157) |
Mar
(99) |
Apr
(195) |
May
(151) |
Jun
(148) |
Jul
(98) |
Aug
(123) |
Sep
(20) |
Oct
(174) |
Nov
(155) |
Dec
(26) |
| 2006 |
Jan
(51) |
Feb
(19) |
Mar
(16) |
Apr
(12) |
May
(5) |
Jun
|
Jul
(11) |
Aug
(7) |
Sep
(10) |
Oct
(31) |
Nov
(174) |
Dec
(56) |
| 2007 |
Jan
(45) |
Feb
(52) |
Mar
(10) |
Apr
(5) |
May
(47) |
Jun
(16) |
Jul
(80) |
Aug
(29) |
Sep
(14) |
Oct
(59) |
Nov
(46) |
Dec
(16) |
| 2008 |
Jan
(10) |
Feb
(1) |
Mar
|
Apr
|
May
(49) |
Jun
(26) |
Jul
(8) |
Aug
(4) |
Sep
(25) |
Oct
(53) |
Nov
(9) |
Dec
(1) |
| 2009 |
Jan
(66) |
Feb
(11) |
Mar
(1) |
Apr
(14) |
May
(8) |
Jun
(1) |
Jul
(2) |
Aug
(2) |
Sep
(9) |
Oct
(23) |
Nov
(35) |
Dec
|
| 2010 |
Jan
(7) |
Feb
(2) |
Mar
(39) |
Apr
(19) |
May
(161) |
Jun
(19) |
Jul
(32) |
Aug
(65) |
Sep
(113) |
Oct
(120) |
Nov
(2) |
Dec
|
| 2012 |
Jan
|
Feb
(5) |
Mar
(4) |
Apr
(7) |
May
(9) |
Jun
(14) |
Jul
(1) |
Aug
|
Sep
(1) |
Oct
(1) |
Nov
(12) |
Dec
(2) |
| 2013 |
Jan
(1) |
Feb
(17) |
Mar
(4) |
Apr
(4) |
May
(9) |
Jun
|
Jul
(8) |
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
|
From: Duncan C. <dun...@us...> - 2004-08-10 14:52:26
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22901 Modified Files: ChangeLog Log Message: Removed support for versions of ghc pre 5.04. ghc 5.04 supports the new FFI syntax so remove old-style "foreign export dynamic" versions. Tested with ghc 5.04 & 5.04.3 Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.221 retrieving revision 1.222 diff -u -d -r1.221 -r1.222 --- ChangeLog 10 Aug 2004 12:15:41 -0000 1.221 +++ ChangeLog 10 Aug 2004 14:51:45 -0000 1.222 @@ -4,6 +4,17 @@ * gtk/layout/Notebook.chs: fix typos. + * compat/LocalControl.hs, compat/LocalData.hs, gtk/general/FFI.hs: + remove support for versions of ghc pre 5.04. + + * gconf/System/Gnome/GConf/GConfClient.chs, gtk/abstract/Container.chs + gtk/entry/EntryCompletion.chs, gtk/general/General.chs, + gtk/glib/GObject.chs, gtk/multiline/TextIter.chs, + gtk/multiline/TextTagTable.chs, gtk/treeList/TreeModel.chs, + gtk/treeList/TreeSelection.chs, gtk/treeList/TreeView.chs, + tools/callbackGen/Signal.chs-boot2: ghc 5.04 supports the new FFI + syntax so remove old-style "foreign export dynamic" versions. + 2004-08-9 Duncan Coutts <du...@co...> * gtk/layout/Notebook.chs: bind some new functions. Mark deprecated |
|
From: Duncan C. <dun...@us...> - 2004-08-10 14:51:58
|
Update of /cvsroot/gtk2hs/gtk2hs/tools/callbackGen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22901/tools/callbackGen Modified Files: Signal.chs-boot2 Log Message: Removed support for versions of ghc pre 5.04. ghc 5.04 supports the new FFI syntax so remove old-style "foreign export dynamic" versions. Tested with ghc 5.04 & 5.04.3 Index: Signal.chs-boot2 =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/tools/callbackGen/Signal.chs-boot2,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Signal.chs-boot2 17 Jul 2004 04:05:13 -0000 1.2 +++ Signal.chs-boot2 10 Aug 2004 14:51:48 -0000 1.3 @@ -25,16 +25,8 @@ {#pointer GClosureNotify#} -#if __GLASGOW_HASKELL__>=600 - foreign import ccall "wrapper" mkDestructor :: IO () -> IO GClosureNotify -#else - -foreign export dynamic mkDestructor :: IO () -> IO GClosureNotify - -#endif - disconnect :: GObjectClass obj => ConnectId obj -> IO () disconnect (ConnectID handler obj) = withForeignPtr ((unGObject.toGObject) obj) $ \objPtr -> |
|
From: Duncan C. <dun...@us...> - 2004-08-10 14:51:58
|
Update of /cvsroot/gtk2hs/gtk2hs/gtk/treeList In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22901/gtk/treeList Modified Files: TreeModel.chs TreeSelection.chs TreeView.chs Log Message: Removed support for versions of ghc pre 5.04. ghc 5.04 supports the new FFI syntax so remove old-style "foreign export dynamic" versions. Tested with ghc 5.04 & 5.04.3 Index: TreeView.chs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/treeList/TreeView.chs,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- TreeView.chs 5 Aug 2004 14:24:27 -0000 1.17 +++ TreeView.chs 10 Aug 2004 14:51:48 -0000 1.18 @@ -429,20 +429,10 @@ {#pointer TreeViewColumnDropFunc#} -#if __GLASGOW_HASKELL__>=600 - foreign import ccall "wrapper" mkTreeViewColumnDropFunc :: (Ptr () -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> Ptr () -> IO {#type gboolean#}) -> IO TreeViewColumnDropFunc -#else - -foreign export dynamic mkTreeViewColumnDropFunc :: - (Ptr () -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> - Ptr () -> IO {#type gboolean#}) -> IO TreeViewColumnDropFunc - -#endif - -- | Scroll to a coordinate. -- @@ -596,20 +586,10 @@ {#pointer TreeViewMappingFunc#} -#if __GLASGOW_HASKELL__>=600 - foreign import ccall "wrapper" mkTreeViewMappingFunc :: (Ptr TreeView -> Ptr TreePath -> Ptr () -> IO ()) -> IO TreeViewMappingFunc -#else - -foreign export dynamic mkTreeViewMappingFunc :: - (Ptr TreeView -> Ptr TreePath -> Ptr () -> IO ()) -> - IO TreeViewMappingFunc - -#endif - -- | Check if row is expanded. -- treeViewRowExpanded :: TreeViewClass tv => tv -> TreePath -> IO Bool @@ -815,20 +795,10 @@ {#pointer TreeViewSearchEqualFunc#} -#if __GLASGOW_HASKELL__>=600 - foreign import ccall "wrapper" mkTreeViewSearchEqualFunc :: (Ptr TreeModel -> {#type gint#} -> CString -> Ptr TreeIter -> Ptr () -> IO {#type gboolean#}) -> IO TreeViewSearchEqualFunc -#else - -foreign export dynamic mkTreeViewSearchEqualFunc :: - (Ptr TreeModel -> {#type gint#} -> CString -> Ptr TreeIter -> Ptr () -> - IO {#type gboolean#}) -> IO TreeViewSearchEqualFunc - -#endif - -- | The user has dragged a column to another -- position. -- Index: TreeModel.chs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/treeList/TreeModel.chs,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- TreeModel.chs 6 Aug 2004 01:48:03 -0000 1.14 +++ TreeModel.chs 10 Aug 2004 14:51:48 -0000 1.15 @@ -163,18 +163,9 @@ {#pointer TreeModelForeachFunc#} -#if __GLASGOW_HASKELL__>=600 - foreign import ccall "wrapper" mkTreeModelForeachFunc :: (Ptr () -> Ptr () -> Ptr TreeIter -> Ptr () -> IO CInt) -> IO TreeModelForeachFunc -#else - -foreign export dynamic mkTreeModelForeachFunc :: - (Ptr () -> Ptr () -> Ptr TreeIter -> Ptr () -> IO CInt)-> IO TreeModelForeachFunc - -#endif - -- | Returns a set of flags supported by this interface. The flags supported -- should not change during the lifecycle of the model. -- Index: TreeSelection.chs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/treeList/TreeSelection.chs,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- TreeSelection.chs 4 Aug 2004 18:42:00 -0000 1.10 +++ TreeSelection.chs 10 Aug 2004 14:51:48 -0000 1.11 @@ -113,18 +113,9 @@ type TreeSelectionCB = TreePath -> IO () {#pointer TreeSelectionFunc#} -#if __GLASGOW_HASKELL__>=600 - foreign import ccall "wrapper" mkTreeSelectionFunc :: (Ptr () -> Ptr () -> Ptr TreePath -> Ptr () -> IO ())-> IO TreeSelectionFunc -#else - -foreign export dynamic mkTreeSelectionFunc :: - (Ptr () -> Ptr () -> Ptr TreePath -> Ptr () -> IO ())-> IO TreeSelectionFunc - -#endif - -- | Retrieve the TreeView widget that this -- TreeSelection works on. -- @@ -168,18 +159,9 @@ type TreeSelectionForeachCB = TreeIter -> IO () {#pointer TreeSelectionForeachFunc#} -#if __GLASGOW_HASKELL__>=600 - foreign import ccall "wrapper" mkTreeSelectionForeachFunc :: (Ptr () -> Ptr TreeIter -> Ptr () -> IO ()) -> IO TreeSelectionForeachFunc -#else - -foreign export dynamic mkTreeSelectionForeachFunc :: - (Ptr () -> Ptr TreeIter -> Ptr () -> IO ()) -> IO TreeSelectionForeachFunc - -#endif - -- | Select a specific item by TreePath. -- treeSelectionSelectPath :: (TreeSelectionClass ts) => ts -> TreePath -> IO () |
|
From: Duncan C. <dun...@us...> - 2004-08-10 14:51:57
|
Update of /cvsroot/gtk2hs/gtk2hs/gtk/multiline In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22901/gtk/multiline Modified Files: TextIter.chs TextTagTable.chs Log Message: Removed support for versions of ghc pre 5.04. ghc 5.04 supports the new FFI syntax so remove old-style "foreign export dynamic" versions. Tested with ghc 5.04 & 5.04.3 Index: TextTagTable.chs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/multiline/TextTagTable.chs,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- TextTagTable.chs 6 Aug 2004 01:48:03 -0000 1.8 +++ TextTagTable.chs 10 Aug 2004 14:51:47 -0000 1.9 @@ -86,18 +86,9 @@ {#pointer TextTagTableForeach#} -#if __GLASGOW_HASKELL__>=600 - foreign import ccall "wrapper" mkTextTagTableForeach :: (Ptr TextTag -> Ptr () -> IO ()) -> IO TextTagTableForeach -#else - -foreign export dynamic mkTextTagTableForeach :: - (Ptr TextTag -> Ptr () -> IO ()) -> IO TextTagTableForeach - -#endif - -- | Returns the size of the table (the number of tags). -- textTagTableGetSize :: TextTagTableClass obj => obj -> IO Int Index: TextIter.chs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/multiline/TextIter.chs,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- TextIter.chs 23 May 2004 16:09:08 -0000 1.12 +++ TextIter.chs 10 Aug 2004 14:51:47 -0000 1.13 @@ -702,18 +702,9 @@ {#pointer TextCharPredicate#} -#if __GLASGOW_HASKELL__>=600 - foreign import ccall "wrapper" mkTextCharPredicate :: ({#type gunichar#} -> Ptr () -> {#type gboolean#}) -> IO TextCharPredicate -#else - -foreign export dynamic mkTextCharPredicate :: - ({#type gunichar#} -> Ptr () -> {#type gboolean#}) -> IO TextCharPredicate - -#endif - -- | Move 'TextIter' forward until a -- predicate function returns True. -- |
|
From: Duncan C. <dun...@us...> - 2004-08-10 14:51:57
|
Update of /cvsroot/gtk2hs/gtk2hs/gtk/abstract In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22901/gtk/abstract Modified Files: Container.chs Log Message: Removed support for versions of ghc pre 5.04. ghc 5.04 supports the new FFI syntax so remove old-style "foreign export dynamic" versions. Tested with ghc 5.04 & 5.04.3 Index: Container.chs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/abstract/Container.chs,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Container.chs 4 Aug 2004 18:41:43 -0000 1.8 +++ Container.chs 10 Aug 2004 14:51:47 -0000 1.9 @@ -108,18 +108,9 @@ type ContainerForeachCB = Widget -> IO () {#pointer Callback#} -#if __GLASGOW_HASKELL__>=600 - foreign import ccall "wrapper" mkContainerForeachFunc :: (Ptr Widget -> Ptr () -> IO ()) -> IO Callback -#else - -foreign export dynamic mkContainerForeachFunc :: - (Ptr Widget -> Ptr () -> IO ()) -> IO Callback - -#endif - -- | Returns the the container's children. -- containerGetChildren :: ContainerClass c => c -> IO [Widget] |
|
From: Duncan C. <dun...@us...> - 2004-08-10 14:51:57
|
Update of /cvsroot/gtk2hs/gtk2hs/gtk/entry In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22901/gtk/entry Modified Files: EntryCompletion.chs Log Message: Removed support for versions of ghc pre 5.04. ghc 5.04 supports the new FFI syntax so remove old-style "foreign export dynamic" versions. Tested with ghc 5.04 & 5.04.3 Index: EntryCompletion.chs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/entry/EntryCompletion.chs,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- EntryCompletion.chs 8 Aug 2004 19:04:38 -0000 1.4 +++ EntryCompletion.chs 10 Aug 2004 14:51:47 -0000 1.5 @@ -124,11 +124,7 @@ -- {#pointer GDestroyNotify#} -#if __GLASGOW_HASKELL__>=504 foreign import ccall "wrapper" mkDestructor :: IO () -> IO GDestroyNotify -#else -foreign export dynamic mkDestructor :: IO () -> IO GDestroyNotify -#endif type GtkEntryCompletionMatchFunc = Ptr EntryCompletion -> --GtkEntryCompletion *completion @@ -137,15 +133,9 @@ Ptr () -> --gpointer user_data IO () -#if __GLASGOW_HASKELL__>=504 foreign import ccall "wrapper" mkHandler_GtkEntryCompletionMatchFunc :: GtkEntryCompletionMatchFunc -> IO (FunPtr GtkEntryCompletionMatchFunc) -#else -foreign export dynamic mkHandler_GtkEntryCompletionMatchFunc :: - GtkEntryCompletionMatchFunc -> - IO (FunPtr GtkEntryCompletionMatchFunc) -#endif connect_GtkEntryCompletionMatchFunc :: EntryCompletion -> (String -> TreeIter -> IO ()) -> |
|
From: Duncan C. <dun...@us...> - 2004-08-10 14:51:57
|
Update of /cvsroot/gtk2hs/gtk2hs/gtk/glib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22901/gtk/glib Modified Files: GObject.chs Log Message: Removed support for versions of ghc pre 5.04. ghc 5.04 supports the new FFI syntax so remove old-style "foreign export dynamic" versions. Tested with ghc 5.04 & 5.04.3 Index: GObject.chs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/glib/GObject.chs,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- GObject.chs 23 May 2004 16:00:53 -0000 1.8 +++ GObject.chs 10 Aug 2004 14:51:47 -0000 1.9 @@ -104,16 +104,8 @@ {#pointer GWeakNotify#} -#if __GLASGOW_HASKELL__>=600 - foreign import ccall "wrapper" mkDestructor :: IO () -> IO GWeakNotify -#else - -foreign export dynamic mkDestructor :: IO () -> IO GWeakNotify - -#endif - -- | attach a callback that will be called after the -- destroy hooks have been called -- |
|
From: Duncan C. <dun...@us...> - 2004-08-10 14:51:56
|
Update of /cvsroot/gtk2hs/gtk2hs/gconf/System/Gnome/GConf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22901/gconf/System/Gnome/GConf Modified Files: GConfClient.chs Log Message: Removed support for versions of ghc pre 5.04. ghc 5.04 supports the new FFI syntax so remove old-style "foreign export dynamic" versions. Tested with ghc 5.04 & 5.04.3 Index: GConfClient.chs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gconf/System/Gnome/GConf/GConfClient.chs,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- GConfClient.chs 8 Aug 2004 19:09:56 -0000 1.3 +++ GConfClient.chs 10 Aug 2004 14:51:46 -0000 1.4 @@ -175,11 +175,7 @@ {#pointer GFreeFunc#} -#if __GLASGOW_HASKELL__>=504 foreign import ccall "wrapper" mkDestructor :: IO () -> IO GFreeFunc -#else -foreign export dynamic mkDestructor :: IO () -> IO GFreeFunc -#endif type GConfClientNotifyFunc = Ptr () -> --GConfClient *client {#type guint#} -> --guint cnxn_id @@ -187,13 +183,8 @@ Ptr () -> --gpointer user_data IO () -#if __GLASGOW_HASKELL__>=504 foreign import ccall "wrapper" mkHandler_GConfClientNotifyFunc :: GConfClientNotifyFunc -> IO (FunPtr GConfClientNotifyFunc) -#else -foreign export dynamic mkHandler_GConfClientNotifyFunc :: - GConfClientNotifyFunc -> IO (FunPtr GConfClientNotifyFunc) -#endif connect_GConfClientNotifyFunc :: GConf -> |
|
From: Duncan C. <dun...@us...> - 2004-08-10 14:51:55
|
Update of /cvsroot/gtk2hs/gtk2hs/gtk/general In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22901/gtk/general Modified Files: FFI.hs General.chs Log Message: Removed support for versions of ghc pre 5.04. ghc 5.04 supports the new FFI syntax so remove old-style "foreign export dynamic" versions. Tested with ghc 5.04 & 5.04.3 Index: General.chs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/general/General.chs,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- General.chs 29 Jul 2004 00:53:40 -0000 1.13 +++ General.chs 10 Aug 2004 14:51:46 -0000 1.14 @@ -179,20 +179,10 @@ {#pointer GDestroyNotify as DestroyNotify#} -#if __GLASGOW_HASKELL__>=600 - foreign import ccall "wrapper" mkHandler :: IO {#type gint#} -> IO Function foreign import ccall "wrapper" mkDestructor :: IO () -> IO DestroyNotify -#else - -foreign export dynamic mkHandler :: IO {#type gint#} -> IO Function - -foreign export dynamic mkDestructor :: IO () -> IO DestroyNotify - -#endif - type HandlerId = {#type guint#} -- Turn a function into a function pointer and a destructor pointer. Index: FFI.hs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/general/FFI.hs,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- FFI.hs 3 Aug 2004 02:36:39 -0000 1.4 +++ FFI.hs 10 Aug 2004 14:51:46 -0000 1.5 @@ -41,18 +41,13 @@ newForeignPtr, foreignPtrToPtr, module Foreign, -#if __GLASGOW_HASKELL__>=504 module Foreign.C -#else - module CForeign -#endif ) where import Monad (liftM) import Char import LocalData(unsafePerformIO) -#if __GLASGOW_HASKELL__>=504 import Data.Bits import Foreign.C import qualified Foreign @@ -62,21 +57,9 @@ # else import Foreign hiding (with) # endif -#else -import Bits -import CForeign -import qualified Foreign -import Foreign hiding (withObject) -#endif - -#if __GLASGOW_HASKELL__>=504 with :: (Storable a) => a -> (Ptr a -> IO b) -> IO b with = Foreign.with -#else -with :: (Storable a) => a -> (Ptr a -> IO b) -> IO b -with = Foreign.withObject -#endif #if __GLASGOW_HASKELL__>=602 newForeignPtr = flip Foreign.newForeignPtr |
|
From: Duncan C. <dun...@us...> - 2004-08-10 12:21:14
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29113 Modified Files: configure.in Log Message: Require autoconf 2.50 or greater. Index: configure.in =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/configure.in,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- configure.in 8 Aug 2004 19:34:13 -0000 1.40 +++ configure.in 10 Aug 2004 12:21:03 -0000 1.41 @@ -24,6 +24,10 @@ AC_INIT(VERSION) +dnl * We require autoconf version 2.50 +dnl We need 2.50 due to the use of OBJEXT +AC_PREREQ(2.50) + dnl Check system type. AC_CANONICAL_HOST |
|
From: Duncan C. <dun...@us...> - 2004-08-10 12:15:51
|
Update of /cvsroot/gtk2hs/gtk2hs/gtk/layout In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28195/gtk/layout Modified Files: Notebook.chs Log Message: Fix a couple typos. Index: Notebook.chs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/layout/Notebook.chs,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- Notebook.chs 9 Aug 2004 22:54:03 -0000 1.9 +++ Notebook.chs 10 Aug 2004 12:15:41 -0000 1.10 @@ -140,7 +140,7 @@ -- -- * This function returns @Int@ in Gtk version 2.4.0 and later. -- -notebookAppendPage :: (NotebookClass nb, WidgetClass child) => nb -> +notebookAppendPage :: (NotebookClass nb, WidgetClass child) => nb -> child -- ^ Widget to use as the contents of the page -> String -- ^ Label for the page. -> IO () @@ -222,7 +222,7 @@ -- -- * This function returns @Int@ in Gtk version 2.4.0 and later. -- -notebookPrependPage :: (NotebookClass nb, WidgetClass child) => nb -> +notebookPrependPage :: (NotebookClass nb, WidgetClass child) => nb -> child -- ^ Widget to use as the contents of the page -> String -- ^ Label for the page. -> IO () |
|
From: Duncan C. <dun...@us...> - 2004-08-10 12:15:50
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28195 Modified Files: ChangeLog Log Message: Fix a couple typos. Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.220 retrieving revision 1.221 diff -u -d -r1.220 -r1.221 --- ChangeLog 9 Aug 2004 22:54:03 -0000 1.220 +++ ChangeLog 10 Aug 2004 12:15:41 -0000 1.221 @@ -1,3 +1,9 @@ +2004-08-10 Duncan Coutts <du...@co...> + + * configure.in: require autoconf 2.50 or greater, 2.13 doesn't work. + + * gtk/layout/Notebook.chs: fix typos. + 2004-08-9 Duncan Coutts <du...@co...> * gtk/layout/Notebook.chs: bind some new functions. Mark deprecated |
|
From: Duncan C. <dun...@us...> - 2004-08-09 22:54:29
|
Update of /cvsroot/gtk2hs/gtk2hs/gtk/layout In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12364/gtk/layout Modified Files: Notebook.chs Log Message: bind some new functions. Mark deprecated functions. Generalise the notebook(Append|Prepend|Insert)PageMenu functions to take an arbitrary widget for the popup menu. This is a slight change in API. Quite a bit of docs cleanup. Index: Notebook.chs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/layout/Notebook.chs,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Notebook.chs 23 May 2004 16:02:58 -0000 1.8 +++ Notebook.chs 9 Aug 2004 22:54:03 -0000 1.9 @@ -22,22 +22,17 @@ -- -- | -- --- This widget can display several pages of widgets. Each page can be --- selected by a tab at the top of the widget. It is useful in dialogs where --- a lot of information has to be displayed. +-- This widget can display several pages of widgets. Each page can be selected +-- by a tab at the top of the widget. It is useful in dialogs where a lot of +-- information has to be displayed. -- -- TODO -- --- * check if it is sensible and possible to have something else than a Label --- widget in the context menu. If so, change the notebook*PageMenu function --- and add notebookSetMenuLabel and notebookSetMenuText. --- --- * notebookSetTabLabelText is not bound. --- -- * The signals focus-tab and select-page are not bound because it is unclear -- what they mean. As far as I can see they are not emitted anywhere. -- -#include<gtk/gtkversion.h> +#include <gtk/gtkversion.h> + module Notebook( Notebook, NotebookClass, @@ -57,25 +52,37 @@ notebookReorderChild, PositionType(..), notebookSetTabPos, + notebookGetTabPos, notebookSetShowTabs, + notebookGetShowTabs, notebookSetShowBorder, notebookSetScrollable, + notebookGetScrollable, +#ifndef DISABLE_DEPRECATED notebookSetTabBorder, notebookSetTabHBorder, notebookSetTabVBorder, +#endif notebookSetPopup, notebookGetCurrentPage, + notebookSetMenuLabel, notebookGetMenuLabel, + notebookSetMenuLabelText, + notebookGetMenuLabelText, notebookGetNthPage, #if GTK_CHECK_VERSION(2,2,0) notebookGetNPages, #endif notebookGetTabLabel, + notebookGetTabLabelText, Packing(..), PackType(..), notebookQueryTabLabelPacking, notebookSetTabLabelPacking, +#ifndef DISABLE_DEPRECATED notebookSetHomogeneousTabs, +#endif notebookSetTabLabel, + notebookSetTabLabelText, onSwitchPage, afterSwitchPage ) where @@ -101,21 +108,22 @@ liftM castPtr {#call unsafe notebook_new#} #if GTK_CHECK_VERSION(2,4,0) --- | Insert a new tab to the right of the existing --- tabs. +-- | Insert a new tab to the right of the existing tabs. -- --- * The @tabName@ will be inserted as a Label widget. In case the --- context menu is enabled, this name will appear in the menu. If you want --- to specify something else to go in the tab, use --- 'notebookAppendPageMenu' and specify some suitable widget for --- @menuLabel@. Returns index (starting from 0) of the appended page --- in the notebook, or -1 if function fails. +-- * The given label will be used for the label widget of the new tab. In case +-- the context menu is enabled, this name will also appear in the popup menu. If +-- you want to specify something else to go in the tab, use +-- 'notebookAppendPageMenu'. -- --- * This function returned @()@ in Gtk version --- 2.2.X and earlier +-- * Returns index (starting from 0) of the appended page in the notebook, or -1 +-- if the function fails. -- -notebookAppendPage :: (NotebookClass nb, WidgetClass child) => nb -> child -> - String -> IO Int +-- * This function returned @()@ in Gtk version 2.2.X and earlier +-- +notebookAppendPage :: (NotebookClass nb, WidgetClass child) => nb + -> child -- ^ Widget to use as the contents of the page + -> String -- ^ Label for the page. + -> IO Int notebookAppendPage nb child tabLabel = do tab <- labelNew (Just tabLabel) liftM fromIntegral $ @@ -123,220 +131,245 @@ (toWidget tab) #else --- | Insert a new tab to the right of the existing --- tabs. +-- | Insert a new tab to the right of the existing tabs. -- --- * The @tabName@ will be inserted as a Label widget. In case the --- context menu is enabled, this name will appear in the menu. If you want --- to specify something else to go in the tab, use --- 'notebookAppendPageMenu' and specify some suitable widget for --- @menuLabel@. +-- * The given label will be used for the label widget of the new tab. In case +-- the context popup menu is enabled, this name will also appear in the menu. If +-- you want to specify something else to go in the tab, use +-- 'notebookAppendPageMenu'. -- --- * This function returns @Int@ in Gtk version --- 2.4.0 and later +-- * This function returns @Int@ in Gtk version 2.4.0 and later. -- -notebookAppendPage :: (NotebookClass nb, WidgetClass child) => nb -> child -> - String -> IO () +notebookAppendPage :: (NotebookClass nb, WidgetClass child) => nb -> + -> child -- ^ Widget to use as the contents of the page + -> String -- ^ Label for the page. + -> IO () notebookAppendPage nb child tabLabel = do tab <- labelNew (Just tabLabel) - {#call notebook_append_page#} (toNotebook nb) (toWidget child) - (toWidget tab) + {#call notebook_append_page#} (toNotebook nb) (toWidget child) (toWidget tab) #endif #if GTK_CHECK_VERSION(2,4,0) --- | Insert a new tab to the right of the --- existing tabs. @menuLabel@ is the label for the context menu --- (useful if @tabLabel@ is not a Label widget). Return index --- (starting from 0) of the appended page in the notebook, or -1 if --- function fails +-- | Insert a new tab to the right of the existing tabs. -- --- * This function returned @()@ in Gtk version --- 2.2.X and earlier +-- Like 'notebookAppendPage' but allows any widget to be used for the label of +-- the new tab and then entry in the page-switch popup menu. -- -notebookAppendPageMenu ::(NotebookClass nb, WidgetClass child, - WidgetClass tab) => nb -> child -> tab -> String -> IO Int -notebookAppendPageMenu nb child tabWidget menuLabel = do - menu <- labelNew (Just menuLabel) - liftM fromIntegral $ - {#call notebook_append_page_menu#} (toNotebook nb) (toWidget child) - (toWidget tabWidget) (toWidget menu) +-- * Returns the index (starting from 0) of the appended page in the notebook, +-- or -1 if the function fails. +-- +-- * This function returned @()@ in Gtk version 2.2.X and earlier +-- +notebookAppendPageMenu :: (NotebookClass nb, WidgetClass child, + WidgetClass tab, WidgetClass menu) => nb + -> child -- ^ Widget to use as the contents of the page + -> tab -- ^ Tab label widget for the page. + -> menu -- ^ Menu entry for this tab (usually a 'Label' widget). + -> IO Int +notebookAppendPageMenu nb child tabWidget menuWidget = liftM fromIntegral $ + {#call notebook_append_page_menu#} (toNotebook nb) (toWidget child) + (toWidget tabWidget) (toWidget menuWidget) #else --- | Insert a new tab to the right of the --- existing tabs. @menuLabel@ is the label for the context menu --- (useful if @tabLabel@ is not a Label widget). +-- | Insert a new tab to the right of the existing tabs. -- --- * This function returns @Int@ in Gtk version --- 2.4.0 and later +-- Like 'notebookAppendPage' but allows any widget to be used for the label of +-- the new tab and then entry in the page-switch popup menu. -- -notebookAppendPageMenu ::(NotebookClass nb, WidgetClass child, - WidgetClass tab) => nb -> child -> tab -> String -> IO () -notebookAppendPageMenu nb child tabWidget menuLabel = do - menu <- labelNew (Just menuLabel) +-- * This function returns @Int@ in Gtk version 2.4.0 and later +-- +notebookAppendPageMenu :: (NotebookClass nb, WidgetClass child, + WidgetClass tab, WidgetClass menu) => nb + -> child -- ^ Widget to use as the contents of the page + -> tab -- ^ Tab label widget for the page. + -> menu -- ^ Menu entry for this tab (usually a 'Label' widget). + -> IO () +notebookAppendPageMenu nb child tabWidget menuWidget = {#call notebook_append_page_menu#} (toNotebook nb) (toWidget child) - (toWidget tabWidget) (toWidget menu) + (toWidget tabWidget) (toWidget menuWidget) #endif #if GTK_CHECK_VERSION(2,4,0) --- | Insert a new tab to the left of the existing --- tabs. +-- | Insert a new tab to the left of the existing tabs. -- --- * The @tabName@ will be inserted as a Label widget. In case the --- context menu is enabled, this name will appear in the menu. If you want --- to specify something else to go in the tab, use --- 'notebookPrependPageMenu' and specify some suitable widget for --- @menuLabel@. Return index (starting from 0) of the prepended page --- in the notebook, or -1 if function fails +-- * The given label will be used for the label widget of the new tab. In case +-- the context menu is enabled, this name will also appear in the popup menu. If +-- you want to specify something else to go in the tab, use +-- 'notebookPrependPageMenu'. -- --- * This function returned @()@ in Gtk version --- 2.2.X and earlier +-- * Returns index (starting from 0) of the prepended page in the notebook, or -1 +-- if the function fails. -- -notebookPrependPage :: (NotebookClass nb, WidgetClass child) => nb -> child -> - String -> IO Int +-- * This function returned @()@ in Gtk version 2.2.X and earlier +-- +notebookPrependPage :: (NotebookClass nb, WidgetClass child) => nb + -> child -- ^ Widget to use as the contents of the page + -> String -- ^ Label for the page. + -> IO Int notebookPrependPage nb child tabLabel = do tab <- labelNew (Just tabLabel) liftM fromIntegral $ - {#call notebook_prepend_page#} (toNotebook nb) (toWidget child) + {#call notebook_prepend_page#} (toNotebook nb) (toWidget child) (toWidget tab) #else --- | Insert a new tab to the left of the existing --- tabs. +-- | Insert a new tab to the left of the existing tabs. -- --- * The @tabName@ will be inserted as a Label widget. In case the --- context menu is enabled, this name will appear in the menu. If you want --- to specify something else to go in the tab, use --- 'notebookPrependPageMenu' and specify some suitable widget for --- @menuLabel@. +-- * The given label will be used for the label widget of the new tab. In case +-- the context popup menu is enabled, this name will also appear in the menu. If +-- you want to specify something else to go in the tab, use +-- 'notebookPrependPageMenu'. -- --- * This function returns @Int@ in Gtk version --- 2.4.0 and later +-- * This function returns @Int@ in Gtk version 2.4.0 and later. -- -notebookPrependPage :: (NotebookClass nb, WidgetClass child) => nb -> child -> - String -> IO () +notebookPrependPage :: (NotebookClass nb, WidgetClass child) => nb -> + -> child -- ^ Widget to use as the contents of the page + -> String -- ^ Label for the page. + -> IO () notebookPrependPage nb child tabLabel = do tab <- labelNew (Just tabLabel) - {#call notebook_prepend_page#} (toNotebook nb) (toWidget child) (toWidget tab) + {#call notebook_prepend_page#} (toNotebook nb) (toWidget child) + (toWidget tab) #endif #if GTK_CHECK_VERSION(2,4,0) --- | Insert a new tab to the left of the --- existing tabs. @menuLabel@ is the label for the context menu --- (useful if @tabLabel@ is not a Label widget). Return index --- (starting from 0) of the prepended page in the notebook, or -1 if --- function fails +-- | Insert a new tab to the left of the existing tabs. -- --- * This function returned @()@ in Gtk version --- 2.2.X and earlier +-- Like 'notebookPrependPage' but allows any widget to be used for the label of +-- the new tab and then entry in the page-switch popup menu. -- -notebookPrependPageMenu ::(NotebookClass nb, WidgetClass child, - WidgetClass tab) => nb -> child -> tab -> String -> IO Int -notebookPrependPageMenu nb child tabWidget menuLabel = do - menu <- labelNew (Just menuLabel) - liftM fromIntegral $ - {#call notebook_prepend_page_menu#} (toNotebook nb) (toWidget child) - (toWidget tabWidget) (toWidget menu) +-- * Returns the index (starting from 0) of the prepended page in the notebook, +-- or -1 if the function fails. +-- +-- * This function returned @()@ in Gtk version 2.2.X and earlier +-- +notebookPrependPageMenu :: (NotebookClass nb, WidgetClass child, + WidgetClass tab, WidgetClass menu) => nb + -> child -- ^ Widget to use as the contents of the page + -> tab -- ^ Tab label widget for the page. + -> menu -- ^ Menu entry for this tab (usually a 'Label' widget). + -> IO Int +notebookPrependPageMenu nb child tabWidget menuWidget = liftM fromIntegral $ + {#call notebook_prepend_page_menu#} (toNotebook nb) (toWidget child) + (toWidget tabWidget) (toWidget menuWidget) #else --- | Insert a new tab to the left of the --- existing tabs. @menuLabel@ is the label for the context menu --- (useful if @tabLabel@ is not a Label widget). +-- | Insert a new tab to the left of the existing tabs. -- --- * This function returns @Int@ in Gtk version --- 2.4.0 and later +-- Like 'notebookPrependPage' but allows any widget to be used for the label of +-- the new tab and then entry in the page-switch popup menu. -- -notebookPrependPageMenu ::(NotebookClass nb, WidgetClass child, - WidgetClass tab) => nb -> child -> tab -> String -> IO () -notebookPrependPageMenu nb child tabWidget menuLabel = do - menu <- labelNew (Just menuLabel) +-- * This function returns @Int@ in Gtk version 2.4.0 and later +-- +notebookPrependPageMenu :: (NotebookClass nb, WidgetClass child, + WidgetClass tab, WidgetClass menu) => nb + -> child -- ^ Widget to use as the contents of the page + -> tab -- ^ Tab label widget for the page. + -> menu -- ^ Menu entry for this tab (usually a 'Label' widget). + -> IO () +notebookPrependPageMenu nb child tabWidget menuWidget = {#call notebook_prepend_page_menu#} (toNotebook nb) (toWidget child) - (toWidget tabWidget) (toWidget menu) + (toWidget tabWidget) (toWidget menuWidget) #endif #if GTK_CHECK_VERSION(2,4,0) --- | Insert a new tab at the specified position. +-- | Insert a new tab at the specified position. That is between @pos@ and +-- @pos@+1, or -1 to append the page after all other pages. -- --- * The @tabName@ will be inserted as a Label widget. In case the --- context menu is enabled, this name will appear in the menu. If you want --- to specify something else to go in the tab, use --- 'notebookInsertPageMenu' and specify some suitable widget for --- @menuLabel@. Return index (starting from 0) of the inserted page --- in the notebook, or -1 if function fails +-- * The given label will be used for the label widget of the new tab. In case +-- the context menu is enabled, this name will also appear in the popup menu. If +-- you want to specify something else to go in the tab, use +-- 'notebookInsertPageMenu'. -- --- * <warning><para>This function returned @()@ in Gtk version --- 2.2.X and earlier<\/warning><para> +-- * Returns index (starting from 0) of the inserted page in the notebook, or -1 +-- if the function fails. -- -notebookInsertPage :: (NotebookClass nb, WidgetClass child) => nb -> child -> - String -> Int -> IO Int +-- * This function returned @()@ in Gtk version 2.2.X and earlier +-- +notebookInsertPage :: (NotebookClass nb, WidgetClass child) => nb + -> child -- ^ Widget to use as the contents of the page + -> String -- ^ Label for the page. + -> Int -- ^ Position for the new page. + -> IO Int notebookInsertPage nb child tabLabel pos = do - lbl <- labelNew (Just tabLabel) + tab <- labelNew (Just tabLabel) liftM fromIntegral $ {#call notebook_insert_page#} (toNotebook nb) (toWidget child) - (toWidget lbl) (fromIntegral pos) + (toWidget tab) (fromIntegral pos) #else --- | Insert a new tab at the specified position. +-- | Insert a new tab at the specified position. That is between @pos@ and +-- @pos@+1, or -1 to append the page after all other pages. -- --- * The @tabName@ will be inserted as a Label widget. In case the --- context menu is enabled, this name will appear in the menu. If you want --- to specify something else to go in the tab, use --- 'notebookInsertPageMenu' and specify some suitable widget for --- @menuLabel@. +-- * The given label will be used for the label widget of the new tab. In case +-- the context menu is enabled, this name will also appear in the popup menu. If +-- you want to specify something else to go in the tab, use +-- 'notebookInsertPageMenu'. -- --- * This function returns @Int@ in Gtk version --- 2.4.0 and later +-- * This function returns @Int@ in Gtk version 2.4.0 and later. -- -notebookInsertPage :: (NotebookClass nb, WidgetClass child) => nb -> child -> - String -> Int -> IO () +notebookInsertPage :: (NotebookClass nb, WidgetClass child) => nb + -> child -- ^ Widget to use as the contents of the page + -> String -- ^ Label for the page. + -> Int -- ^ Position for the new page. + -> IO () notebookInsertPage nb child tabLabel pos = do - lbl <- labelNew (Just tabLabel) + tab <- labelNew (Just tabLabel) {#call notebook_insert_page#} (toNotebook nb) (toWidget child) - (toWidget lbl) (fromIntegral pos) + (toWidget tab) (fromIntegral pos) #endif #if GTK_CHECK_VERSION(2,4,0) --- | Insert a new tab between the tab no. --- @pos@ and @pos@+1. @menuLabel@ is the label for the --- context menu (useful if @tabLabel@ is not a Label widget). Return --- index (starting from 0) of the inserted page in the notebook, or -1 if --- function fails +-- | Insert a new tab at the specified position. That is between @pos@ and +-- @pos@+1, or -1 to append the page after all other pages. -- --- * This function returned @()@ in Gtk version --- 2.2.X and earlier +-- Like 'notebookInsertPage' but allows any widget to be used for the label of +-- the new tab and then entry in the page-switch popup menu. +-- +-- * Returns the index (starting from 0) of the inserted page in the notebook, +-- or -1 if the function fails. +-- +-- * This function returned @()@ in Gtk version 2.2.X and earlier -- notebookInsertPageMenu ::(NotebookClass nb, WidgetClass child, - WidgetClass tab) => nb -> child -> tab -> String -> Int -> IO Int -notebookInsertPageMenu nb child tabWidget menuLabel pos = do - menu <- labelNew (Just menuLabel) - liftM fromIntegral $ - {#call notebook_insert_page_menu#} (toNotebook nb) (toWidget child) - (toWidget tabWidget) (toWidget menu) (fromIntegral pos) + WidgetClass tab, WidgetClass menu) => nb + -> child -- ^ Widget to use as the contents of the page + -> tab -- ^ Tab label widget for the page. + -> menu -- ^ Menu entry for this tab (usually a 'Label' widget). + -> Int -- ^ Position for the new page. + -> IO Int +notebookInsertPageMenu nb child tabWidget menuWidget pos = liftM fromIntegral $ + {#call notebook_insert_page_menu#} (toNotebook nb) (toWidget child) + (toWidget tabWidget) (toWidget menuWidget) (fromIntegral pos) #else --- | Insert a new tab between the tab no. --- @pos@ and @pos@+1. @menuLabel@ is the label for the --- context menu (useful if @tabLabel@ is not a Label widget). +-- | Insert a new tab at the specified position. That is between @pos@ and +-- @pos@+1, or -1 to append the page after all other pages. -- --- * This function returns @Int@ in Gtk version --- 2.4.0 and later +-- Like 'notebookInsertPage' but allows any widget to be used for the label of +-- the new tab and then entry in the page-switch popup menu. +-- +-- * This function returns @Int@ in Gtk version 2.4.0 and later -- notebookInsertPageMenu ::(NotebookClass nb, WidgetClass child, - WidgetClass tab) => nb -> child -> tab -> String -> Int -> IO () -notebookInsertPageMenu nb child tabWidget menuLabel pos = do - menu <- labelNew (Just menuLabel) + WidgetClass tab, WidgetClass menu) => nb + -> child -- ^ Widget to use as the contents of the page + -> tab -- ^ Tab label widget for the page. + -> menu -- ^ Menu entry for this tab (usually a 'Label' widget). + -> Int -- ^ Position for the new page. + -> IO () +notebookInsertPageMenu nb child tabWidget menuWidget pos = {#call notebook_insert_page_menu#} (toNotebook nb) (toWidget child) - (toWidget tabWidget) (toWidget menu) (fromIntegral pos) + (toWidget tabWidget) (toWidget menuWidget) (fromIntegral pos) #endif --- | Remove a specific page from the notebook, --- counting from 0. +-- | Remove a specific page from the notebook, counting from 0. -- notebookRemovePage :: NotebookClass nb => nb -> Int -> IO () notebookRemovePage nb pos = {#call notebook_remove_page#} (toNotebook nb) (fromIntegral pos) --- | Query the page the @child@ widget is --- contained in. +-- | Query the page the child widget is contained in. -- -- * The function returns the page number if the child was found, Nothing -- otherwise. @@ -349,7 +382,7 @@ -- | Move to the specified page of the notebook. -- --- * If @pos@ is out of range (e.g. negative) select the last page. +-- * If the position is out of range (e.g. negative) select the last page. -- notebookSetCurrentPage :: NotebookClass nb => nb -> Int -> IO () notebookSetCurrentPage nb pos = @@ -376,35 +409,59 @@ notebookReorderChild nb child pos = {#call notebook_reorder_child#} (toNotebook nb) (toWidget child) (fromIntegral pos) --- | Specify at which border the tabs should be --- drawn. +-- | Specify at which border the tabs should be drawn. -- notebookSetTabPos :: NotebookClass nb => nb -> PositionType -> IO () notebookSetTabPos nb pt = {#call notebook_set_tab_pos#} (toNotebook nb) ((fromIntegral.fromEnum) pt) +-- | Gets the edge at which the tabs for switching pages in the notebook are +-- drawn. +-- +notebookGetTabPos :: NotebookClass nb => nb -> IO PositionType +notebookGetTabPos nb = liftM (toEnum.fromIntegral) $ + {#call unsafe notebook_get_tab_pos#} (toNotebook nb) + -- | Show or hide the tabs of a notebook. -- notebookSetShowTabs :: NotebookClass nb => nb -> Bool -> IO () notebookSetShowTabs nb showTabs = {#call notebook_set_show_tabs#} (toNotebook nb) (fromBool showTabs) --- | In case the tabs are not shown, specify --- whether to draw a border around the notebook. +-- | Returns whether the tabs of the notebook are shown. +-- +notebookGetShowTabs :: NotebookClass nb => nb -> IO Bool +notebookGetShowTabs nb = + liftM toBool $ {#call unsafe notebook_get_show_tabs#} (toNotebook nb) + +-- | In case the tabs are not shown, specify whether to draw a border around +-- the notebook. -- notebookSetShowBorder :: NotebookClass nb => nb -> Bool -> IO () notebookSetShowBorder nb showBorder = {#call notebook_set_show_border#} (toNotebook nb) (fromBool showBorder) --- | Set whether scroll bars will be added in --- case the notebook has too many tabs to fit the widget size. +-- | Returns whether a bevel will be drawn around the notebook pages. +-- +notebookGetShowBorder :: NotebookClass nb => nb -> IO Bool +notebookGetShowBorder nb = + liftM toBool $ {#call unsafe notebook_get_show_border#} (toNotebook nb) + +-- | Set whether scroll bars will be added in case the notebook has too many +-- tabs to fit the widget size. -- notebookSetScrollable :: NotebookClass nb => nb -> Bool -> IO () notebookSetScrollable nb scrollable = {#call unsafe notebook_set_scrollable#} (toNotebook nb) (fromBool scrollable) --- | Set the width of the borders of the tab --- labels. +-- | Returns whether the tab label area has arrows for scrolling. +-- +notebookGetScrollable :: NotebookClass nb => nb -> IO Bool +notebookGetScrollable nb = liftM toBool $ + {#call unsafe notebook_get_scrollable#} (toNotebook nb) + +#ifndef DISABLE_DEPRECATED +-- | Set the width of the borders of the tab labels. -- -- * Sets both vertical and horizontal widths. -- @@ -412,8 +469,7 @@ notebookSetTabBorder nb width = {#call notebook_set_tab_border#} (toNotebook nb) (fromIntegral width) --- | Set the width of the borders of the tab --- labels. +-- | Set the width of the borders of the tab labels. -- -- * Sets horizontal widths. -- @@ -421,17 +477,16 @@ notebookSetTabHBorder nb width = {#call notebook_set_tab_hborder#} (toNotebook nb) (fromIntegral width) --- | Set the width of the borders of the tab --- labels. +-- | Set the width of the borders of the tab labels. -- -- * Sets vertical widths. -- notebookSetTabVBorder :: NotebookClass nb => nb -> Int -> IO () notebookSetTabVBorder nb width = {#call notebook_set_tab_vborder#} (toNotebook nb) (fromIntegral width) +#endif --- | Enable or disable context menus with all tabs in --- it. +-- | Enable or disable context menus with all tabs in it. -- notebookSetPopup :: NotebookClass nb => nb -> Bool -> IO () notebookSetPopup nb enable = (if enable @@ -446,8 +501,15 @@ notebookGetCurrentPage nb = liftM fromIntegral $ {#call unsafe notebook_get_current_page#} (toNotebook nb) --- | Extract the menu label from the given --- @child@. +-- | Changes the menu label for the page containing the given child widget. +-- +notebookSetMenuLabel :: (NotebookClass nb, WidgetClass ch, WidgetClass label) + => nb -> ch -> Maybe label -> IO () +notebookSetMenuLabel nb child label = + {#call notebook_set_menu_label#} (toNotebook nb) (toWidget child) + (maybe (Widget nullForeignPtr) toWidget label) + +-- | Extract the menu label from the given @child@. -- -- * Returns Nothing if @child@ was not found. -- @@ -459,8 +521,27 @@ if wPtr==nullPtr then return Nothing else liftM Just $ makeNewObject mkLabel $ return $ castPtr wPtr --- | Retrieve the child widget at positon --- @pos@ (stating from 0). +-- | Creates a new label and sets it as the menu label of the given child +-- widget. +-- +notebookSetMenuLabelText :: (NotebookClass nb, WidgetClass ch) + => nb -> ch -> String -> IO () +notebookSetMenuLabelText nb child label = + withUTFString label $ \labelPtr -> + {#call notebook_set_menu_label_text#} (toNotebook nb) + (toWidget child) labelPtr + +-- | Retrieves the text of the menu label for the page containing the given +-- child widget. +-- +notebookGetMenuLabelText :: (NotebookClass nb, WidgetClass ch) + => nb -> ch -> IO (Maybe String) +notebookGetMenuLabelText nb child = do + labelPtr <- {#call unsafe notebook_get_menu_label_text#} (toNotebook nb) + (toWidget child) + maybePeek peekUTFString labelPtr + +-- | Retrieve the child widget at the given position (starting from 0). -- -- * Returns Nothing if the index is out of bounds. -- @@ -483,19 +564,30 @@ #endif --- | Extract the tab label from the given --- @child@. +-- | Extract the tab label from the given @child@. +-- +-- * Nothing is returned if no tab label has specifically been set for the +-- child. -- notebookGetTabLabel :: (NotebookClass nb, WidgetClass w) => nb -> w -> - IO (Maybe Label) + IO (Maybe Widget) notebookGetTabLabel nb child = do wPtr <- {#call unsafe notebook_get_tab_label#} (toNotebook nb) (toWidget child) if wPtr==nullPtr then return Nothing else liftM Just $ - makeNewObject mkLabel $ return $ castPtr wPtr + makeNewObject mkWidget $ return wPtr --- | Query the packing attributes of the --- given @child@. +-- | Retrieves the text of the tab label for the page containing the given child +-- widget. +-- +notebookGetTabLabelText :: (NotebookClass nb, WidgetClass w) => nb -> w -> + IO (Maybe String) +notebookGetTabLabelText nb child = do + labelPtr <- {#call unsafe notebook_get_tab_label_text#} (toNotebook nb) + (toWidget child) + maybePeek peekUTFString labelPtr + +-- | Query the packing attributes of the given child. -- notebookQueryTabLabelPacking :: (NotebookClass nb, WidgetClass w) => nb -> w -> IO (Packing,PackType) @@ -510,8 +602,7 @@ (if expand then PackRepel else PackNatural), pt) --- | Set the packing attributes of the given --- @child@. +-- | Set the packing attributes of the given child. -- notebookSetTabLabelPacking :: (NotebookClass nb, WidgetClass w) => nb -> w -> Packing -> PackType -> IO () @@ -520,22 +611,30 @@ (fromBool $ pack/=PackNatural) (fromBool $ pack==PackGrow) ((fromIntegral.fromEnum) pt) --- | Sets whether the tabs must have all the --- same size or not. +#ifndef DISABLE_DEPRECATED +-- | Sets whether the tabs must have all the same size or not. -- notebookSetHomogeneousTabs :: NotebookClass nb => nb -> Bool -> IO () notebookSetHomogeneousTabs nb hom = {#call notebook_set_homogeneous_tabs#} (toNotebook nb) (fromBool hom) +#endif - --- | Set a new tab label for a given --- @child@. +-- | Set a new tab label for a given page. -- notebookSetTabLabel :: (NotebookClass nb, WidgetClass ch, WidgetClass tab) => nb -> ch -> tab -> IO () notebookSetTabLabel nb child tab = {#call notebook_set_tab_label#} (toNotebook nb) (toWidget child) (toWidget tab) +-- | Creates a new label and sets it as the tab label for the given page. +-- +notebookSetTabLabelText :: (NotebookClass nb, WidgetClass ch) => + nb -> ch -> String -> IO () +notebookSetTabLabelText nb child label = + withUTFString label $ \labelPtr -> + {#call notebook_set_tab_label_text#} (toNotebook nb) (toWidget child) labelPtr + + -- signals -- | This signal is emitted when a new page is |
|
From: Duncan C. <dun...@us...> - 2004-08-09 22:54:29
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12364 Modified Files: ChangeLog Log Message: bind some new functions. Mark deprecated functions. Generalise the notebook(Append|Prepend|Insert)PageMenu functions to take an arbitrary widget for the popup menu. This is a slight change in API. Quite a bit of docs cleanup. Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.219 retrieving revision 1.220 diff -u -d -r1.219 -r1.220 --- ChangeLog 8 Aug 2004 20:28:59 -0000 1.219 +++ ChangeLog 9 Aug 2004 22:54:03 -0000 1.220 @@ -1,3 +1,10 @@ +2004-08-9 Duncan Coutts <du...@co...> + + * gtk/layout/Notebook.chs: bind some new functions. Mark deprecated + functions. Generalise the notebook(Append|Prepend|Insert)PageMenu + functions to take an arbitrary widget for the popup menu. This is + a slight change in API. Quite a bit of docs cleanup. + 2004-08-8 Duncan Coutts <du...@co...> * mk/library.mk, mk/common.mk: Axel's patches to change the way the |
|
From: Duncan C. <dun...@us...> - 2004-08-08 20:29:10
|
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, |
|
From: Duncan C. <dun...@us...> - 2004-08-08 20:29:08
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13867 Modified Files: ChangeLog Log Message: Make mogul build with --disabled-deprecated. Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.218 retrieving revision 1.219 diff -u -d -r1.218 -r1.219 --- ChangeLog 8 Aug 2004 19:09:56 -0000 1.218 +++ ChangeLog 8 Aug 2004 20:28:59 -0000 1.219 @@ -20,6 +20,15 @@ * gconf/System/Gnome/GConf/GConfClient.chs: Make documantation Haddock compatible. + * gtk/entry/Entry.chs, gtk/general/Enums.chs, gtk/general/Structs.hsc, + gtk/menuComboToolbar/Combo.chs, gtk/menuComboToolbar/OptionMenu.chs, + gtk/menuComboToolbar/Toolbar.chs, gtk/misc/Tooltips.chs, + gtk/windows/Window.chs, configure.in: add #ifndef DISABLE_DEPRECATED + exclusions. Everything should build now with --disabled-deprecated. + + * mogul/Makefile, mogul/Mogul.hs, mogul/NewWidget.hs, + mogul/GetWidget.hs: make mogul build with --disabled-deprecated. + 2004-08-6 Duncan Coutts <du...@co...> * configure.in, mk/config.mk.in, gtk/Makefile, mogul/Makefile, |
|
From: Duncan C. <dun...@us...> - 2004-08-08 19:34:26
|
Update of /cvsroot/gtk2hs/gtk2hs/gtk/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6171/gtk/windows Modified Files: Window.chs Log Message: Add #ifndef DISABLE_DEPRECATED bits so everything should build now with ./configure --disabled-deprecated. Index: Window.chs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/windows/Window.chs,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Window.chs 23 May 2004 16:17:53 -0000 1.7 +++ Window.chs 8 Aug 2004 19:34:15 -0000 1.8 @@ -1,3 +1,4 @@ +{-# OPTIONS -cpp #-} -- -*-haskell-*- -- GIMP Toolkit (GTK) Window -- @@ -40,7 +41,9 @@ windowSetModal, windowSetDefaultSize, -- windowSetGeometryHints, +#ifndef DISABLE_DEPRECATED windowSetPolicy, +#endif windowSetPosition, WindowPosition(..), windowSetTransientFor, @@ -118,12 +121,14 @@ windowActivateDefault w = liftM toBool $ {#call window_activate_default#} (toWindow w) +#ifndef DISABLE_DEPRECATED {-# DEPRECATED windowSetPolicy "Use windowSetResizable instead." #-} -- windowSetPolicy: set the window policy -- windowSetPolicy :: WindowClass w => w -> Bool -> Bool -> Bool -> IO () windowSetPolicy w shrink grow auto = {#call window_set_policy#} (toWindow w) (fromBool shrink) (fromBool grow) (fromBool auto) +#endif -- | make a window application modal -- |
|
From: Duncan C. <dun...@us...> - 2004-08-08 19:34:26
|
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 |
|
From: Duncan C. <dun...@us...> - 2004-08-08 19:34:26
|
Update of /cvsroot/gtk2hs/gtk2hs/gtk/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6171/gtk/misc Modified Files: Tooltips.chs Log Message: Add #ifndef DISABLE_DEPRECATED bits so everything should build now with ./configure --disabled-deprecated. Index: Tooltips.chs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/misc/Tooltips.chs,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Tooltips.chs 1 Aug 2004 16:08:13 -0000 1.7 +++ Tooltips.chs 8 Aug 2004 19:34:14 -0000 1.8 @@ -1,3 +1,4 @@ +{-# OPTIONS -cpp #-} -- -*-haskell-*- -- GIMP Toolkit (GTK) Widget Tooltips -- @@ -21,26 +22,26 @@ -- -- | -- --- * Tooltips are the messages that appear next to a widget when the mouse --- pointer is held over it for a short amount of time. They are especially --- helpful for adding more verbose descriptions of things such as buttons --- in a toolbar. --- An individual tooltip belongs to a group of tooltips. A group is created --- with a call to 'tooltipsNew'. Every tooltip in the group can --- then be --- turned off with a call to 'tooltipsDisable' and enabled with --- 'tooltipsEnable'. The length of time the user must keep the --- mouse over a --- widget before the tip is shown, can be altered with --- 'tooltipsSetDelay'. --- This is set on a 'per group of tooltips' basis. --- To assign a tip to a particular widget, 'tooltipsSetTip' --- is used. +-- Tooltips are the messages that appear next to a widget when the mouse +-- pointer is held over it for a short amount of time. They are especially +-- helpful for adding more verbose descriptions of things such as buttons +-- in a toolbar. -- --- * To associate 'Tooltips' to a widget it is has to have its own --- 'DrawWindow'. Otherwise the widget must be set into an --- 'EventBox'. Can this be done --- automatically? Perhaps even with tooltips_force_window()? +-- An individual tooltip belongs to a group of tooltips. A group is created +-- with a call to 'tooltipsNew'. Every tooltip in the group can +-- then be turned off with a call to 'tooltipsDisable' and enabled with +-- 'tooltipsEnable'. +-- +#ifndef DISABLE_DEPRECATED +-- The length of time the user must keep the mouse over a widget before the tip +-- is shown, can be altered with 'tooltipsSetDelay'. This is set on a 'per group +-- of tooltips' basis. +-- +#endif +-- To assign a tip to a particular widget, 'tooltipsSetTip' is used. +-- +-- To associate 'Tooltips' to a widget it is has to have its own 'DrawWindow'. +-- Otherwise the widget must be set into an 'EventBox'. -- module Tooltips( @@ -50,7 +51,9 @@ tooltipsNew, tooltipsEnable, tooltipsDisable, +#ifndef DISABLE_DEPRECATED tooltipsSetDelay, +#endif tooltipsSetTip, tooltipsDataGet ) where @@ -87,6 +90,7 @@ tooltipsDisable :: TooltipsClass t => t -> IO () tooltipsDisable t = {#call unsafe tooltips_disable#} (toTooltips t) +#ifndef DISABLE_DEPRECATED -- | Sets the time between the user moving the mouse -- over a widget and the widget's tooltip appearing. -- @@ -95,6 +99,7 @@ tooltipsSetDelay :: TooltipsClass t => t -> Int -> IO () tooltipsSetDelay t time = {#call unsafe tooltips_set_delay#} (toTooltips t) (fromIntegral time) +#endif -- | Adds a tooltip containing the message tipText to -- the specified GtkWidget. |
|
From: Duncan C. <dun...@us...> - 2004-08-08 19:34:25
|
Update of /cvsroot/gtk2hs/gtk2hs/gtk/entry In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6171/gtk/entry Modified Files: Entry.chs Log Message: Add #ifndef DISABLE_DEPRECATED bits so everything should build now with ./configure --disabled-deprecated. Index: Entry.chs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/entry/Entry.chs,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- Entry.chs 6 Aug 2004 01:48:04 -0000 1.12 +++ Entry.chs 8 Aug 2004 19:34:14 -0000 1.13 @@ -38,8 +38,10 @@ entryNew, entrySetText, entryGetText, +#ifndef DISABLE_DEPRECATED entryAppendText, entryPrependText, +#endif entrySetVisibility, entryGetVisibility, entrySetInvisibleChar, @@ -102,6 +104,7 @@ entryGetText :: EntryClass ec => ec -> IO String entryGetText ec = {#call entry_get_text#} (toEntry ec) >>= peekUTFString +#ifndef DISABLE_DEPRECATED -- | Append to the text of the 'Entry' widget. -- entryAppendText :: EntryClass ec => ec -> String -> IO () @@ -113,6 +116,7 @@ entryPrependText :: EntryClass ec => ec -> String -> IO () entryPrependText ec str = withUTFString str $ {#call entry_prepend_text#} (toEntry ec) +#endif -- | Set whether to use password mode (display stars instead of the text). -- @@ -204,12 +208,16 @@ -- horizontal positioning of the contents when the displayed text is shorter -- than the width of the entry. -- +-- * Since gtk 2.4 +-- entrySetAlignment :: EntryClass ec => ec -> Float -> IO () entrySetAlignment ec xalign = {#call entry_set_alignment#} (toEntry ec) (realToFrac xalign) -- | Gets the value set by 'entrySetAlignment'. -- +-- * Since gtk 2.4 +-- entryGetAlignment :: EntryClass ec => ec -> IO Float entryGetAlignment ec = liftM realToFrac $ {#call unsafe entry_get_alignment#} (toEntry ec) |
|
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. -- |
|
From: Duncan C. <dun...@us...> - 2004-08-08 19:34:23
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6171 Modified Files: configure.in Log Message: Add #ifndef DISABLE_DEPRECATED bits so everything should build now with ./configure --disabled-deprecated. Index: configure.in =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/configure.in,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- configure.in 6 Aug 2004 01:28:17 -0000 1.39 +++ configure.in 8 Aug 2004 19:34:13 -0000 1.40 @@ -354,6 +354,11 @@ DISABLE_DEPRECATED=`test $ENABLE_DEPRECATED = yes && echo no || echo yes` AC_MSG_RESULT($ENABLE_DEPRECATED) +if test $DISABLE_DEPRECATED = yes; then +C2HSFLAGS="$C2HSFLAGS -C-DDISABLE_DEPRECATED" +HSCFLAGS="$HSCFLAGS -DDISABLE_DEPRECATED" +fi + dnl Have a special marshall list (available in the source tree of Gtk+ under dnl gtk/gtkmarshal.list) |
|
From: Duncan C. <dun...@us...> - 2004-08-08 19:10:06
|
Update of /cvsroot/gtk2hs/gtk2hs/gconf/System/Gnome/GConf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1550/gconf/System/Gnome/GConf Modified Files: GConfValue.chs GConfClient.chs Log Message: Make the documentation for GConfClient haddock compatible. Add back partial support for the GConfSchema type so getting a schema key will not cause a pattern match failure. Index: GConfValue.chs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gconf/System/Gnome/GConf/GConfValue.chs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- GConfValue.chs 6 Aug 2004 02:03:46 -0000 1.2 +++ GConfValue.chs 8 Aug 2004 19:09:56 -0000 1.3 @@ -73,13 +73,14 @@ -- The code that uses marshalTo must ensure that it hands the value off to a -- function that is prepared to asume ownership of the value. --- dynamic version for when the type is not known statically +-- | Dynamic version for when the type is not known statically. data GConfValueDyn = GConfValueString String | GConfValueInt Int | GConfValueFloat Double | GConfValueBool Bool - | GConfValueList [GConfValueDyn] --must all be of same primitive type - | GConfValuePair (GConfValueDyn, GConfValueDyn) --must both be primitive + | GConfValueSchema -- ^ Not supported + | GConfValueList [GConfValueDyn] -- ^ Must all be of same primitive type + | GConfValuePair (GConfValueDyn, GConfValueDyn) -- ^ Must both be primitive -- Allow variant using Maybe, where Nothing means the value was not set -- Use this variant when you expect the gconf key to not be set somethimes; @@ -306,6 +307,7 @@ GconfValueInt -> liftM GConfValueInt $ unsafeMarshalFromGConfValue value GconfValueFloat -> liftM GConfValueFloat $ unsafeMarshalFromGConfValue value GconfValueBool -> liftM GConfValueBool $ unsafeMarshalFromGConfValue value + GconfValueSchema -> return GConfValueSchema GconfValueList -> liftM GConfValueList $ unsafeMarshalGConfValueDynListFromGConfValue value GconfValuePair -> liftM GConfValuePair $ unsafeMarshalGConfValueDynPairFromGConfValue value @@ -318,6 +320,7 @@ (GConfValueInt v') -> marshalToGConfValue v' (GConfValueFloat v') -> marshalToGConfValue v' (GConfValueBool v') -> marshalToGConfValue v' + (GConfValueSchema ) -> fail "GConf: setting schema types not supported" (GConfValueList v') -> marshalGConfValueDynListToGConfValue v' (GConfValuePair v') -> marshalGConfValueDynPairToGConfValue v' Index: GConfClient.chs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gconf/System/Gnome/GConf/GConfClient.chs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- GConfClient.chs 6 Aug 2004 02:03:46 -0000 1.2 +++ GConfClient.chs 8 Aug 2004 19:09:56 -0000 1.3 @@ -65,7 +65,7 @@ gconfGetDefaultFromSchema, gconfUnset, - -- * caching control + -- * Caching control -- gconfClearCache, gconfPreload, gconfSuggestSync, @@ -86,7 +86,8 @@ ) where import Monad (liftM, when) -import LocalData (newIORef, readIORef, writeIORef, unsafePerformIO) +import Data.IORef (newIORef, readIORef, writeIORef) +import System.IO.Unsafe (unsafePerformIO) import FFI {#import Hierarchy#} {#import Signal#} @@ -111,31 +112,28 @@ {# pointer *GConfEntry newtype #} --- |Operations --- ----------- +-- Operations --- |Creation operations --- - +-- Creation operations --- @constructor gconfGetDefault@ Create a new GConf object --- using the default configuration engine. +-- | Create a new GConf object using the default configuration engine. -- gconfGetDefault :: IO GConf gconfGetDefault = makeNewGObject mkGConf {# call gconf_client_get_default #} --- |Registering for change notifications --- - +-- Registering for change notifications --- @method gconfAddDir@ Add a directory to the list of directories the +-- | Add a directory to the list of directories the -- GConf will watch. You should use gconfNotifyAdd to associate -- change handlers with specific keys. -- --- * Added directories may not overlap. That is, if you add "/foo", you may not --- add "/foo/bar". However you can add "/foo" and "/bar". You can also add --- "/foo" multiple times; if you add a directory multiple times, it will not --- be removed until you call gconfRemoveDir an equal number of times. +-- * Added directories may not overlap. That is, if you add \"\/foo\", you may +-- not add \"\/foo\/bar\". However you can add \"\/foo\" and \"\/bar\". You can +-- also add \"\/foo\" multiple times; if you add a directory multiple times, it +-- will not be removed until you call 'gconfRemoveDir' an equal number of +-- times. -- -- * Note that the watch is recursive, all keys below the given directory will -- be watched. So it would be a bad idea to watch the root "/". @@ -143,8 +141,7 @@ gconfAddDir :: GConf -> String -> IO () gconfAddDir gc key = gconfAddDirWithPreload gc key PreloadNone --- @method gconfAddDirWithPreload@ Like gconfAddDir but with the --- option to specify a preload mode. +-- | Like 'gconfAddDir' but with the option to specify a preload mode. -- -- As a rule of thumb, if you plan to get the value of almost all the keys in a -- directory, preloading that directory will probably enhance performance. If @@ -162,13 +159,12 @@ {# call gconf_client_add_dir #} gc strPtr (fromIntegral $ fromEnum preload) gerrorPtr --- @method gconfRemoveDir@ Remove a directory from the list created with --- gconfAddDir. If any notifications have been added below this directory --- with gconfNotifyAdd, those notifications will be disabled until you --- re-add the removed directory. +-- | Remove a directory from the list created with 'gconfAddDir'. If any +-- notifications have been added below this directory with 'gconfNotifyAdd', +-- those notifications will be disabled until you re-add the removed directory. -- -- * Note that if a directory has been added multiple times, you must remove it --- the same number of times before the remove takes effect. +-- the same number of times before the remove takes effect. -- gconfRemoveDir :: GConf -> String -> IO () gconfRemoveDir gc key = @@ -193,12 +189,10 @@ #if __GLASGOW_HASKELL__>=504 foreign import ccall "wrapper" mkHandler_GConfClientNotifyFunc :: - GConfClientNotifyFunc -> - IO (FunPtr GConfClientNotifyFunc) + GConfClientNotifyFunc -> IO (FunPtr GConfClientNotifyFunc) #else foreign export dynamic mkHandler_GConfClientNotifyFunc :: - GConfClientNotifyFunc -> - IO (FunPtr GConfClientNotifyFunc) + GConfClientNotifyFunc -> IO (FunPtr GConfClientNotifyFunc) #endif connect_GConfClientNotifyFunc :: @@ -245,15 +239,13 @@ {# call gconf_client_notify_remove #} gc cxid --- |Getting and setting configuration values --- - +-- Getting and setting configuration values --- @method gconfGet@ Gets the value of a configuration key. --- --- * the second parameter is name of the key +-- | Gets the value of a configuration key. -- -gconfGet :: GConfValueClass value => - GConf -> String -> IO value +gconfGet :: GConfValueClass value => GConf + -> String -- ^ Name of the key + -> IO value gconfGet gc key = do value <- propagateGError $ \gerrorPtr -> withCString key $ \strPtr -> @@ -280,12 +272,12 @@ GConf -> String -> IO [a] gconfGetList = gconfGet --- @method gconfSet@ Sets the value of a configuration key. --- --- * the second parameter is name of the key, the third is the new value +-- | Sets the value of a configuration key. -- -gconfSet :: GConfValueClass value => - GConf -> String -> value -> IO () +gconfSet :: GConfValueClass value => GConf + -> String -- ^ Name of the key + -> value -- ^ New value + -> IO () gconfSet gc key val = do value@(GConfValue ptr) <- marshalToGConfValue val if ptr == nullPtr @@ -314,8 +306,9 @@ GConf -> String -> [a] -> IO () gconfSetList = gconfSet --- @method gconfGetWithoutDefault@ Gets the value of a configuration key. --- Same as gconfGet, but doesn't look for a default value if the key is +-- | Gets the value of a configuration key. +-- +-- Same as 'gconfGet', but doesn't look for a default value if the key is -- unset. -- gconfGetWithoutDefault :: GConfValueClass value => @@ -326,11 +319,10 @@ {# call gconf_client_get_without_default #} gc strPtr gerrorPtr marshalFromGConfValue value --- @method gconfGetDefaultFromSchema@ Returns the default value stored in --- the key's schema, if the key has a schema associated and the schema exists --- and the schema contains a default value. Note that gconfSet already --- returns the default value if no other value is found, so normally you do not --- need this function. +-- | Returns the default value stored in the key's schema, if the key has a +-- schema associated and the schema exists and the schema contains a default +-- value. Note that 'gconfSet' already returns the default value if no other +-- value is found, so normally you do not need this function. -- gconfGetDefaultFromSchema :: GConfValueClass value => GConf -> String -> IO value @@ -340,9 +332,9 @@ {# call gconf_client_get_default_from_schema #} gc strPtr gerrorPtr marshalFromGConfValue value --- @method gconfGetWithoutDefault@ Unsets the value of key; if key is --- already unset, has no effect. An error of note is GCONF_OVERRIDDEN, --- indicating that the system administrator has "forced" a value for this key. +-- | Unsets the value of key; if key is already unset, has no effect. An error +-- of note is 'GConfOverridden', indicating that the system administrator has +-- \"forced\" a value for this key. -- gconfUnset :: GConf -> String -> IO () gconfUnset gc key = @@ -351,16 +343,16 @@ {# call gconf_client_unset #} gc strPtr gerrorPtr return () --- @method gconfClearCache@ Dumps everything out of the GConf --- client-side cache. If you know you're done using the GConf for a while, --- you can call this function to save some memory. +-- | Dumps everything out of the GConf client-side cache. If you know you're +-- done using the GConf for a while, you can call this function to save some +-- memory. -- gconfClearCache :: GConf -> IO () gconfClearCache gc = {# call gconf_client_clear_cache #} gc --- @method gconfPreload@ Preloads a directory. Normally you do this when --- you call gconfAddDirWithPreload, but if you've called --- gconfClearCache there may be a reason to do it again. +-- | Preloads a directory. Normally you do this when you call +-- 'gconfAddDirWithPreload', but if you've called 'gconfClearCache' there may +-- be a reason to do it again. -- gconfPreload :: GConf -> String -> GConfPreloadType -> IO () gconfPreload gc key preload = @@ -369,18 +361,18 @@ {# call gconf_client_preload #} gc strPtr (fromIntegral $ fromEnum preload) gerrorPtr --- @method gconfSuggestSync@ Suggests to gconfd that you've just finished --- a block of changes, and it would be an optimal time to sync to permanent --- storage. This is only a suggestion; and gconfd will eventually sync even if --- you don't call gconfSuggestSync. This function is just a "hint" --- provided to gconfd to maximize efficiency and minimize data loss. +-- | Suggests to gconfd that you've just finished a block of changes, and it +-- would be an optimal time to sync to permanent storage. This is only a +-- suggestion; and gconfd will eventually sync even if you don't call +-- 'gconfSuggestSync'. This function is just a "hint" provided to gconfd to +-- maximize efficiency and minimize data loss. -- gconfSuggestSync :: GConf -> IO () gconfSuggestSync gc = propagateGError $ \gerrorPtr -> {# call gconf_client_suggest_sync #} gc gerrorPtr --- @method gconfAllEntries@ +-- | -- gconfAllEntries :: GConf -> String -> IO [(String, GConfValueDyn)] gconfAllEntries gc dir = do @@ -400,7 +392,7 @@ return (key,value)) entryList --- @method gconfAllDirs@ +-- | -- gconfAllDirs :: GConf -> String -> IO [String] gconfAllDirs gc dir = do @@ -412,7 +404,7 @@ return str) dirList --- @method gconfDirExists@ +-- | -- gconfDirExists :: GConf -> String -> IO Bool gconfDirExists gc dir = @@ -420,8 +412,7 @@ liftM toBool $ {# call gconf_client_dir_exists #} gc strPtr nullPtr --- |Signals --- - +-- Signals onValueChanged, afterValueChanged :: GConf -> (String -> Maybe GConfValueDyn -> IO ()) -> |
|
From: Duncan C. <dun...@us...> - 2004-08-08 19:10:06
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1550 Modified Files: ChangeLog Log Message: Make the documentation for GConfClient haddock compatible. Add back partial support for the GConfSchema type so getting a schema key will not cause a pattern match failure. Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.217 retrieving revision 1.218 diff -u -d -r1.217 -r1.218 --- ChangeLog 6 Aug 2004 02:03:45 -0000 1.217 +++ ChangeLog 8 Aug 2004 19:09:56 -0000 1.218 @@ -1,3 +1,25 @@ +2004-08-8 Duncan Coutts <du...@co...> + + * mk/library.mk, mk/common.mk: Axel's patches to change the way the + _stub.o files are found so new gtk-2.4 modules don't cause link errors + whe building for gtk-2.2 or 2.0. With a slight change so the _stub.o + files are looked for after compiling rather than before. + + * gtk/misc/FileChooserWidget.chs, gtk/menuComboToolbar/ToolItem.chs, + gtk/menuComboToolbar/ComboBoxEntry.chs, + gtk/menuComboToolbar/ComboBox.chs, gtk/layout/Expander.chs, + gtk/entry/EntryCompletion.chs, gtk/abstract/FileChooser.chs, + gtk/windows/FileChooserDialog.chs, gtk/general/Gtk.hs: Axel's patches + to change the way gtk-2.4 modules are excluded when building for + earlier versions. Instead of not importing them into Gtk.hs, make them + have empty bodies. That way c2hs doesn't see the new functions. + + * gconf/System/Gnome/GConf/GConfValue.chs: Add back partial support for + the GConfSchema type so getting a schema key will not fail. + + * gconf/System/Gnome/GConf/GConfClient.chs: Make documantation Haddock + compatible. + 2004-08-6 Duncan Coutts <du...@co...> * configure.in, mk/config.mk.in, gtk/Makefile, mogul/Makefile, |
|
From: Duncan C. <dun...@us...> - 2004-08-08 19:04:48
|
Update of /cvsroot/gtk2hs/gtk2hs/gtk/general In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv358/gtk/general Modified Files: Gtk.hs 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: Gtk.hs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/general/Gtk.hs,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- Gtk.hs 3 Aug 2004 04:16:56 -0000 1.27 +++ Gtk.hs 8 Aug 2004 19:04:39 -0000 1.28 @@ -58,12 +58,10 @@ module Window, module Dialog, module FileSel, -#if GTK_CHECK_VERSION(2,4,0) -- ** File dialog module FileChooser, module FileChooserDialog, module FileChooserWidget, -#endif -- * Display widgets, module AccelLabel, module Image, @@ -78,9 +76,7 @@ -- * Numeric\/text data entry module Editable, module Entry, -#if GTK_CHECK_VERSION(2,4,0) module EntryCompletion, -#endif module HScale, module VScale, module SpinButton, @@ -108,10 +104,8 @@ -- * Menus, combo box, toolbar module CheckMenuItem, module Combo, -#if GTK_CHECK_VERSION(2,4,0) module ComboBox, module ComboBoxEntry, -#endif module Menu, module MenuBar, module MenuItem, @@ -121,9 +115,7 @@ module RadioMenuItem, module TearoffMenuItem, module Toolbar, -#if GTK_CHECK_VERSION(2,4,0) module ToolItem, -#endif -- selectors (file/font/color/input device) module ColorSelection, module ColorSelectionDialog, @@ -140,9 +132,7 @@ module HPaned, module Layout, module Notebook, -#if GTK_CHECK_VERSION(2,4,0) module Expander, -#endif module Table, module VBox, module VButtonBox, @@ -209,11 +199,9 @@ -- windows import Dialog import FileSel -#if GTK_CHECK_VERSION(2,4,0) import FileChooser import FileChooserDialog import FileChooserWidget -#endif import Window --import WindowGroup -- display widgets @@ -230,9 +218,7 @@ -- numeric\/text data entry import Editable import Entry -#if GTK_CHECK_VERSION(2,4,0) import EntryCompletion -#endif import HScale import VScale import SpinButton @@ -266,10 +252,8 @@ import TreeStore -- menus, combo box, toolbar import Combo -#if GTK_CHECK_VERSION(2,4,0) import ComboBox import ComboBoxEntry -#endif -- import ItemFactory import Menu import MenuBar @@ -281,9 +265,7 @@ import CheckMenuItem import TearoffMenuItem import Toolbar -#if GTK_CHECK_VERSION(2,4,0) import ToolItem -#endif -- selectors (file\/font\/color\/input device) import ColorSelection import ColorSelectionDialog @@ -303,9 +285,7 @@ import VPaned import Layout import Notebook -#if GTK_CHECK_VERSION(2,4,0) import Expander -#endif import Table -- ornaments import Frame |
2 messages has been excluded from this view by a project administrator.
