diff --git a/Graphics/UI/Gtk/Multiline/TextTagTable.chs b/Graphics/UI/Gtk/Multiline/TextTagTable.chs --- a/Graphics/UI/Gtk/Multiline/TextTagTable.chs +++ b/Graphics/UI/Gtk/Multiline/TextTagTable.chs @@ -56,9 +56,9 @@ textTagTableGetSize ) where -import Control.Monad (liftM) +import Control.Monad (liftM, void) -import System.Glib.FFI +import System.Glib.FFI (withForeignPtr, nullPtr, Ptr(..), CInt(..), CChar(..), FunPtr(..), maybeNull) import System.Glib.UTFString import System.Glib.GObject (wrapNewGObject, makeNewGObject) {#import Graphics.UI.Gtk.Types#} @@ -85,7 +85,7 @@ -- an already-added tag. -- textTagTableAdd :: (TextTagTableClass self, TextTagClass tag) => self -> tag -> IO () -textTagTableAdd self tag = +textTagTableAdd self tag = void $ {# call text_tag_table_add #} (toTextTagTable self) (toTextTag tag) diff --git a/Graphics/UI/Gtk/Types.chs b/Graphics/UI/Gtk/Types.chs --- a/Graphics/UI/Gtk/Types.chs +++ b/Graphics/UI/Gtk/Types.chs @@ -317,10 +317,6 @@ toMessageDialog, mkMessageDialog, unMessageDialog, castToMessageDialog, gTypeMessageDialog, - Plug(Plug), PlugClass, - toPlug, - mkPlug, unPlug, - castToPlug, gTypePlug, EventBox(EventBox), EventBoxClass, toEventBox, mkEventBox, unEventBox, @@ -465,10 +461,6 @@ toNotebook, mkNotebook, unNotebook, castToNotebook, gTypeNotebook, - Socket(Socket), SocketClass, - toSocket, - mkSocket, unSocket, - castToSocket, gTypeSocket, Table(Table), TableClass, toTable, mkTable, unTable, @@ -2523,33 +2515,6 @@ gTypeMessageDialog = {# call fun unsafe gtk_message_dialog_get_type #} --- *********************************************************************** Plug - -{#pointer *GtkPlug as Plug foreign newtype #} deriving (Eq,Ord) - -mkPlug = (Plug, objectUnrefFromMainloop) -unPlug (Plug o) = o - -class WindowClass o => PlugClass o -toPlug :: PlugClass o => o -> Plug -toPlug = unsafeCastGObject . toGObject - -instance PlugClass Plug -instance WindowClass Plug -instance BinClass Plug -instance ContainerClass Plug -instance WidgetClass Plug -instance GObjectClass Plug where - toGObject = GObject . castForeignPtr . unPlug - unsafeCastGObject = Plug . castForeignPtr . unGObject - -castToPlug :: GObjectClass obj => obj -> Plug -castToPlug = castTo gTypePlug "Plug" - -gTypePlug :: GType -gTypePlug = - {# call fun unsafe gtk_plug_get_type #} - -- ******************************************************************* EventBox {#pointer *GtkEventBox as EventBox foreign newtype #} deriving (Eq,Ord) @@ -3497,31 +3462,6 @@ gTypeNotebook :: GType gTypeNotebook = {# call fun unsafe gtk_notebook_get_type #} - --- ********************************************************************* Socket - -{#pointer *GtkSocket as Socket foreign newtype #} deriving (Eq,Ord) - -mkSocket = (Socket, objectUnrefFromMainloop) -unSocket (Socket o) = o - -class ContainerClass o => SocketClass o -toSocket :: SocketClass o => o -> Socket -toSocket = unsafeCastGObject . toGObject - -instance SocketClass Socket -instance ContainerClass Socket -instance WidgetClass Socket -instance GObjectClass Socket where - toGObject = GObject . castForeignPtr . unSocket - unsafeCastGObject = Socket . castForeignPtr . unGObject - -castToSocket :: GObjectClass obj => obj -> Socket -castToSocket = castTo gTypeSocket "Socket" - -gTypeSocket :: GType -gTypeSocket = - {# call fun unsafe gtk_socket_get_type #} -- ********************************************************************** Table diff --git a/gtk3.cabal b/gtk3.cabal --- a/gtk3.cabal +++ b/gtk3.cabal @@ -1,5 +1,5 @@ Name: gtk3 -Version: 0.13.0.2 +Version: 0.13.0.3 License: LGPL-2.1 License-file: COPYING Copyright: (c) 2001-2010 The Gtk2Hs Team @@ -370,7 +370,7 @@ -- needs to be imported from this module: x-Signals-Import: Graphics.UI.Gtk.General.Threading include-dirs: . - cpp-options: -DDISABLE_DEPRECATED -U__BLOCKS__ + cpp-options: -DDISABLE_DEPRECATED -U__BLOCKS__ -D__attribute__(A)= if os(windows) cpp-options: -DWIN32 -fno-exceptions cc-options: -fno-exceptions @@ -396,7 +396,7 @@ main-is: ActionMenu.hs if !flag(build-demos) buildable: False - build-depends: gtk3==0.13.0.2, base, transformers, text + build-depends: gtk3==0.13.0.3, base, transformers, text Executable gtk2hs-demo-buttonBox default-language: Haskell98 @@ -404,7 +404,7 @@ main-is: ButtonBox.hs if !flag(build-demos) buildable: False - build-depends: gtk3==0.13.0.2, base, transformers + build-depends: gtk3==0.13.0.3, base, transformers Executable gtk2hs-demo-carsim default-language: Haskell98 @@ -412,7 +412,7 @@ main-is: CarSim.hs if !flag(build-demos) buildable: False - build-depends: gtk3==0.13.0.2, base, transformers, time, cairo + build-depends: gtk3==0.13.0.3, base, transformers, time, cairo Executable gtk2hs-demo-progress default-language: Haskell98 @@ -420,7 +420,7 @@ main-is: Progress.hs if !flag(build-demos) buildable: False - build-depends: gtk3==0.13.0.2, base, transformers + build-depends: gtk3==0.13.0.3, base, transformers Executable gtk2hs-demo-progressThreadedRTS default-language: Haskell98 @@ -428,7 +428,7 @@ main-is: ProgressThreadedRTS.hs if !flag(build-demos) buildable: False - build-depends: gtk3==0.13.0.2, base, transformers + build-depends: gtk3==0.13.0.3, base, transformers ghc-options: -threaded Executable gtk2hs-demo-fastDraw @@ -437,7 +437,7 @@ main-is: FastDraw.hs if !flag(build-demos) buildable: False - build-depends: gtk3==0.13.0.2, base, transformers, array, cairo + build-depends: gtk3==0.13.0.3, base, transformers, array, cairo Executable gtk2hs-demo-fonts default-language: Haskell98 @@ -445,7 +445,7 @@ main-is: Fonts.hs if !flag(build-demos) buildable: False - build-depends: gtk3==0.13.0.2, base + build-depends: gtk3==0.13.0.3, base Executable gtk2hs-demo-builder default-language: Haskell98 @@ -453,7 +453,7 @@ main-is: GtkBuilderTest.hs if !flag(build-demos) buildable: False - build-depends: gtk3==0.13.0.2, base, transformers + build-depends: gtk3==0.13.0.3, base, transformers Executable gtk2hs-demo-helloworld default-language: Haskell98 @@ -461,7 +461,7 @@ main-is: World.hs if !flag(build-demos) buildable: False - build-depends: gtk3==0.13.0.2, base, transformers + build-depends: gtk3==0.13.0.3, base, transformers Executable gtk2hs-demo-layout default-language: Haskell98 @@ -469,7 +469,7 @@ main-is: Layout.hs if !flag(build-demos) buildable: False - build-depends: gtk3==0.13.0.2, base, transformers, cairo, text + build-depends: gtk3==0.13.0.3, base, transformers, cairo, text Executable gtk2hs-demo-menudemo default-language: Haskell98 @@ -477,7 +477,7 @@ main-is: MenuDemo.hs if !flag(build-demos) buildable: False - build-depends: gtk3==0.13.0.2, base, transformers, text + build-depends: gtk3==0.13.0.3, base, transformers, text Executable gtk2hs-demo-combodemo default-language: Haskell98 @@ -485,7 +485,7 @@ main-is: ComboDemo.hs if !flag(build-demos) buildable: False - build-depends: gtk3==0.13.0.2, text, base, transformers + build-depends: gtk3==0.13.0.3, text, base, transformers Executable gtk2hs-demo-notebook default-language: Haskell98 @@ -493,7 +493,7 @@ main-is: Notebook.hs if !flag(build-demos) buildable: False - build-depends: gtk3==0.13.0.2, base, transformers, text + build-depends: gtk3==0.13.0.3, base, transformers, text Executable gtk2hs-demo-statusIcon default-language: Haskell98 @@ -501,7 +501,7 @@ main-is: StatusIcon.hs if !flag(build-demos) buildable: False - build-depends: gtk3==0.13.0.2, base, transformers + build-depends: gtk3==0.13.0.3, base, transformers Executable gtk2hs-demo-arabic default-language: Haskell98 @@ -509,7 +509,7 @@ main-is: Arabic.hs if !flag(build-demos) buildable: False - build-depends: gtk3==0.13.0.2, base, transformers, text + build-depends: gtk3==0.13.0.3, base, transformers, text Executable gtk2hs-demo-overlay default-language: Haskell98 @@ -517,4 +517,4 @@ main-is: Overlay.hs if !flag(build-demos) buildable: False - build-depends: gtk3==0.13.0.2, base, transformers + build-depends: gtk3==0.13.0.3, base, transformers