gtk 0.14.6 → 0.14.7

raw patch · 5 files changed

+16/−10 lines, 5 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• Graphics/UI/Gtk/Cairo.chs +1/−5
• Graphics/UI/Gtk/Embedding/Types.chs +2/−1
• Graphics/UI/Gtk/Gdk/EventM.hsc +7/−0
• Graphics/UI/Gtk/Types.chs +3/−1
• gtk.cabal +3/−3

@@ -52,11 +52,11 @@   -- * Functions for the 'Render' monad. #if GTK_MAJOR_VERSION < 3   renderWithDrawable,-  region, #else   getClipRectangle,   renderWithDrawWindow, #endif+  region,   setSourceColor,   setSourcePixbuf,   rectangle,@@ -171,16 +171,12 @@       cr       (castPtr rectPtr) -#if GTK_MAJOR_VERSION < 3 -- | Adds the given region to the current path of the 'Render' context.------ Removed in Gtk3. region :: Region -> Render () region region = Render $ do   cr <- ask   liftIO $ {# call unsafe gdk_cairo_region #}     cr     region-#endif  #endif

@@ -42,7 +42,8 @@  #if (defined(HAVE_PLUG_AND_SOCKET) && (!defined(WIN32) || GTK_CHECK_VERSION(2,8,0))) || defined(GDK_WINDOWING_X11) import Foreign.ForeignPtr (ForeignPtr, castForeignPtr)-#if __GLASGOW_HASKELL__ >= 707+-- TODO work around cpphs https://ghc.haskell.org/trac/ghc/ticket/13553+#if __GLASGOW_HASKELL__ >= 707 || __GLASGOW_HASKELL__ == 0 import Foreign.ForeignPtr.Unsafe (unsafeForeignPtrToPtr) #else import Foreign.ForeignPtr (unsafeForeignPtrToPtr)

@@ -98,6 +98,13 @@ --   you can (and usually have to) use @liftIO@ to execute @IO@ functions. -- +-- * Classes++  HasCoordinates,+  HasRootCoordinates,+  HasModifier,+  HasTime,+ -- * Event monad and type tags   EventM,   EAny,

@@ -813,11 +813,13 @@   ) where  import Foreign.ForeignPtr (ForeignPtr, castForeignPtr)-#if __GLASGOW_HASKELL__ >= 707+-- TODO work around cpphs https://ghc.haskell.org/trac/ghc/ticket/13553+#if __GLASGOW_HASKELL__ >= 707 || __GLASGOW_HASKELL__ == 0 import Foreign.ForeignPtr.Unsafe (unsafeForeignPtrToPtr) #else import Foreign.ForeignPtr (unsafeForeignPtrToPtr) #endif+ import Foreign.C.Types    (CULong(..), CUInt(..), CULLong(..)) import System.Glib.GType  (GType, typeInstanceIsA) {#import System.Glib.GObject#}

@@ -1,5 +1,5 @@ Name:           gtk-Version:        0.14.6+Version:        0.14.7 License:        LGPL-2.1 License-file:   COPYING Copyright:      (c) 2001-2010 The Gtk2Hs Team@@ -135,7 +135,7 @@  custom-setup   setup-depends: base >= 4.6,-                 Cabal >= 1.24 && < 1.25,+                 Cabal >= 1.24 && < 2.1,                  gtk2hs-buildtools >= 0.13.2.0 && < 0.14  Library@@ -382,7 +382,7 @@         x-Signals-Import: Graphics.UI.Gtk.General.Threading         include-dirs:   .         cpp-options: -U__BLOCKS__-        if os(darwin)+        if os(darwin) || os(freebsd)           cpp-options: -D__attribute__(A)= -D_Nullable= -D_Nonnull=         if !flag(deprecated)           cpp-options:  -DDISABLE_DEPRECATED