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: Daniel W. <dm...@lu...> - 2013-03-26 18:34:42
|
diffing dir... Tue Mar 26 18:33:15 GMT 2013 Daniel Wagner <da...@wa...> * forward compatibility with new Cabal library Ignore-this: 4dcae380bd68c5fa713ff9a4f42f856d hunk ./cairo/Gtk2HsSetup.hs 1 -{-# LANGUAGE CPP #-} +{-# LANGUAGE CPP, ViewPatterns #-} hunk ./cairo/Gtk2HsSetup.hs 32 -import Distribution.Simple.LocalBuildInfo (LocalBuildInfo(..), +import Distribution.Simple.LocalBuildInfo (LocalBuildInfo(withPackageDB, buildDir, localPkgDescr, installedPkgs, withPrograms), hunk ./cairo/Gtk2HsSetup.hs 64 +import qualified Distribution.Simple.LocalBuildInfo as LBI hunk ./cairo/Gtk2HsSetup.hs 68 +#if CABAL_VERSION_CHECK(1,17,0) +libraryConfig lbi = case [clbi | (LBI.CLibName, clbi, _) <- LBI.componentsConfigs lbi] of + [clbi] -> Just clbi + _ -> Nothing +#else +libraryConfig = LBI.libraryConfig +#endif + hunk ./cairo/Gtk2HsSetup.hs 161 -register pkg@PackageDescription { library = Just lib } - lbi@LocalBuildInfo { libraryConfig = Just clbi } regFlags +register pkg@(library -> Just lib ) + lbi@(libraryConfig -> Just clbi) regFlags hunk ./cairo/SetupWrapper.hs 4 +{-# LANGUAGE FlexibleInstances #-} hunk ./cairo/SetupWrapper.hs 33 +-- The former instance is for Cabal < 1.17; the latter for Cabal >= 1.17. We +-- can't use CPP to check which version of Cabal we're up against here because +-- this is the file that's generating those macros. +class CompConf a where compConf :: a -> (Compiler, ProgramConfiguration) +instance CompConf (Compiler, ProgramConfiguration) where compConf = id +instance CompConf (Compiler, a, ProgramConfiguration) where compConf (c, a, p) = (c, p) + hunk ./cairo/SetupWrapper.hs 108 - (comp, conf) <- configCompiler (Just GHC) Nothing Nothing + (comp, conf) <- compConf `fmap` configCompiler (Just GHC) Nothing Nothing hunk ./gio/Gtk2HsSetup.hs 1 -{-# LANGUAGE CPP #-} +{-# LANGUAGE CPP, ViewPatterns #-} hunk ./gio/Gtk2HsSetup.hs 32 -import Distribution.Simple.LocalBuildInfo (LocalBuildInfo(..), +import Distribution.Simple.LocalBuildInfo (LocalBuildInfo(withPackageDB, buildDir, localPkgDescr, installedPkgs, withPrograms), hunk ./gio/Gtk2HsSetup.hs 63 +import qualified Distribution.Simple.LocalBuildInfo as LBI hunk ./gio/Gtk2HsSetup.hs 67 +#if CABAL_VERSION_CHECK(1,17,0) +libraryConfig lbi = case [clbi | (LBI.CLibName, clbi, _) <- LBI.componentsConfigs lbi] of + [clbi] -> Just clbi + _ -> Nothing +#else +libraryConfig = LBI.libraryConfig +#endif + hunk ./gio/Gtk2HsSetup.hs 153 -register pkg@PackageDescription { library = Just lib } - lbi@LocalBuildInfo { libraryConfig = Just clbi } regFlags +register pkg@(library -> Just lib ) + lbi@(libraryConfig -> Just clbi) regFlags hunk ./gio/SetupWrapper.hs 4 +{-# LANGUAGE FlexibleInstances #-} hunk ./gio/SetupWrapper.hs 33 +-- The former instance is for Cabal < 1.17; the latter for Cabal >= 1.17. We +-- can't use CPP to check which version of Cabal we're up against here because +-- this is the file that's generating those macros. +class CompConf a where compConf :: a -> (Compiler, ProgramConfiguration) +instance CompConf (Compiler, ProgramConfiguration) where compConf = id +instance CompConf (Compiler, a, ProgramConfiguration) where compConf (c, a, p) = (c, p) + hunk ./gio/SetupWrapper.hs 108 - (comp, conf) <- configCompiler (Just GHC) Nothing Nothing + (comp, conf) <- compConf `fmap` configCompiler (Just GHC) Nothing Nothing hunk ./glib/Gtk2HsSetup.hs 1 -{-# LANGUAGE CPP #-} +{-# LANGUAGE CPP, ViewPatterns #-} hunk ./glib/Gtk2HsSetup.hs 32 -import Distribution.Simple.LocalBuildInfo (LocalBuildInfo(..), +import Distribution.Simple.LocalBuildInfo (LocalBuildInfo(withPackageDB, buildDir, localPkgDescr, installedPkgs, withPrograms), hunk ./glib/Gtk2HsSetup.hs 63 +import qualified Distribution.Simple.LocalBuildInfo as LBI hunk ./glib/Gtk2HsSetup.hs 67 +#if CABAL_VERSION_CHECK(1,17,0) +libraryConfig lbi = case [clbi | (LBI.CLibName, clbi, _) <- LBI.componentsConfigs lbi] of + [clbi] -> Just clbi + _ -> Nothing +#else +libraryConfig = LBI.libraryConfig +#endif + hunk ./glib/Gtk2HsSetup.hs 153 -register pkg@PackageDescription { library = Just lib } - lbi@LocalBuildInfo { libraryConfig = Just clbi } regFlags +register pkg@(library -> Just lib ) + lbi@(libraryConfig -> Just clbi) regFlags hunk ./glib/SetupWrapper.hs 4 +{-# LANGUAGE FlexibleInstances #-} hunk ./glib/SetupWrapper.hs 33 +-- The former instance is for Cabal < 1.17; the latter for Cabal >= 1.17. We +-- can't use CPP to check which version of Cabal we're up against here because +-- this is the file that's generating those macros. +class CompConf a where compConf :: a -> (Compiler, ProgramConfiguration) +instance CompConf (Compiler, ProgramConfiguration) where compConf = id +instance CompConf (Compiler, a, ProgramConfiguration) where compConf (c, a, p) = (c, p) + hunk ./glib/SetupWrapper.hs 108 - (comp, conf) <- configCompiler (Just GHC) Nothing Nothing + (comp, conf) <- compConf `fmap` configCompiler (Just GHC) Nothing Nothing hunk ./gtk/Gtk2HsSetup.hs 1 -{-# LANGUAGE CPP #-} +{-# LANGUAGE CPP, ViewPatterns #-} hunk ./gtk/Gtk2HsSetup.hs 32 -import Distribution.Simple.LocalBuildInfo (LocalBuildInfo(..), +import Distribution.Simple.LocalBuildInfo (LocalBuildInfo(withPackageDB, buildDir, localPkgDescr, installedPkgs, withPrograms), hunk ./gtk/Gtk2HsSetup.hs 63 +import qualified Distribution.Simple.LocalBuildInfo as LBI hunk ./gtk/Gtk2HsSetup.hs 67 +#if CABAL_VERSION_CHECK(1,17,0) +libraryConfig lbi = case [clbi | (LBI.CLibName, clbi, _) <- LBI.componentsConfigs lbi] of + [clbi] -> Just clbi + _ -> Nothing +#else +libraryConfig = LBI.libraryConfig +#endif + hunk ./gtk/Gtk2HsSetup.hs 153 -register pkg@PackageDescription { library = Just lib } - lbi@LocalBuildInfo { libraryConfig = Just clbi } regFlags +register pkg@(library -> Just lib ) + lbi@(libraryConfig -> Just clbi) regFlags hunk ./gtk/SetupWrapper.hs 4 +{-# LANGUAGE FlexibleInstances #-} hunk ./gtk/SetupWrapper.hs 33 +-- The former instance is for Cabal < 1.17; the latter for Cabal >= 1.17. We +-- can't use CPP to check which version of Cabal we're up against here because +-- this is the file that's generating those macros. +class CompConf a where compConf :: a -> (Compiler, ProgramConfiguration) +instance CompConf (Compiler, ProgramConfiguration) where compConf = id +instance CompConf (Compiler, a, ProgramConfiguration) where compConf (c, a, p) = (c, p) + hunk ./gtk/SetupWrapper.hs 108 - (comp, conf) <- configCompiler (Just GHC) Nothing Nothing + (comp, conf) <- compConf `fmap` configCompiler (Just GHC) Nothing Nothing hunk ./pango/Gtk2HsSetup.hs 1 -{-# LANGUAGE CPP #-} +{-# LANGUAGE CPP, ViewPatterns #-} hunk ./pango/Gtk2HsSetup.hs 32 -import Distribution.Simple.LocalBuildInfo (LocalBuildInfo(..), +import Distribution.Simple.LocalBuildInfo (LocalBuildInfo(withPackageDB, buildDir, localPkgDescr, installedPkgs, withPrograms), hunk ./pango/Gtk2HsSetup.hs 63 +import qualified Distribution.Simple.LocalBuildInfo as LBI hunk ./pango/Gtk2HsSetup.hs 67 +#if CABAL_VERSION_CHECK(1,17,0) +libraryConfig lbi = case [clbi | (LBI.CLibName, clbi, _) <- LBI.componentsConfigs lbi] of + [clbi] -> Just clbi + _ -> Nothing +#else +libraryConfig = LBI.libraryConfig +#endif + hunk ./pango/Gtk2HsSetup.hs 153 -register pkg@PackageDescription { library = Just lib } - lbi@LocalBuildInfo { libraryConfig = Just clbi } regFlags +register pkg@(library -> Just lib ) + lbi@(libraryConfig -> Just clbi) regFlags hunk ./pango/SetupWrapper.hs 4 +{-# LANGUAGE FlexibleInstances #-} hunk ./pango/SetupWrapper.hs 33 +-- The former instance is for Cabal < 1.17; the latter for Cabal >= 1.17. We +-- can't use CPP to check which version of Cabal we're up against here because +-- this is the file that's generating those macros. +class CompConf a where compConf :: a -> (Compiler, ProgramConfiguration) +instance CompConf (Compiler, ProgramConfiguration) where compConf = id +instance CompConf (Compiler, a, ProgramConfiguration) where compConf (c, a, p) = (c, p) + hunk ./pango/SetupWrapper.hs 108 - (comp, conf) <- configCompiler (Just GHC) Nothing Nothing + (comp, conf) <- compConf `fmap` configCompiler (Just GHC) Nothing Nothing |
From: Daniel W. <dm...@lu...> - 2013-03-20 12:30:33
|
diffing dir... Wed Mar 20 12:09:24 GMT 2013 Daniel Wagner <da...@wa...> * use utf8-string for encoding and decoding Ignore-this: 70c5f89ec363a0dc7c90b3179f0fcc17 hunk ./cairo/Graphics/Rendering/Cairo/Internal/Utilities.chs 21 +import Codec.Binary.UTF8.String hunk ./cairo/Graphics/Rendering/Cairo/Internal/Utilities.chs 30 --- These functions taken from System/Glib/UTFString.hs --- Copyright (c) 1999..2002 Axel Simon - --- Define withUTFString to emit UTF-8. --- hunk ./cairo/Graphics/Rendering/Cairo/Internal/Utilities.chs 31 -withUTFString hsStr = withCAString (toUTF hsStr) - where - -- Convert Unicode characters to UTF-8. - -- - toUTF :: String -> String - toUTF [] = [] - toUTF (x:xs) | ord x<=0x007F = x:toUTF xs - | ord x<=0x07FF = chr (0xC0 .|. ((ord x `shift` (-6)) .&. 0x1F)): - chr (0x80 .|. (ord x .&. 0x3F)): - toUTF xs - | otherwise = chr (0xE0 .|. ((ord x `shift` (-12)) .&. 0x0F)): - chr (0x80 .|. ((ord x `shift` (-6)) .&. 0x3F)): - chr (0x80 .|. (ord x .&. 0x3F)): - toUTF xs +withUTFString = withCAString . encodeString hunk ./cairo/cairo.cabal 49 + utf8-string >= 0.2 && < 0.4, hunk ./glib/System/Glib/UTFString.hs 49 -import Control.Monad (liftM) +import Codec.Binary.UTF8.String +import Control.Monad (liftM) hunk ./glib/System/Glib/UTFString.hs 59 -withUTFString hsStr = withCAString (toUTF hsStr) +withUTFString = withCAString . encodeString hunk ./glib/System/Glib/UTFString.hs 64 -withUTFStringLen hsStr = withCAStringLen (toUTF hsStr) +withUTFStringLen = withCAStringLen . encodeString hunk ./glib/System/Glib/UTFString.hs 69 -newUTFString = newCAString . toUTF +newUTFString = newCAString . encodeString hunk ./glib/System/Glib/UTFString.hs 74 -newUTFStringLen = newCAStringLen . toUTF +newUTFStringLen = newCAStringLen . encodeString hunk ./glib/System/Glib/UTFString.hs 79 -peekUTFString strPtr = liftM fromUTF $ peekCAString strPtr +peekUTFString = liftM decodeString . peekCAString hunk ./glib/System/Glib/UTFString.hs 85 -maybePeekUTFString strPtr = liftM (maybe Nothing (Just . fromUTF)) $ maybePeek peekCAString strPtr +maybePeekUTFString = liftM (maybe Nothing (Just . decodeString)) . maybePeek peekCAString hunk ./glib/System/Glib/UTFString.hs 90 -peekUTFStringLen strPtr = liftM fromUTF $ peekCAStringLen strPtr +peekUTFStringLen = liftM decodeString . peekCAStringLen hunk ./glib/System/Glib/UTFString.hs 167 --- | Encode a Haskell Unicode String as UTF-8 --- --- You should think of this as it it had type @String -> [Word8]@ --- -toUTF :: String -> String -toUTF [] = [] -toUTF (x:xs) | ord x<=0x007F = x:toUTF xs - | ord x<=0x07FF = chr (0xC0 .|. ((ord x `shift` (-6)) .&. 0x1F)): - chr (0x80 .|. (ord x .&. 0x3F)): - toUTF xs - | ord x<=0xFFFF = chr (0xE0 .|. ((ord x `shift` (-12)) .&. 0x0F)): - chr (0x80 .|. ((ord x `shift` (-6)) .&. 0x3F)): - chr (0x80 .|. (ord x .&. 0x3F)): - toUTF xs - | otherwise = chr (0xF0 .|. ((ord x `shift` (-18)) .&. 0x07)): - chr (0x80 .|. ((ord x `shift` (-12)) .&. 0x3F)): - chr (0x80 .|. ((ord x `shift` (-6)) .&. 0x3F)): - chr (0x80 .|. (ord x .&. 0x3F)): - toUTF xs - --- | Decode a UTF-8 string into a Haskell Unicode String. --- --- You should think of this as it it had type @[Word8] -> String@ --- -fromUTF :: String -> String -fromUTF [] = [] -fromUTF (all@(x:xs)) | ord x<=0x7F = x:fromUTF xs - | ord x<=0xBF = err - | ord x<=0xDF = twoBytes all - | ord x<=0xEF = threeBytes all - | ord x<=0xF7 = fourBytes all - | otherwise = err - where - twoBytes (x1:x2:xs) = chr (((ord x1 .&. 0x1F) `shift` 6) .|. - (ord x2 .&. 0x3F)):fromUTF xs - twoBytes _ = error "fromUTF: illegal two byte sequence" - - threeBytes (x1:x2:x3:xs) = chr (((ord x1 .&. 0x0F) `shift` 12) .|. - ((ord x2 .&. 0x3F) `shift` 6) .|. - (ord x3 .&. 0x3F)):fromUTF xs - threeBytes _ = error "fromUTF: illegal three byte sequence" - - fourBytes (x1:x2:x3:x4:xs) = chr (((ord x1 .&. 0x07) `shift` 18) .|. - ((ord x2 .&. 0x3F) `shift` 12) .|. - ((ord x3 .&. 0x3F) `shift` 6) .|. - (ord x4 .&. 0x3F)):fromUTF xs - fourBytes _ = error "fromUTF: illegal four byte sequence" - - err = error "fromUTF: illegal UTF-8 character" - hunk ./glib/glib.cabal 36 + utf8-string >= 0.2 && < 0.4, |
From: Daniel W. <dm...@lu...> - 2013-02-24 02:52:46
|
diffing dir... Sun Feb 24 02:49:58 GMT 2013 Daniel Wagner <da...@wa...> * Trac #1284: handle characters which require four bytes to encode in UTF8 Ignore-this: baae28f5c5bf5a3b60966ea236f577ec hunk ./glib/System/Glib/UTFString.hs 176 - | otherwise = chr (0xE0 .|. ((ord x `shift` (-12)) .&. 0x0F)): + | ord x<=0xFFFF = chr (0xE0 .|. ((ord x `shift` (-12)) .&. 0x0F)): + chr (0x80 .|. ((ord x `shift` (-6)) .&. 0x3F)): + chr (0x80 .|. (ord x .&. 0x3F)): + toUTF xs + | otherwise = chr (0xF0 .|. ((ord x `shift` (-18)) .&. 0x07)): + chr (0x80 .|. ((ord x `shift` (-12)) .&. 0x3F)): hunk ./glib/System/Glib/UTFString.hs 196 + | ord x<=0xF7 = fourBytes all hunk ./glib/System/Glib/UTFString.hs 206 - threeBytes _ = error "fromUTF: illegal three byte sequence" [_$_] - [_$_] + threeBytes _ = error "fromUTF: illegal three byte sequence" + + fourBytes (x1:x2:x3:x4:xs) = chr (((ord x1 .&. 0x07) `shift` 18) .|. + ((ord x2 .&. 0x3F) `shift` 12) .|. + ((ord x3 .&. 0x3F) `shift` 6) .|. + (ord x4 .&. 0x3F)):fromUTF xs + fourBytes _ = error "fromUTF: illegal four byte sequence" + hunk ./glib/System/Glib/UTFString.hs 228 - | otherwise = n:n:gUO (n+1) xs + | ord x<=0xFFFF = n:n:gUO (n+1) xs + | otherwise = n:n:n:gUO (n+1) xs |
From: Daniel W. <dm...@lu...> - 2013-02-19 21:40:37
|
diffing dir... Tue Feb 19 21:39:46 GMT 2013 Daniel Wagner <da...@wa...> * documentation improvements Ignore-this: fe404799eb638ed3fc7724901436c00a hunk ./cairo/Graphics/Rendering/Cairo.hs 1790 --- * To read or write a specific pixel use the formula: --- @p = y * (rowstride `div` 4) + x@ for the pixel and force the array to --- have 32-bit words or integers. +-- * To read or write a specific pixel (and assuming 'FormatARGB32' or +-- 'FormatRGB24'), use the formula: @p = y * (rowstride `div` 4) + x@ for the +-- pixel and force the array to have 32-bit words or integers. hunk ./cairo/Graphics/Rendering/Cairo.hs 1804 --- * After each write access to the array, you need to inform Cairo that +-- * After each write access to the array, you need to inform Cairo hunk ./cairo/Graphics/Rendering/Cairo.hs 1808 --- surface of if 'surfaceFinish' has been called on the surface. +-- surface or if 'surfaceFinish' has been called on the surface. |
From: Daniel W. <dm...@lu...> - 2013-02-19 21:40:34
|
diffing dir... Tue Feb 19 21:38:47 GMT 2013 Daniel Wagner <da...@wa...> * Trac #1281, with patch idea by Sven Mattsen Ignore-this: 71d4a3934d3cc39049fec4656e92ba9 hunk ./cairo/Graphics/Rendering/Cairo.hs 1812 - pixPtr_ <- Internal.imageSurfaceGetData pb - when (pixPtr_==nullPtr) $ do + pixPtr <- Internal.imageSurfaceGetData pb + when (pixPtr==nullPtr) $ do hunk ./cairo/Graphics/Rendering/Cairo.hs 1815 - fmt <- imageSurfaceGetFormat pb - let bits = case fmt of - FormatARGB32 -> 32 - FormatRGB24 -> 32 - FormatA8 -> 8 - FormatA1 -> 1 hunk ./cairo/Graphics/Rendering/Cairo.hs 1817 - let pixPtr = castPtr pixPtr_ - let bytes = h*((r*bits)+7) `div` 8 - return (mkSurfaceData pb pixPtr bytes) + return (mkSurfaceData pb (castPtr pixPtr) (h*r)) hunk ./cairo/Graphics/Rendering/Cairo.hs 1828 - SurfaceData pb ptr (0, count) count + SurfaceData pb ptr (0, count-1) count |
From: Daniel W. <dm...@lu...> - 2013-02-15 01:58:47
|
diffing dir... Sun Nov 4 16:05:01 GMT 2012 Hamish Mackenzie <ham...@go...> * Add sources.txt for cabal-meta Ignore-this: 5000c3f7c2b5c877bd4650e9136b810d addfile ./sources.txt hunk ./sources.txt 1 +./glib +./gio +./cairo +./pango +./gtk -fgtk3 + |
From: Daniel W. <dm...@lu...> - 2013-02-15 01:58:38
|
diffing dir... Sun Oct 7 15:11:58 BST 2012 Hamish Mackenzie <ham...@go...> * Fixes for Gtk 3 on Linux Ignore-this: 1b0050db0051982883743214e9241ff8 hunk ./gtk/Graphics/UI/Gtk/Embedding/Embedding.hsc 30 -#if defined(HAVE_PLUG_AND_SOCKET) && (!defined(WIN32) || GTK_CHECK_VERSION(2,8,0)) +#if defined(HAVE_PLUG_AND_SOCKET) && (!defined(WIN32) || GTK_CHECK_VERSION(2,8,0)) && GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Embedding/Embedding.hsc 38 -#if defined(HAVE_PLUG_AND_SOCKET) && (!defined(WIN32) || GTK_CHECK_VERSION(2,8,0)) +#if defined(HAVE_PLUG_AND_SOCKET) && (!defined(WIN32) || GTK_CHECK_VERSION(2,8,0)) && GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Embedding/Plug.chs 193 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Embedding/Plug.chs 195 +#else + {# call pure unsafe gdk_window_get_type #} +#endif hunk ./gtk/Graphics/UI/Gtk/Embedding/Socket.chs 119 +import Data.Maybe (isJust) hunk ./gtk/Graphics/UI/Gtk/Embedding/Socket.chs 194 - -> IO DrawWindow -- ^ returns the window of the plug if available, or - -- {@NULL@, FIXME: this should probably be converted to a - -- Maybe data type} + -> IO (Maybe DrawWindow) -- ^ returns the window of the plug if available, + -- or Nothing hunk ./gtk/Graphics/UI/Gtk/Embedding/Socket.chs 197 - makeNewGObject mkDrawWindow $ + maybeNull (makeNewGObject mkDrawWindow) $ hunk ./gtk/Graphics/UI/Gtk/Embedding/Socket.chs 200 + +#if GTK_MAJOR_VERSION >= 3 +socketHasPlug :: SocketClass s => s -> IO Bool +socketHasPlug = liftM isJust . socketGetPlugWindow +#endif + hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 620 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 622 +#else +newtype NativeWindowId = NativeWindowId #{gtk2hs_type Window} deriving (Eq, Show) +#endif hunk ./gtk/hsgtk.h 6 +#if GTK_MAJOR_VERSION >= 3 +#include <gtk/gtkx.h> +#endif + +#undef Bool +#undef True +#undef False +#undef Button1 [_$_] +#undef Button2 +#undef Button3 +#undef Button4 +#undef Button5 +#undef Button1Mask [_$_] +#undef Button2Mask +#undef Button3Mask +#undef Button4Mask +#undef Button5Mask + +#undef ShiftMask +#undef LockMask +#undef ControlMask +#undef Mod1Mask +#undef Mod2Mask +#undef Mod3Mask +#undef Mod4Mask +#undef Mod5Mask + +#undef None +#undef ParentRelative +#undef CopyFromParent +#undef PointerWindow +#undef InputFocus +#undef PointerRoot +#undef AnyPropertyType +#undef AnyKey +#undef AnyButton +#undef AllTemporary +#undef CurrentTime +#undef NoSymbol + +#undef NoEventMask +#undef KeyPressMask +#undef KeyReleaseMask +#undef ButtonPressMask +#undef ButtonReleaseMask +#undef EnterWindowMask +#undef LeaveWindowMask +#undef PointerMotionMask +#undef PointerMotionHintMask +#undef Button1MotionMask +#undef Button2MotionMask +#undef Button3MotionMask +#undef Button4MotionMask +#undef Button5MotionMask +#undef ButtonMotionMask +#undef KeymapStateMask +#undef ExposureMask +#undef VisibilityChangeMask +#undef StructureNotifyMask +#undef ResizeRedirectMask +#undef SubstructureNotifyMask +#undef SubstructureRedirectMask +#undef FocusChangeMask +#undef PropertyChangeMask +#undef ColormapChangeMask +#undef OwnerGrabButtonMask |
From: Daniel W. <dm...@lu...> - 2013-02-15 01:58:31
|
diffing dir... Sun Nov 4 15:31:20 GMT 2012 Hamish Mackenzie <ham...@go...> * Fix Extra-Source-Files list in gtk.cabal Ignore-this: 187d91fbb7bebd4d8228d2fd1c125bfd hunk ./gtk/gtk.cabal 19 -Extra-Source-Files: wingtk.h +Extra-Source-Files: hsgtk.h |
From: Daniel W. <dm...@lu...> - 2013-02-15 01:58:24
|
diffing dir... Tue Feb 12 02:24:22 GMT 2013 Daniel Wagner <da...@wa...> * fix haddocks Ignore-this: 69acc209bcc9c36c32da4f6ee5cbeca4 hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 205 - -- | A set of horizontal stripes that denote the invalid area. hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 206 + -- | A set of horizontal stripes that denote the invalid area. hunk ./gtk/Graphics/UI/Gtk/General/CssProvider.chs 107 - => cssProvider -- | ^ @cssProvider@ : a @CssProvider@ - -> Ptr CChar -- | ^ @_data@ : CSS data loaded in memory. [array length=length][element-type guint8] - -> Int -- | ^ @length@ : the length of @_data@ in bytes, or -1 for NUL terminated + => cssProvider -- ^ @cssProvider@ : a @CssProvider@ + -> Ptr CChar -- ^ @_data@ : CSS data loaded in memory. [array length=length][element-type guint8] + -> Int -- ^ @length@ : the length of @_data@ in bytes, or -1 for NUL terminated hunk ./gtk/Graphics/UI/Gtk/General/CssProvider.chs 123 - => cssProvider -- | ^ @cssProvider@ : a @CssProvider@ - -> String -- | ^ @css@ : CSS data loaded in memory. + => cssProvider -- ^ @cssProvider@ : a @CssProvider@ + -> String -- ^ @css@ : CSS data loaded in memory. hunk ./gtk/Graphics/UI/Gtk/General/CssProvider.chs 133 - => cssProvider -- | ^ @cssProvider@ a @CssProvider@ - -> FilePath -- | ^ the path of a filename to load + => cssProvider -- ^ @cssProvider@ a @CssProvider@ + -> FilePath -- ^ the path of a filename to load hunk ./gtk/Graphics/UI/Gtk/General/CssProvider.chs 151 - => cssProvider -- | ^ @provider@ a @CssProvider@ + => cssProvider -- ^ @provider@ a @CssProvider@ |
From: Daniel W. <dm...@lu...> - 2013-02-15 01:58:16
|
diffing dir... Sun Oct 7 07:54:35 BST 2012 Hamish Mackenzie <ham...@go...> * Fix Gtk2 build Ignore-this: d1f79ad954650f03876e35f00d961946 hunk ./gtk/Graphics/UI/Gtk/Abstract/Range.chs 128 +#if GTK_MAJOR_VERSION < 3 +import Graphics.UI.Gtk.General.Enums (UpdateType(..)) +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 234 +#if GTK_CHECK_VERSION(3,0,0) hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 237 +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 428 - , ExtensionMode(..)) + , ExtensionMode(..) hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 2305 +#if GTK_CHECK_VERSION(3,0,0) hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 2317 +#endif hunk ./gtk/Graphics/UI/Gtk/Embedding/Plug.chs 193 - {# call pure unsafe gdk_window_get_type #} + {# call pure unsafe gdk_window_object_get_type #} hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 8 -#if !defined(WIN32) && !HAVE_QUARTZ_GTK +#if GTK_MAJOR_VERSION >= 3 hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 130 +#if GTK_MAJOR_VERSION < 3 +import Graphics.UI.Gtk.Gdk.Enums (Function, Fill, SubwindowMode, + LineStyle, CapStyle, JoinStyle) +#endif hunk ./gtk/Graphics/UI/Gtk/Windows/Dialog.chs 394 -dialogGetContentArea = dialogGetUpper +dialogGetContentArea self = liftM toWidget $ dialogGetUpper self hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs 153 -#if GTK_MAJOR_VERSION >= 3 hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs 154 -#endif +#if GTK_MAJOR_VERSION >= 3 hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs 156 +#endif hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs 2030 +#if GTK_MAJOR_VERSION >= 3 hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs 2039 +#endif |
From: Daniel W. <dm...@lu...> - 2013-02-15 01:58:06
|
diffing dir... Sat Jul 14 17:15:33 BST 2012 ult...@gm... * Stop TypeGen.hs from stripping prefixes from C names Ignore-this: 391e6e3228f1d1a38f5643fc6fc3beb0 This behaviour is pointless (c2hs readds the prefix) and causes strange bugs when the names minus prefix come into scope (Window is a type found in X.h for example). hunk ./tools/hierarchyGen/TypeGen.hs 282 - (Just TypeInfo { tiQueryFunction = cname }) - | stripPrefix cname == name -> ss name - | otherwise -> ss cname.ss " as ".ss name - where stripPrefix s = if uCasePrefix `isPrefixOf` s - then drop (length prefix) s - else s - uCasePrefix = toUpper (head prefix) : tail prefix -- gtk -> Gtk + (Just TypeInfo { tiQueryFunction = cname }) -> ss cname.ss " as ".ss name |
From: Daniel W. <dm...@lu...> - 2013-02-15 01:57:59
|
diffing dir... Sat Jan 5 10:38:52 GMT 2013 Hamish Mackenzie <ham...@go...> * Fix for ghci and template haskell on Win32 Ignore-this: fde0d924bae880ea1d331fb76f589cd8 hunk ./cairo/Gtk2HsSetup.hs 59 -import Data.List (isPrefixOf, isSuffixOf, nub, minimumBy) +import Data.List (isPrefixOf, isSuffixOf, nub, minimumBy, stripPrefix) hunk ./cairo/Gtk2HsSetup.hs 61 -import Data.Char (isAlpha) +import Data.Char (isAlpha, isNumber) hunk ./cairo/Gtk2HsSetup.hs 103 - case filter (("lib" ++ lib) `isPrefixOf`) dlls of + case filter (isLib lib) dlls of hunk ./cairo/Gtk2HsSetup.hs 114 - + isLib lib dll = + case stripPrefix ("lib"++lib) dll of + Just ('.':_) -> True + Just ('-':n:_) | isNumber n -> True + _ -> False + [_$_] hunk ./gio/Gtk2HsSetup.hs 59 -import Data.List (isPrefixOf, isSuffixOf, nub) -import Data.Char (isAlpha) +import Data.List (isPrefixOf, isSuffixOf, stripPrefix, nub) +import Data.Char (isAlpha, isNumber) hunk ./gio/Gtk2HsSetup.hs 102 - case filter (("lib" ++ lib) `isPrefixOf`) dlls of + case filter (isLib lib) dlls of hunk ./gio/Gtk2HsSetup.hs 105 - + where + isLib lib dll = + case stripPrefix ("lib"++lib) dll of + Just ('.':_) -> True + Just ('-':n:_) | isNumber n -> True + _ -> False + [_$_] hunk ./glib/Gtk2HsSetup.hs 59 -import Data.List (isPrefixOf, isSuffixOf, nub) -import Data.Char (isAlpha) +import Data.List (isPrefixOf, isSuffixOf, stripPrefix, nub) +import Data.Char (isAlpha, isNumber) hunk ./glib/Gtk2HsSetup.hs 102 - case filter (("lib" ++ lib) `isPrefixOf`) dlls of + case filter (isLib lib) dlls of hunk ./glib/Gtk2HsSetup.hs 105 - + where + isLib lib dll = + case stripPrefix ("lib"++lib) dll of + Just ('.':_) -> True + Just ('-':n:_) | isNumber n -> True + _ -> False + [_$_] hunk ./gtk/Gtk2HsSetup.hs 59 -import Data.List (isPrefixOf, isSuffixOf, nub) -import Data.Char (isAlpha) +import Data.List (isPrefixOf, isSuffixOf, stripPrefix, nub) +import Data.Char (isAlpha, isNumber) hunk ./gtk/Gtk2HsSetup.hs 102 - case filter (("lib" ++ lib) `isPrefixOf`) dlls of + case filter (isLib lib) dlls of hunk ./gtk/Gtk2HsSetup.hs 105 - + where + isLib lib dll = + case stripPrefix ("lib"++lib) dll of + Just ('.':_) -> True + Just ('-':n:_) | isNumber n -> True + _ -> False + [_$_] hunk ./pango/Gtk2HsSetup.hs 59 -import Data.List (isPrefixOf, isSuffixOf, nub) -import Data.Char (isAlpha) +import Data.List (isPrefixOf, isSuffixOf, stripPrefix, nub) +import Data.Char (isAlpha, isNumber) hunk ./pango/Gtk2HsSetup.hs 102 - case filter (("lib" ++ lib) `isPrefixOf`) dlls of + case filter (isLib lib) dlls of hunk ./pango/Gtk2HsSetup.hs 105 - + where + isLib lib dll = + case stripPrefix ("lib"++lib) dll of + Just ('.':_) -> True + Just ('-':n:_) | isNumber n -> True + _ -> False + [_$_] |
From: Daniel W. <dm...@lu...> - 2013-02-15 01:57:51
|
diffing dir... Sat Nov 17 16:33:14 GMT 2012 Hamish Mackenzie <ham...@go...> * Don't default to gtk3 in sources.txt Ignore-this: 3441adb25d7ec8651aa8889284f77b5b hunk ./sources.txt 5 -./gtk -fgtk3 +./gtk |
From: Daniel W. <dm...@lu...> - 2013-02-15 01:57:44
|
diffing dir... Sun Jul 15 16:12:46 BST 2012 ult...@gm... * Add a flag gtk3 to build using gtk3 rather than gtk2 Ignore-this: 37643d6c4902894d86c9684ba9c47ce9 The build works on a linux machine with gtk3.2. The only change to gtk2 builds is that Gtk2HsStore.h now imports all of gtk (<gtk/gtk.h) rather than specific bits. There are a couple of problems with this patch: * GdkRegion has been repaced by cairo_region_t, this patch simply removes all functions that involve Region * Functions in Structs.hsc that peek in structs have been removed (structs mostly been made opaque in gtk3) along with functions that depend on them. They should be replace by accessor versions. hunk ./gtk/Graphics/UI/Gtk.chs 291 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk.chs 293 +#else +import Graphics.UI.Gtk.Gdk.Region +#endif hunk ./gtk/Graphics/UI/Gtk.chs 491 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk.chs 497 +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Box.chs 55 --- The functions 'boxPackStartDefaults' or 'boxPackEndDefaults' [_$_] --- are a convenient way to pack widgets into a 'Box' without specifying --- these extra paramters. hunk ./gtk/Graphics/UI/Gtk/Abstract/Box.chs 66 --- the box, and they will be packed as if with 'boxPackStartDefaults'. Use --- 'Graphics.UI.Gtk.Abstract.Container.containerRemove' to remove widgets --- from the 'Box'. +-- the box, and they will be packed as if with 'boxPackStart' with 'PackRepel' +-- and 0 padding. Use 'Graphics.UI.Gtk.Abstract.Container.containerRemove' to +-- remove widgets from the 'Box'. hunk ./gtk/Graphics/UI/Gtk/Abstract/Box.chs 108 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Box.chs 111 +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Box.chs 198 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Box.chs 202 +-- Removed in Gtk3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Box.chs 214 +-- Removed in Gtk3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Box.chs 222 +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Object.chs 40 +-- Object has been removed in Gt3k, but this module still provides useful +-- functions. hunk ./gtk/Graphics/UI/Gtk/Abstract/Object.chs 56 - +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Object.chs 62 +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Object.chs 76 - hunk ./gtk/Graphics/UI/Gtk/Abstract/Object.chs 109 - hunk ./gtk/Graphics/UI/Gtk/Abstract/Object.chs 114 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Object.chs 116 +#else +makeNewObject :: GObjectClass obj => [_$_] +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Object.chs 140 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Object.chs 142 +#else +objectWeakref :: GObjectClass o => o -> IO () -> IO GWeakNotify +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Object.chs 157 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Object.chs 159 +#else +objectWeakunref :: GObjectClass o => o -> GWeakNotify -> IO () +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Object.chs 173 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Object.chs 175 +#else +objectDestroy :: WidgetClass self => Signal self (IO ()) +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Object.chs 189 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Object.chs 191 +#else +notifyProperty :: GObjectClass self => ReadWriteAttr self a b -> Signal self (IO ()) +#endif duplicate |hunk ./gtk/Graphics/UI/Gtk/Abstract/Object.chs 195 |- |: hunk ./gtk/Graphics/UI/Gtk/Abstract/Object.chs 195 + hunk ./gtk/Graphics/UI/Gtk/Abstract/Range.chs 54 - UpdateType(..), +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Range.chs 57 +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Range.chs 82 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Range.chs 84 +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Range.chs 127 -import Graphics.UI.Gtk.General.Enums (UpdateType(..), ScrollType(..)) +import Graphics.UI.Gtk.General.Enums (ScrollType(..)) hunk ./gtk/Graphics/UI/Gtk/Abstract/Range.chs 161 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Range.chs 164 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Abstract/Range.chs 172 + hunk ./gtk/Graphics/UI/Gtk/Abstract/Range.chs 181 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Abstract/Range.chs 189 +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Range.chs 409 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Range.chs 413 --- +-- [_$_] +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Abstract/Range.chs 419 +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 69 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 72 +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 87 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 89 +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 91 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 93 +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 120 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 122 +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 127 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 130 +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 133 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 136 +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 142 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 146 - widgetGetDefaultStyle, hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 147 +#endif + widgetGetDefaultStyle, hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 153 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 158 +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 164 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 168 +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 188 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 190 +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 195 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 198 +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 221 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 223 +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 235 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 238 +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 259 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 261 +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 264 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 266 +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 423 -{#import Graphics.UI.Gtk.Gdk.Region#} (Region(..), makeNewRegion) -{#import Graphics.UI.Gtk.Gdk.Pixmap#} (Bitmap) +{#import Graphics.UI.Gtk.Gdk.Region#} ( +#if GTK_MAJOR_VERSION < 3 + Region(..), makeNewRegion +#endif + ) +{#import Graphics.UI.Gtk.Gdk.Pixmap#} ( +#if GTK_MAJOR_VERSION < 3 + Bitmap +#endif + ) hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 439 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 441 - ,widgetGetDrawWindow, widgetGetSize) + ,widgetGetDrawWindow, widgetGetSize +#endif + ) hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 523 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 531 +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 541 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 544 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 549 +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 942 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 965 +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1000 - +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1023 +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1112 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1143 +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1155 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1164 +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1213 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1232 +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1234 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1258 +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1301 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1333 +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1719 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1727 +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1816 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1823 +-- Removed in Gtk3. [_$_] hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1836 +#endif + hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1839 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1859 +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1875 +-- Returns a GObject in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1877 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1879 +#else + -> IO GObject -- ^ returns the 'GObject' associated with @widget@ +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1883 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1885 +#else + makeNewGObject mkGObject $ +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 2215 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 2222 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 2231 +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 2462 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 2468 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 2473 +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 2492 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 2496 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 2501 +#endif hunk ./gtk/Graphics/UI/Gtk/ActionMenuToolbar/Action.chs 103 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/ActionMenuToolbar/Action.chs 106 +#endif hunk ./gtk/Graphics/UI/Gtk/ActionMenuToolbar/Action.chs 304 - + [_$_] +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/ActionMenuToolbar/Action.chs 314 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/ActionMenuToolbar/Action.chs 325 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/ActionMenuToolbar/Action.chs 333 +#endif hunk ./gtk/Graphics/UI/Gtk/Buttons/LinkButton.chs 75 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Buttons/LinkButton.chs 77 +#endif hunk ./gtk/Graphics/UI/Gtk/Buttons/LinkButton.chs 133 - +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Buttons/LinkButton.chs 140 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Buttons/LinkButton.chs 154 +#endif hunk ./gtk/Graphics/UI/Gtk/Cairo.chs 53 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Cairo.chs 55 + region, +#endif hunk ./gtk/Graphics/UI/Gtk/Cairo.chs 59 - region, hunk ./gtk/Graphics/UI/Gtk/Cairo.chs 75 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Cairo.chs 77 +#else +{#import Graphics.UI.Gtk.Gdk.Region#} () +#endif hunk ./gtk/Graphics/UI/Gtk/Cairo.chs 96 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Cairo.chs 99 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Cairo.chs 111 +#endif hunk ./gtk/Graphics/UI/Gtk/Cairo.chs 130 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Cairo.chs 133 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Cairo.chs 141 +#endif + hunk ./gtk/Graphics/UI/Gtk/Display/Image.chs 126 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Display/Image.chs 128 + imageMask, +#endif hunk ./gtk/Graphics/UI/Gtk/Display/Image.chs 132 - imageMask, hunk ./gtk/Graphics/UI/Gtk/Display/Image.chs 383 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Display/Image.chs 390 --- | A 'Image' to display. --- -imageImage :: ImageClass image => ReadWriteAttr Image Image image -imageImage = newAttrFromObjectProperty "image" - {# call pure unsafe gtk_image_get_type #} - hunk ./gtk/Graphics/UI/Gtk/Display/Image.chs 395 +#endif + +-- | A 'Image' to display. +-- +imageImage :: ImageClass image => ReadWriteAttr Image Image image +imageImage = newAttrFromObjectProperty "image" + {# call pure unsafe gtk_image_get_type #} hunk ./gtk/Graphics/UI/Gtk/Display/ProgressBar.chs 80 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Display/ProgressBar.chs 84 +#endif hunk ./gtk/Graphics/UI/Gtk/Display/ProgressBar.chs 91 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Display/ProgressBar.chs 93 +#endif hunk ./gtk/Graphics/UI/Gtk/Display/ProgressBar.chs 111 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Display/ProgressBar.chs 113 +#endif hunk ./gtk/Graphics/UI/Gtk/Display/ProgressBar.chs 204 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Display/ProgressBar.chs 221 +#endif hunk ./gtk/Graphics/UI/Gtk/Display/ProgressBar.chs 249 - +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Display/ProgressBar.chs 254 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Display/ProgressBar.chs 259 +#endif hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs 89 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs 91 +#endif hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs 94 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs 97 +#endif hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs 112 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs 114 +#endif hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs 347 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs 351 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs 360 +#endif hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs 385 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs 391 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs 403 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs 410 +#endif hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs 539 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs 545 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs 548 +#endif hunk ./gtk/Graphics/UI/Gtk/Display/Statusbar.chs 86 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Display/Statusbar.chs 89 +#endif hunk ./gtk/Graphics/UI/Gtk/Display/Statusbar.chs 98 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Display/Statusbar.chs 100 +#endif hunk ./gtk/Graphics/UI/Gtk/Display/Statusbar.chs 200 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Display/Statusbar.chs 216 +#endif hunk ./gtk/Graphics/UI/Gtk/Display/Statusbar.chs 246 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Display/Statusbar.chs 251 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Display/Statusbar.chs 256 +#endif hunk ./gtk/Graphics/UI/Gtk/Embedding/Plug.chs 193 - {# call pure unsafe gdk_window_object_get_type #} + {# call pure unsafe gdk_window_get_type #} hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 62 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 67 +#endif hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 90 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 95 +#endif hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 252 - +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 259 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 272 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 280 +#endif conflictor [ hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 485 -#if GTK_CHECK_VERSION(2,18,0) --- | Get the 'EntryBuffer' object which holds the text for this widget. -entryGetBuffer :: EntryClass self => self - -> IO EntryBuffer -entryGetBuffer self = - makeNewGObject mkEntryBuffer $ - {# call gtk_entry_get_buffer #} - (toEntry self) - --- | Set the 'EntryBuffer' object which holds the text for this widget. -entrySetBuffer :: (EntryClass self, EntryBufferClass buffer) => self - -> buffer -> IO () -entrySetBuffer self = - {# call gtk_entry_set_buffer #} - (toEntry self) . toEntryBuffer -#endif - ] |: hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 502 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 508 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 523 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 531 +#endif hunk ./gtk/Graphics/UI/Gtk/Gdk/Cursor.chs 40 --- * Methods [_$_] +-- * Methods +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Gdk/Cursor.chs 43 +#endif hunk ./gtk/Graphics/UI/Gtk/Gdk/Cursor.chs 64 -{#pointer *Cursor foreign newtype #} +{#pointer *GdkCursor as Cursor foreign newtype #} hunk ./gtk/Graphics/UI/Gtk/Gdk/Cursor.chs 95 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Gdk/Cursor.chs 100 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Gdk/Cursor.chs 117 +#endif hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 57 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 61 +#endif hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 65 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 67 +#endif hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 70 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 73 +#endif hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 80 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 83 +#endif hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 90 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 92 +#endif hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 106 -import Graphics.UI.Gtk.Gdk.EventM (Modifier, eventRegion) +import Graphics.UI.Gtk.Gdk.EventM (Modifier, +#if GTK_MAJOR_VERSION < 3 + eventRegion, +#endif + ) hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 147 - +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 150 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 158 +-- Removed in Gtk3. [_$_] hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 176 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 190 +#endif hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 241 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 279 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 287 +#endif hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 317 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 338 +#endif hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 340 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 348 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 354 +#endif hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 413 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 451 - +#endif hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 453 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 489 +#endif hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 598 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 602 +-- +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 607 +#endif hunk ./gtk/Graphics/UI/Gtk/Gdk/Drawable.chs 37 +-- This module is empty when built with Gtk3 because GTKDrawable has been +-- removed. hunk ./gtk/Graphics/UI/Gtk/Gdk/Drawable.chs 40 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Gdk/Drawable.chs 69 +#endif hunk ./gtk/Graphics/UI/Gtk/Gdk/Drawable.chs 72 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Gdk/Drawable.chs 386 - +#endif /* GTK_MAJOR_VERSION < 3 */ hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 29 - CapStyle(..), hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 30 - Dither(..), hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 35 - Fill(..), - Function(..), - InputCondition(..), - JoinStyle(..), - LineStyle(..), hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 37 - SubwindowMode(..), hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 46 +#if GTK_MAJOR_VERSION < 3 + CapStyle(..), + Dither(..), + Fill(..), + Function(..), + InputCondition(..), + JoinStyle(..), + LineStyle(..), + SubwindowMode(..), +#endif hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 62 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 65 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 67 +#endif hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 99 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 102 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 104 +#endif hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 175 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 178 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 183 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 189 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 196 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 201 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 203 - +#endif hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 232 + +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 236 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 238 +#endif hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 142 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 144 +#endif hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 184 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 186 +#endif hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 544 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 546 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 555 +#endif hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 74 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 76 +#endif hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 206 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 208 +#endif hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 434 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 438 +#endif hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 443 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 445 +#endif hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 448 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 451 +#endif hunk ./gtk/Graphics/UI/Gtk/Gdk/GC.chs 41 +-- +-- Graphics Contexts are removed in Gtk3, so this module is empty. hunk ./gtk/Graphics/UI/Gtk/Gdk/GC.chs 44 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Gdk/GC.chs 80 - gcSetDashes) where + gcSetDashes +#endif + ) where hunk ./gtk/Graphics/UI/Gtk/Gdk/GC.chs 84 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Gdk/GC.chs 177 +#endif hunk ./gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs 114 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs 119 +#endif hunk ./gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs 133 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs 135 +#endif hunk ./gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs 716 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs 729 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs 739 - hunk ./gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs 742 +-- +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs 785 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs 802 - - +#endif hunk ./gtk/Graphics/UI/Gtk/Gdk/Pixmap.chs 32 +-- This module is empty when built with Gtk3 because Pixmap has been +-- removed. hunk ./gtk/Graphics/UI/Gtk/Gdk/Pixmap.chs 47 - +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Gdk/Pixmap.chs 54 +#endif hunk ./gtk/Graphics/UI/Gtk/Gdk/Pixmap.chs 57 +#if GTK_MAJOR_VERSION < 3 + hunk ./gtk/Graphics/UI/Gtk/Gdk/Pixmap.chs 111 + +#endif /* GTK_MAJOR_VERSION < 3 */ hunk ./gtk/Graphics/UI/Gtk/Gdk/Region.chs 36 +-- This module is empty when built with Gtk3 because Pixmap has been +-- removed. hunk ./gtk/Graphics/UI/Gtk/Gdk/Region.chs 39 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Gdk/Region.chs 60 - regionXor) where + regionXor +#endif + ) where + +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Gdk/Region.chs 227 - +#endif hunk ./gtk/Graphics/UI/Gtk/Gdk/Screen.chs 60 +#if GTK_MAJOR_VERSION <3 hunk ./gtk/Graphics/UI/Gtk/Gdk/Screen.chs 69 +#endif hunk ./gtk/Graphics/UI/Gtk/Gdk/Screen.chs 105 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Gdk/Screen.chs 107 +#endif hunk ./gtk/Graphics/UI/Gtk/Gdk/Screen.chs 151 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Gdk/Screen.chs 171 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Gdk/Screen.chs 190 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Gdk/Screen.chs 200 +#endif hunk ./gtk/Graphics/UI/Gtk/Gdk/Screen.chs 534 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Gdk/Screen.chs 539 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Gdk/Screen.chs 544 +#endif hunk ./gtk/Graphics/UI/Gtk/General/Drag.chs 73 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Drag.chs 77 +#endif hunk ./gtk/Graphics/UI/Gtk/General/Drag.chs 155 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Drag.chs 158 - dragContextGetAction, dragContextSetAction ) + dragContextGetAction, dragContextSetAction +#endif + ) hunk ./gtk/Graphics/UI/Gtk/General/Drag.chs 170 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Drag.chs 174 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/General/Drag.chs 188 +#endif hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 44 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 48 +#endif hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 50 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 54 +#endif hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 63 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 65 +#endif hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 74 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 79 +#endif hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 89 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 92 +#endif hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 99 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 101 +#endif hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 227 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 231 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 234 +#endif hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 240 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 243 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 245 +#endif hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 315 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 319 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 321 +#endif hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 370 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 374 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 379 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 382 +#endif hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 432 - +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 436 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 441 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 443 +#endif hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 463 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 466 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 468 - +#endif hunk ./gtk/Graphics/UI/Gtk/General/General.chs 52 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/General.chs 56 +#endif hunk ./gtk/Graphics/UI/Gtk/General/General.chs 297 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/General.chs 299 +-- +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/General/General.chs 311 +-- +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/General/General.chs 331 +-- +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/General/General.chs 337 +#endif duplicate |hunk ./gtk/Graphics/UI/Gtk/General/General.chs 428 |- |: hunk ./gtk/Graphics/UI/Gtk/General/General.chs 428 + hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs 73 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs 75 +#endif hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs 87 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs 89 +#endif hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs 116 - selectionDataGetType) +#if GTK_MAJOR_VERSION < 3 + selectionDataGetType +#endif + ) hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs 268 +-- The GtkSelectionData struct was made opaque in Gtk3, but the accessor routines +-- where introduced in 2.14. +#if GTK_CHECK_VERSION(2,14,0) +selectionDataGet_format selPtr = {#call gtk_selection_data_get_format#} selPtr +selectionDataGet_length selPtr = {#call gtk_selection_data_get_length#} selPtr +selectionDataGet_data selPtr = {#call gtk_selection_data_get_data#} selPtr +selectionDataGet_target selPtr = {#call gtk_selection_data_get_target#} selPtr +#else +selectionDataGet_format selPtr = {#get SelectionData -> format#} selPtr +selectionDataGet_length selPtr = {#get SelectionData -> length#} selPtr +selectionDataGet_data selPtr = {#get SelectionData -> data#} selPtr +selectionDataGet_target selPtr = {#get SelectionData -> target#} selPtr +#endif + +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs 287 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs 295 - bitSize <- liftM fromIntegral $ {#get SelectionData -> format#} selPtr - lenBytes <- liftM fromIntegral $ {#get SelectionData -> length#} selPtr - dataPtr <- liftM castPtr $ {#get SelectionData -> data#} selPtr + bitSize <- liftM fromIntegral $ selectionDataGet_format selPtr + lenBytes <- liftM fromIntegral $ selectionDataGet_length selPtr + dataPtr <- liftM castPtr $ selectionDataGet_data selPtr hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs 302 +#endif hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs 307 - liftIO $ liftM fromIntegral $ {#get SelectionData -> length#} selPtr [_$_] + liftIO $ liftM fromIntegral $ selectionDataGet_length selPtr [_$_] hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs 403 - liftM Atom $ liftIO $ {#get SelectionData -> target#} selPtr + liftM Atom $ liftIO $ selectionDataGet_target selPtr hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs 405 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs 407 +-- +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs 413 +#endif hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 6 -#include <gdk/gdk.h> [_$_] +#include <gdk/gdk.h> hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 8 - +#if !defined(WIN32) && !HAVE_QUARTZ_GTK +#include <gtk/gtkx.h> +#endif hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 40 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 46 +#endif hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 52 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 56 +#endif hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 67 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 73 +#endif hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 75 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 83 +#endif hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 92 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 103 +#endif hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 114 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 116 +#endif hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 130 -import Graphics.UI.Gtk.Gdk.Enums (Function, Fill, SubwindowMode, - LineStyle, CapStyle, JoinStyle) hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 198 - +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 205 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 386 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 407 +#endif hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 410 - +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 416 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 427 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 432 - +#endif hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 483 - +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 502 +#endif hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 603 -#else +#elif GTK_MAJOR_VERSION < 3 || (!defined(WIN32) && !HAVE_QUARTZ_GTK) +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 606 +#else +newtype NativeWindowId = NativeWindowId #{type Window} deriving (Eq, Show) +#endif hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 620 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 627 -#endif [_$_] +#endif +#else +#if defined(WIN32) +foreign import ccall unsafe "gdk_win32_drawable_get_handle" + gdk_win32_drawable_get_handle :: (Ptr Drawable) -> IO (Ptr a) +#elif !defined(HAVE_QUARTZ_GTK) +foreign import ccall unsafe "gdk_x11_window_get_xid" [_$_] + gdk_x11_drawable_get_xid :: (Ptr DrawWindow) -> IO CInt +#endif +#endif hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 638 --- | Get 'NativeWindowId' of 'Drawable'. [_$_] +-- | Get 'NativeWindowId' of 'Drawable'. +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 641 +#else +drawableGetID :: DrawWindowClass d => d -> IO NativeWindowId +#endif hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 646 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 648 +#else + (\(DrawWindow drawable) -> +#endif hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 664 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 666 +#else + ) (toDrawWindow d) +#endif + hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 671 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 677 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 684 +#endif hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 739 - +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 743 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 748 +#endif hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 751 - +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 764 +#endif hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 766 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 778 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 791 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 804 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 814 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 822 - +#endif hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 927 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 929 +-- +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 938 +-- +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 947 +-- +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 956 +-- +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 987 +#endif hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 1040 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 1046 +#endif hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 1113 + hunk ./gtk/Graphics/UI/Gtk/General/Style.chs 64 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Style.chs 67 +#endif hunk ./gtk/Graphics/UI/Gtk/General/Style.chs 89 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Style.chs 140 +#endif hunk ./gtk/Graphics/UI/Gtk/Layout/Fixed.chs 87 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Layout/Fixed.chs 93 - +#endif hunk ./gtk/Graphics/UI/Gtk/Layout/Fixed.chs 151 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Layout/Fixed.chs 160 +-- Removed in Gtk3. Use the Widget version. hunk ./gtk/Graphics/UI/Gtk/Layout/Fixed.chs 170 +-- Removed in Gtk3. Use the Widget version. hunk ./gtk/Graphics/UI/Gtk/Layout/Fixed.chs 182 +-- Removed in Gtk3. Use the Widget version. hunk ./gtk/Graphics/UI/Gtk/Layout/Fixed.chs 187 - +#endif hunk ./gtk/Graphics/UI/Gtk/Layout/Layout.chs 66 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Layout/Layout.chs 68 +#endif hunk ./gtk/Graphics/UI/Gtk/Layout/Layout.chs 94 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Layout/Layout.chs 96 +#endif hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs 70 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs 72 +#endif hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs 101 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs 107 +#endif hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs 121 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs 127 +#endif hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs 208 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs 210 +#endif hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs 683 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs 692 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs 706 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs 720 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs 729 +#endif hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs 857 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs 861 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs 884 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs 905 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs 914 +#endif hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Combo.chs 34 --- newly-written code. +-- newly-written code. [_$_] hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Combo.chs 36 +-- This module is empty in Gtk3 as Combo has been removed. hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Combo.chs 67 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Combo.chs 93 +#endif hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Combo.chs 96 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Combo.chs 239 +#endif hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBoxEntry.chs 52 +-- * This module is deprecated and the functionality removed in Gtk3. It is +-- therefore empty in Gtk3. hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBoxEntry.chs 67 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBoxEntry.chs 92 +#endif hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBoxEntry.chs 95 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBoxEntry.chs 234 +#endif conflictor [ hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 104 + menuItemActivatedItem, + menuItemActivated, ] |: hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 104 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 123 +#endif hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 230 - {# call menu_item_remove_submenu #} + {# call menu_item_set_submenu #} hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 232 + (Widget $ unsafePerformIO $ newForeignPtr_ nullPtr) hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 353 +#if GTK_MAJOR_VERSION < 3 conflictor [ hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 359 +menuItemActivatedItem :: MenuItemClass self => Signal self (IO ()) +menuItemActivatedItem = Signal (connect_NONE__NONE "activate-item") + +-- | Deprecated. See 'menuItemActivatedItem'. ] |: hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 359 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 364 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 370 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 376 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 414 +#endif hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuToolButton.chs 68 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuToolButton.chs 70 +#endif hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuToolButton.chs 155 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuToolButton.chs 173 +#endif hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/OptionMenu.chs 29 --- newly-written code. +-- newly-written code. It is empty in Gtk3. hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/OptionMenu.chs 61 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/OptionMenu.chs 86 +#endif hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/OptionMenu.chs 100 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/OptionMenu.chs 186 +#endif hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/ToolItem.chs 68 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/ToolItem.chs 70 +#endif hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/ToolItem.chs 178 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/ToolItem.chs 183 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/ToolItem.chs 197 +#endif hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 94 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 111 +#endif hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 115 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 118 +#endif hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 138 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 140 +#endif hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 145 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 148 +#endif hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 179 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 184 +#endif hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 211 - +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 230 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 256 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 270 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 284 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 311 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 325 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 347 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 376 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 391 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 408 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 430 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 444 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 454 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 464 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 470 - +#endif hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 497 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 500 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 512 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 518 +#endif hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 678 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 683 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 688 +#endif hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 709 + +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 715 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 720 +#endif hunk ./gtk/Graphics/UI/Gtk/Misc/Calendar.chs 73 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Misc/Calendar.chs 77 +#endif hunk ./gtk/Graphics/UI/Gtk/Misc/Calendar.chs 83 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Misc/Calendar.chs 87 +#endif hunk ./gtk/Graphics/UI/Gtk/Misc/Calendar.chs 224 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Misc/Calendar.chs 232 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Misc/Calendar.chs 240 +#endif hunk ./gtk/Graphics/UI/Gtk/Misc/Calendar.chs 260 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Misc/Calendar.chs 268 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Misc/Calendar.chs 280 +#endif hunk ./gtk/Graphics/UI/Gtk/Misc/DrawingArea.chs 83 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Misc/DrawingArea.chs 86 +#endif hunk ./gtk/Graphics/UI/Gtk/Misc/DrawingArea.chs 94 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Misc/DrawingArea.chs 96 +#endif hunk ./gtk/Graphics/UI/Gtk/Misc/DrawingArea.chs 113 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Misc/DrawingArea.chs 116 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Misc/DrawingArea.chs 123 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Misc/DrawingArea.chs 127 +#endif hunk ./gtk/Graphics/UI/Gtk/Misc/Tooltips.chs 56 +-- +-- * This module is deprecated. It is empty in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Misc/Tooltips.chs 66 - +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Misc/Tooltips.chs 84 +#endif hunk ./gtk/Graphics/UI/Gtk/Misc/Tooltips.chs 87 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Misc/Tooltips.chs 174 - +#endif hunk ./gtk/Graphics/UI/Gtk/ModelView/CellLayout.chs 90 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/ModelView/CellLayout.chs 92 +#endif hunk ./gtk/Graphics/UI/Gtk/ModelView/CellRenderer.chs 90 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/ModelView/CellRenderer.chs 92 +#endif hunk ./gtk/Graphics/UI/Gtk/ModelView/CellRenderer.chs 120 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/ModelView/CellRenderer.chs 122 +#endif hunk ./gtk/Graphics/UI/Gtk/ModelView/CellRenderer.chs 273 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/ModelView/CellRenderer.chs 276 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/ModelView/CellRenderer.chs 280 +#endif hunk ./gtk/Graphics/UI/Gtk/ModelView/CellView.chs 63 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/ModelView/CellView.chs 65 +#endif hunk ./gtk/Graphics/UI/Gtk/ModelView/CellView.chs 177 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/ModelView/CellView.chs 180 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/ModelView/CellView.chs 187 +#endif hunk ./gtk/Graphics/UI/Gtk/ModelView/Gtk2HsStore.c 58 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/ModelView/Gtk2HsStore.c 68 +#endif hunk ./gtk/Graphics/UI/Gtk/ModelView/Gtk2HsStore.c 125 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/ModelView/Gtk2HsStore.c 133 - +#endif hunk ./gtk/Graphics/UI/Gtk/ModelView/Gtk2HsStore.c 221 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/ModelView/Gtk2HsStore.c 241 - +#endif hunk ./gtk/Graphics/UI/Gtk/ModelView/Gtk2HsStore.c 641 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/ModelView/Gtk2HsStore.c 662 - +#endif hunk ./gtk/Graphics/UI/Gtk/ModelView/Gtk2HsStore.h 4 -#include <gtk/gtktreemodel.h> -#include <gtk/gtktreednd.h> -#include <gtk/gtktreesortable.h> +#include <gtk/gtk.h> + hunk ./gtk/Graphics/UI/Gtk/ModelView/IconView.chs 75 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/ModelView/IconView.chs 78 +#endif hunk ./gtk/Graphics/UI/Gtk/ModelView/IconView.chs 353 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/ModelView/IconView.chs 374 +#endif hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeView.chs 149 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeView.chs 151 +#endif hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeView.chs 240 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeView.chs 243 - +#endif hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeView.chs 968 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeView.chs 977 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeView.chs 1001 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeView.chs 1018 +#endif hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeView.chs 1125 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeView.chs 1129 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeView.chs 1139 +#endif hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeViewColumn.chs 58 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeViewColumn.chs 60 +#endif hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeViewColumn.chs 198 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeViewColumn.chs 201 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeViewColumn.chs 208 +#endif hunk ./gtk/Graphics/UI/Gtk/Multiline/TextTag.chs 82 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Multiline/TextTag.chs 85 +#endif hunk ./gtk/Graphics/UI/Gtk/Multiline/TextTag.chs 89 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Multiline/TextTag.chs 92 +#endif hunk ./gtk/Graphics/UI/Gtk/Multiline/TextTag.chs 308 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Multiline/TextTag.chs 311 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Multiline/TextTag.chs 320 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Multiline/TextTag.chs 323 +#endif hunk ./gtk/Graphics/UI/Gtk/Multiline/TextTag.chs 346 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Multiline/TextTag.chs 349 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Multiline/TextTag.chs 358 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Multiline/TextTag.chs 361 +#endif hunk ./gtk/Graphics/UI/Gtk/Selectors/ColorSelectionDialog.chs 58 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Selectors/ColorSelectionDialog.chs 63 +#endif hunk ./gtk/Graphics/UI/Gtk/Selectors/ColorSelectionDialog.chs 72 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Selectors/ColorSelectionDialog.chs 77 +#endif hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooserButton.chs 63 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooserButton.chs 65 +#endif hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooserButton.chs 117 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooserButton.chs 120 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooserButton.chs 136 +#endif hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooserWidget.chs 63 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooserWidget.chs 66 +#endif hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooserWidget.chs 101 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooserWidget.chs 107 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooserWidget.chs 121 +#endif hunk ./gtk/Graphics/UI/Gtk/Selectors/FileFilter.chs 87 +-- Back in <X.h> DestroyNotify is defined as 17 +#undef DestroyNotify hunk ./gtk/Graphics/UI/Gtk/Selectors/FileSelection.chs 30 +-- This module is empty in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Selectors/FileSelection.chs 68 - +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Selectors/FileSelection.chs 93 +#endif hunk ./gtk/Graphics/UI/Gtk/Selectors/FileSelection.chs 95 - +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Selectors/FileSelection.chs 267 +#endif hunk ./gtk/Graphics/UI/Gtk/Special/HRuler.chs 28 +-- * Rulers are removed in Gtk3 and thus this module is blank. There is no +-- replacement hunk ./gtk/Graphics/UI/Gtk/Special/HRuler.chs 50 - +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Special/HRuler.chs 59 +#endif hunk ./gtk/Graphics/UI/Gtk/Special/HRuler.chs 61 - +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Special/HRuler.chs 80 +#endif hunk ./gtk/Graphics/UI/Gtk/Special/Ruler.chs 38 +-- +-- * Rulers are removed in Gtk3 and thus this module is blank. There is no +-- replacement hunk ./gtk/Graphics/UI/Gtk/Special/Ruler.chs 53 - +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Special/Ruler.chs 71 -#endif [_$_] +#endif +#endif hunk ./gtk/Graphics/UI/Gtk/Special/Ruler.chs 74 - +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Special/Ruler.chs 179 +#endif + hunk ./gtk/Graphics/UI/Gtk/Special/VRuler.chs 37 +-- +-- * Rulers are removed in Gtk3 and thus this module is blank. There is no +-- replacement hunk ./gtk/Graphics/UI/Gtk/Special/VRuler.chs 51 - +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Special/VRuler.chs 60 +#endif hunk ./gtk/Graphics/UI/Gtk/Special/VRuler.chs 62 - +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Special/VRuler.chs 81 +#endif hunk ./gtk/Graphics/UI/Gtk/Windows/AboutDialog.chs 83 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Windows/AboutDialog.chs 86 +#endif hunk ./gtk/Graphics/UI/Gtk/Windows/AboutDialog.chs 436 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Windows/AboutDialog.chs 440 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Windows/AboutDialog.chs 459 +-- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/Windows/AboutDialog.chs 479 +#endif hunk ./gtk/Graphics/UI/Gtk/Windows/Dialog.chs 110 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Windows/Dialog.chs 113 +#endif hunk ./gtk/Graphics/UI/Gtk/Windows/Dialog.chs 118 - dialogGetHasSeparator, hunk ./gtk/Graphics/UI/Gtk/Windows/Dialog.chs 119 +#if GTK_MAJOR_VERSION < 3 + dialogGetHasSeparator, hunk ./gtk/Graphics/UI/Gtk/Windows/Dialog.chs 122 +#endif hunk ./gtk/Graphics/UI/Gtk/Windows/Dialog.chs 132 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Windows/Dialog.chs 134 +#endif hunk ./gtk/Graphics/UI/Gtk/Windows/Dialog.chs 159 -import Graphics.UI.Gtk.General.Structs (dialogGetUpper, dialogGetActionArea, +import Graphics.UI.Gtk.General.Structs ( +#if GTK_MAJOR... [truncated message content] |
From: Daniel W. <dm...@lu...> - 2013-02-15 01:57:34
|
diffing dir... Sun Oct 7 05:08:13 BST 2012 Hamish Mackenzie <ham...@go...> * More Gtk 3 fixes and OS X support for Gtk 3 Ignore-this: c57ad051ed4ef676dae81f344622bb78 hunk ./gtk/Graphics/UI/Gtk.chs 50 + module Graphics.UI.Gtk.General.Settings, hunk ./gtk/Graphics/UI/Gtk.chs 282 +import Graphics.UI.Gtk.General.Settings hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 66 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 68 +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 89 -#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 90 -#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 123 + widgetGetWindow, hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 234 + widgetGetAllocatedWidth, + widgetGetAllocatedHeight, hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 424 -import Graphics.UI.Gtk.Gdk.Enums (EventMask(..), ExtensionMode(..)) +import Graphics.UI.Gtk.Gdk.Enums (EventMask(..) +#if GTK_MAJOR_VERSION < 3 + , ExtensionMode(..)) +#endif + ) hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 530 -#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 537 -#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1306 +#if GTK_CHECK_VERSION(2,14,0) +-- | Returns the widget's window if it is realized, Nothing otherwise +-- +-- * Available since Gtk+ version 2.14 +-- +widgetGetWindow :: WidgetClass self => self -> IO (Maybe DrawWindow) +widgetGetWindow self = + maybeNull (makeNewGObject mkDrawWindow) $ + {# call gtk_widget_get_window #} + (toWidget self) +#endif + hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 2303 +-- | Returns the width that has currently been allocated to widget. This function is intended +-- | to be used when implementing handlers for the "draw" function. +widgetGetAllocatedWidth :: WidgetClass self => self -> IO Int +widgetGetAllocatedWidth widget = + liftM fromIntegral $ {#call widget_get_allocated_width#} (toWidget widget) + +-- | Returns the height that has currently been allocated to widget. This function is intended +-- | to be used when implementing handlers for the "draw" function. +widgetGetAllocatedHeight :: WidgetClass self => self -> IO Int +widgetGetAllocatedHeight widget = + liftM fromIntegral $ {#call widget_get_allocated_height#} (toWidget widget) + hunk ./gtk/Graphics/UI/Gtk/Embedding/Embedding.hsc 30 -#if !defined(WIN32) || GTK_CHECK_VERSION(2,8,0) +#if defined(HAVE_PLUG_AND_SOCKET) && (!defined(WIN32) || GTK_CHECK_VERSION(2,8,0)) hunk ./gtk/Graphics/UI/Gtk/Embedding/Embedding.hsc 38 -#if !defined(WIN32) || GTK_CHECK_VERSION(2,8,0) +#if defined(HAVE_PLUG_AND_SOCKET) && (!defined(WIN32) || GTK_CHECK_VERSION(2,8,0)) hunk ./gtk/Graphics/UI/Gtk/Embedding/Plug.chs 51 -#if !defined(WIN32) || GTK_CHECK_VERSION(2,8,0) +#if defined(HAVE_PLUG_AND_SOCKET) && (!defined(WIN32) || GTK_CHECK_VERSION(2,8,0)) hunk ./gtk/Graphics/UI/Gtk/Embedding/Plug.chs 95 -#if !defined(WIN32) || GTK_CHECK_VERSION(2,8,0) +#if defined(HAVE_PLUG_AND_SOCKET) && (!defined(WIN32) || GTK_CHECK_VERSION(2,8,0)) hunk ./gtk/Graphics/UI/Gtk/Embedding/Socket.chs 85 -#if !defined(WIN32) || GTK_CHECK_VERSION(2,8,0) +#if defined(HAVE_PLUG_AND_SOCKET) && (!defined(WIN32) || GTK_CHECK_VERSION(2,8,0)) hunk ./gtk/Graphics/UI/Gtk/Embedding/Socket.chs 131 -#if !defined(WIN32) || GTK_CHECK_VERSION(2,8,0) +#if defined(HAVE_PLUG_AND_SOCKET) && (!defined(WIN32) || GTK_CHECK_VERSION(2,8,0)) hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 34 - ExtensionMode(..), hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 46 + ExtensionMode(..), hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 169 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 176 -#if GTK_MAJOR_VERSION < 3 addfile ./gtk/Graphics/UI/Gtk/General/Settings.chs hunk ./gtk/Graphics/UI/Gtk/General/Settings.chs 1 +{-# LANGUAGE CPP #-} +-- -*-haskell-*- +-- GIMP Toolkit (GTK) Clipboard +-- +-- Author : Axel Simon +-- +-- Created: 26 March 2007 +-- +-- Copyright (C) 2007 Axel Simon +-- +-- This library is free software; you can redistribute it and/or +-- modify it under the terms of the GNU Lesser General Public +-- License as published by the Free Software Foundation; either +-- version 2.1 of the License, or (at your option) any later version. +-- +-- This library is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-- Lesser General Public License for more details. +-- +-- I removed all definitions for the clipboard by Juergen Nicklisch since +-- the way the clipboards were selected didn't tie in with the Selection +-- module. +-- +-- | +-- Maintainer : gtk...@li... +-- Stability : provisional +-- Portability : portable (depends on GHC) +-- +-- Storing data on clipboards +-- +module Graphics.UI.Gtk.General.Settings ( + +-- * Class Hierarchy +-- +-- | +-- @ +-- | 'GObject' +-- | +----Settings +-- @ + +-- * Types + Settings, + SettingsClass, + castToSettings, gTypeSettings, + toSettings, + +-- * Methods + settingsGetDefault, +#if GTK_CHECK_VERSION(2,2,0) + settingsGetForScreen, +#endif + settingsSetLongProperty, + settingsSetStringProperty + ) where + +import System.Glib.FFI +import System.Glib.UTFString +{#import Graphics.UI.Gtk.Types#} +{#import Graphics.UI.Gtk.General.DNDTypes#} (SelectionTag, TargetTag, + atomNew, Atom(..)) +{#import Graphics.UI.Gtk.General.Selection#} (InfoId, SelectionDataM) +import Graphics.UI.Gtk.General.Structs ( + selectionPrimary, + selectionSecondary, + selectionClipboard, + withTargetEntries) +import Control.Monad ( liftM ) +import Control.Monad.Trans ( liftIO ) +import Control.Monad.Reader (runReaderT, ask) +import Data.IORef ( newIORef, readIORef, writeIORef ) + +{# context lib="gtk" prefix="gtk" #} + + +-------------------- +-- Methods + +-- | Gets the Settings object for the default GDK screen, creating +-- it if necessary. See 'settingsGetForScreen'. +-- +settingsGetDefault :: + IO (Maybe Settings) -- ^ returns a Settings. If there is no default + -- screen, then returns Nothing. +settingsGetDefault = + maybeNull (makeNewGObject mkSettings) + {# call gtk_settings_get_default #} + +#if GTK_CHECK_VERSION(2,2,0) +-- | Gets the Settings object for screen, creating it if necessary. +-- +settingsGetForScreen :: + ScreenClass screen + => screen + -> IO Settings +settingsGetForScreen screen = + makeNewGObject mkSettings $ + {# call gtk_settings_get_for_screen #} + (toScreen screen) +#endif + +settingsSetLongProperty :: + SettingsClass settings + => settings + -> String + -> Int + -> String + -> IO () +settingsSetLongProperty settings name value origin = + withUTFString name $ \namePtr -> + withUTFString origin $ \originPtr -> + {# call gtk_settings_set_long_property #} + (toSettings settings) + namePtr + (fromIntegral value) + originPtr + +settingsSetStringProperty :: + SettingsClass settings + => settings + -> String + -> String + -> String + -> IO () +settingsSetStringProperty settings name value origin = + withUTFString name $ \namePtr -> + withUTFString value $ \valuePtr -> + withUTFString origin $ \originPtr -> + {# call gtk_settings_set_string_property #} + (toSettings settings) + namePtr + valuePtr + originPtr + hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 182 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 185 +#endif hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 188 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 201 -#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 605 -#elif GTK_MAJOR_VERSION < 3 || (!defined(WIN32) && !HAVE_QUARTZ_GTK) -#if GTK_MAJOR_VERSION < 3 -newtype NativeWindowId = NativeWindowId #{gtk2hs_type GdkNativeWindow} deriving (Eq, Show) +#elif defined(HAVE_QUARTZ_GTK) +newtype NativeWindowId = NativeWindowId (Maybe DrawWindow) deriving (Eq) +unNativeWindowId :: NativeWindowId -> Maybe DrawWindow +unNativeWindowId (NativeWindowId id) = id +toNativeWindowId :: Maybe DrawWindow -> NativeWindowId +toNativeWindowId = NativeWindowId +fromNativeWindowId :: NativeWindowId -> Maybe DrawWindow +fromNativeWindowId = unNativeWindowId +nativeWindowIdNone :: NativeWindowId +nativeWindowIdNone = NativeWindowId Nothing hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 616 -newtype NativeWindowId = NativeWindowId #{type Window} deriving (Eq, Show) -#endif +newtype NativeWindowId = NativeWindowId #{gtk2hs_type GdkNativeWindow} deriving (Eq, Show) hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 670 - error "drawableGetID: not supported with a GTK using a Quartz backend" + return $ Just (DrawWindow drawable) conflictor {{ |: hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 104 + menuItemActivatedItem, + menuItemActivated, |: hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 104 +#if GTK_MAJOR_VERSION < 3 }} [] |hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 104 |+#if GTK_MAJOR_VERSION < 3 |: hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 104 -#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 110 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 354 -#if GTK_MAJOR_VERSION < 3 conflictor {{ |: hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 359 +menuItemActivatedItem :: MenuItemClass self => Signal self (IO ()) +menuItemActivatedItem = Signal (connect_NONE__NONE "activate-item") + +-- | Deprecated. See 'menuItemActivatedItem'. |: hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 359 +-- Removed in Gtk3. }} [] |hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 359 |+-- Removed in Gtk3. |: hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 359 --- Removed in Gtk3. hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 364 --- Removed in Gtk3. -menuItemSelect :: ItemClass i => Signal i (IO ()) +menuItemSelect :: MenuItemClass i => Signal i (IO ()) hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 369 --- Removed in Gtk3. -menuItemDeselect :: ItemClass i => Signal i (IO ()) +menuItemDeselect :: MenuItemClass i => Signal i (IO ()) hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 374 --- Removed in Gtk3. -menuItemToggle :: ItemClass i => Signal i (IO ()) +menuItemToggle :: MenuItemClass i => Signal i (IO ()) hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 377 +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Windows/Dialog.chs 112 - dialogGetActionArea, hunk ./gtk/Graphics/UI/Gtk/Windows/Dialog.chs 113 + dialogGetContentArea, + dialogGetActionArea, hunk ./gtk/Graphics/UI/Gtk/Windows/Dialog.chs 375 +#if GTK_MAJOR_VERSION >= 3 +-- | Returns the content area of dialog. +dialogGetContentArea :: DialogClass self => self -> IO Widget +dialogGetContentArea self = + makeNewObject mkWidget $ + {#call gtk_dialog_get_content_area #} + (toDialog self) + +-- | Returns the action area of dialog. +-- +-- * This is useful to add some special widgets that cannot be added with +-- dialogAddActionWidget. +-- +dialogGetActionArea :: DialogClass self => self -> IO Widget +dialogGetActionArea self = + makeNewObject mkWidget $ + {#call gtk_dialog_get_content_area #} + (toDialog self) +#else +dialogGetContentArea = dialogGetUpper +#endif + hunk ./gtk/Graphics/UI/Gtk/Windows/Dialog.chs 475 + hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs 153 +#if GTK_MAJOR_VERSION >= 3 hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs 155 +#endif + windowHasResizeGrip, hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs 216 +#if GTK_MAJOR_VERSION >= 3 + windowSetHasResizeGrip, + windowGetHasResizeGrip, +#endif hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs 372 +#if GTK_MAJOR_VERSION >= 3 +-- | Sets whether the window has a resize grip. @True@ by default. +-- +windowSetHasResizeGrip :: WindowClass self => self -> Bool -> IO () +windowSetHasResizeGrip self setting = + {# call window_set_has_resize_grip #} + (toWindow self) + (fromBool setting) + +-- | Returns whether the window has a resize grip. +-- +windowGetHasResizeGrip :: WindowClass self => self -> IO Bool +windowGetHasResizeGrip self = + liftM toBool $ + {# call unsafe window_get_has_resize_grip #} + (toWindow self) +#endif + hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs 2030 +-- | If @True@, window has a resize grip. +-- +-- Default value: @True@ +-- +windowHasResizeGrip :: WindowClass self => Attr self Bool +windowHasResizeGrip = newAttr + windowGetHasResizeGrip + windowSetHasResizeGrip + hunk ./gtk/gtk.cabal 222 + Graphics.UI.Gtk.General.Settings hunk ./gtk/gtk.cabal 382 - x-c2hs-Header: wingtk.h hunk ./gtk/gtk.cabal 384 - else [_$_] - if flag(gtk3) - x-c2hs-Header: gtk2hsX.h - else - x-c2hs-Header: gtk/gtk.h + [_$_] + x-c2hs-Header: hsgtk.h hunk ./gtk/gtk.cabal 392 - x-Types-Tag: default plugNsocket + if os(windows) || flag(have-quartz-gtk) + x-Types-Tag: default + else + x-Types-Tag: default plugNsocket + cpp-options: -DHAVE_PLUG_AND_SOCKET + addfile ./gtk/hierarchy3.list hunk ./gtk/hierarchy3.list 1 +# This list is the result of a copy-and-paste from the GtkObject hierarchy +# html documentation. Deprecated widgets are uncommented. Some additional +# object have been defined at the end of the copied list. + +# The Gtk prefix of every object is removed, the other prefixes are +# kept. The indentation implies the object hierarchy. In case the +# type query function cannot be derived from the name or the type name +# is different, an alternative name and type query function can be +# specified by appending 'as typename, <query_func>'. In case this +# function is not specified, the <name> is converted to +# gtk_<name'>_get_type where <name'> is <name> where each upperscore +# letter is converted to an underscore and lowerletter. The underscore +# is omitted if an upperscore letter preceeded: GtkHButtonBox -> +# gtk_hbutton_box_get_type. The generation of a type can be +# conditional by appending 'if <tag>'. Such types are only produces if +# --tag=<tag> is given on the command line of TypeGenerator. + +# Before these conditions, two additional properties may be given: +# * noDestr : ignores the destructor given by the --destructor +# command line argument and uses 'objectUnref' +# * noEq : do not make this type an instance of Eq; used +# if a different equality instance is manually +# defined later + GObject [_$_] + AtkObject + GtkAccessible[_^I_][_^I_][_$_] + GdkKeymap[_^I_][_^I_][_^I_][_^I_][_$_] + GdkDisplayManager[_^I_][_^I_][_$_] + GdkAppLaunchContext[_^I_][_^I_][_$_] + GtkPrintSettings[_^I_][_^I_][_$_] + GtkPrintOperation[_^I_][_^I_][_$_] + GtkPrintOperationPreview [_$_] + GtkPageSetup[_^I_][_^I_][_^I_][_$_] + GtkPrintContext[_^I_][_^I_][_^I_][_$_] + GtkRecentChooser[_^I_][_^I_][_$_] + GtkRecentManager[_^I_] [_$_] + GdkWindow as DrawWindow, gdk_window_get_type + GdkGLPixmap if gtkglext + GdkGLWindow if gtkglext + GdkScreen[_^I_][_^I_][_$_] + GdkDisplay[_^I_][_^I_][_$_] + GdkVisual + GdkDevice + GtkSettings + GtkTextBuffer + GtkSourceBuffer if sourceview + GtkSourceBuffer if gtksourceview2 + GtkTextTag + GtkSourceTag if sourceview + GtkTextTagTable + GtkSourceTagTable if sourceview + GtkStyle + GtkRcStyle + GdkDragContext + GdkPixbuf noDestr + GdkPixbufAnimation noDestr + GdkPixbufSimpleAnim noDestr + GdkPixbufAnimationIter noDestr + GtkTextChildAnchor + GtkTextMark + GtkSourceMarker if sourceview + GtkSourceMark if gtksourceview2 + GtkRecentFilter[_^I_][_^I_][_$_] + GtkWidget + GtkHSV as HSV, gtk_hsv_get_type [_$_] + GtkMisc + GtkLabel + GtkAccelLabel + GtkArrow + GtkImage + GtkContainer + GtkToolPalette[_^I_][_^I_][_$_] + GtkToolItemGroup[_^I_][_$_] + WebKitWebView as WebView, webkit_web_view_get_type if webkit [_$_] + GtkBin + GtkAlignment + GtkFrame + GtkAspectFrame + GtkButton + GtkScaleButton[_^I_][_^I_][_$_] + GtkVolumeButton[_^I_][_^I_][_$_] + GtkLinkButton[_^I_][_^I_][_$_] + GtkToggleButton + GtkCheckButton + GtkRadioButton + GtkColorButton[_^I_][_^I_][_$_] + GtkFontButton[_^I_][_^I_][_$_] + GtkMenuItem + GtkCheckMenuItem + GtkRadioMenuItem + GtkTearoffMenuItem + GtkImageMenuItem + GtkSeparatorMenuItem + GtkWindow + GtkAssistant[_^I_][_^I_][_$_] + GtkOffscreenWindow[_^I_][_$_] + GtkDialog + GtkAboutDialog[_^I_][_^I_][_$_] + GtkColorSelectionDialog + GtkFileChooserDialog[_^I_][_$_] + GtkFontSelectionDialog + GtkMessageDialog + GtkPlug if plugNsocket + GtkEventBox + GtkHandleBox + GtkScrolledWindow + GtkViewport + GtkExpander[_^I_][_^I_][_^I_][_$_] + GtkComboBox[_^I_][_^I_][_^I_][_$_] + GtkToolItem[_^I_][_^I_][_^I_][_$_] + GtkToolButton[_^I_][_^I_][_$_] + GtkMenuToolButton[_^I_][_$_] + GtkToggleToolButton[_^I_][_$_] + GtkRadioToolButton[_^I_][_$_] + GtkSeparatorToolItem[_^I_][_$_] + GtkMozEmbed if mozembed + VteTerminal as Terminal if vte + GtkBox + GtkButtonBox + GtkHButtonBox + GtkVButtonBox + GtkVBox + GtkRecentChooserWidget[_^I_][_^I_][_$_] + GtkColorSelection + GtkFontSelection + GtkFileChooserWidget[_^I_][_$_] + GtkHBox + GtkInfoBar [_$_] + GtkFileChooserButton[_^I_][_$_] + GtkStatusbar + GtkFixed + GtkPaned + GtkHPaned + GtkVPaned + GtkIconView[_^I_][_^I_][_$_] + GtkLayout + GtkMenuShell + GtkMenu + GtkRecentChooserMenu[_^I_][_^I_][_$_] + GtkMenuBar + GtkNotebook + GtkSocket if plugNsocket + GtkTable + GtkTextView + GtkSourceView if sourceview + GtkSourceView if gtksourceview2 + GtkToolbar + GtkTreeView + GtkCalendar + GtkCellView[_^I_][_^I_][_$_] + GtkDrawingArea + GtkSpinner[_^I_][_^I_][_$_] + GtkEntry + GtkSpinButton + GtkRange + GtkScale + GtkHScale + GtkVScale + GtkScrollbar + GtkHScrollbar + GtkVScrollbar + GtkSeparator + GtkHSeparator + GtkVSeparator + GtkInvisible + GtkProgressBar + GtkAdjustment + GtkIMContext + GtkIMMulticontext + GtkIMContextSimple +[_^I_][_^I_][_^I_][_$_] +# These object were added by hand because they do not show up in the hierarchy +# chart. +# These are derived from GtkObject: + GtkTreeViewColumn + GtkCellRenderer + GtkCellRendererSpinner[_^I_][_^I_][_$_] + GtkCellRendererPixbuf + GtkCellRendererText + GtkCellRendererAccel [_$_] + GtkCellRendererSpin [_$_] + GtkCellRendererCombo[_^I_][_$_] + GtkCellRendererToggle + GtkCellRendererProgress[_^I_][_$_] + GtkFileFilter + GtkBuilder [_$_] +# These are actually interfaces, but all objects that implement it are at +# least GObjects. + GtkCellLayout[_^I_][_^I_][_^I_][_$_] + GtkTreeSortable[_^I_][_^I_][_^I_][_$_] + GtkTooltip[_^I_][_^I_][_^I_][_^I_][_$_] +# These are derived from GObject: + GtkStatusIcon [_$_] + GtkTreeSelection + GtkTreeModel + GtkTreeStore + GtkListStore + GtkTreeModelSort + GtkTreeModelFilter + GtkIconFactory + GtkIconTheme + GtkSizeGroup + GtkClipboard[_^I_][_^I_][_^I_][_$_] + GtkAccelGroup + GtkAccelMap[_^I_][_^I_][_^I_][_$_] + GtkEntryCompletion[_^I_][_^I_][_$_] + GtkEntryBuffer[_^I_][_^I_][_$_] + GtkAction[_^I_][_^I_][_^I_][_$_] + GtkRecentAction[_^I_][_^I_][_$_] + GtkToggleAction[_^I_][_^I_][_$_] + GtkRadioAction[_^I_][_^I_][_$_] + GtkActionGroup[_^I_][_^I_][_^I_][_$_] + GtkUIManager[_^I_][_^I_][_^I_][_$_] + GtkWindowGroup + GtkSourceLanguage if sourceview + GtkSourceLanguage if gtksourceview2 + GtkSourceLanguagesManager if sourceview + GtkSourceLanguageManager if gtksourceview2 + GladeXML as GladeXML, glade_xml_get_type if libglade + GConfClient as GConf if gconf +# These ones are actualy interfaces, but interface implementations are GObjects + GtkCellEditable + GtkEditable + GtkSourceStyle as SourceStyleObject if gtksourceview2 + GtkSourceStyleScheme if sourceview + GtkSourceStyleScheme if gtksourceview2 + GtkSourceStyleSchemeManager if gtksourceview2 + GtkFileChooser[_^I_][_^I_][_^I_][_$_] +## These are Pango structures + PangoContext as PangoContext, pango_context_get_type if pango + PangoLayout as PangoLayoutRaw, pango_layout_get_type if pango + PangoFont as Font, pango_font_get_type if pango + PangoFontFamily as FontFamily, pango_font_family_get_type if pango + PangoFontFace as FontFace, pango_font_face_get_type if pango + PangoFontMap as FontMap, pango_font_face_get_type if pango + PangoFontset as FontSet, pango_fontset_get_type if pango +## This type is only available for PANGO_ENABLE_BACKEND compiled source +## PangoFontsetSimple as FontSetSimple, pango_fontset_simple_get_type + +## GtkGlExt classes + GdkGLContext if gtkglext + GdkGLConfig if gtkglext + GdkGLDrawable if gtkglext + +## GnomeVFS classes + GnomeVFSVolume as Volume, gnome_vfs_volume_get_type if gnomevfs + GnomeVFSDrive as Drive, gnome_vfs_drive_get_type if gnomevfs + GnomeVFSVolumeMonitor as VolumeMonitor, gnome_vfs_volume_monitor_get_type if gnomevfs + +## GIO classes +# Note on all the "as" clauses: the prefix G is unfortunate since it leads +# to two consecutive upper case letters which are not translated with an +# underscore each (e.g. GConf -> gconf, GtkHButtonBox -> gtk_hbutton_box). +# GUnixMountMonitor as UnixMountMonitor, g_unix_mount_monitor_get_type if gio + GOutputStream as OutputStream, g_output_stream_get_type if gio + GFilterOutputStream as FilterOutputStream, g_filter_output_stream_get_type if gio + GDataOutputStream as DataOutputStream, g_data_output_stream_get_type if gio + GBufferedOutputStream as BufferedOutputStream, g_buffered_output_stream_get_type if gio +# GUnixOutputStream as UnixOutputStream, g_unix_output_stream_get_type if gio + GFileOutputStream as FileOutputStream, g_file_output_stream_get_type if gio + GMemoryOutputStream as MemoryOutputStream, g_memory_output_stream_get_type if gio + GInputStream as InputStream, g_input_stream_get_type if gio +# GUnixInputStream as UnixInputStream, g_unix_input_stream_get_type if gio + GMemoryInputStream as MemoryInputStream, g_memory_input_stream_get_type if gio + GFilterInputStream as FilterInputStream, g_filter_input_stream_get_type if gio + GBufferedInputStream as BufferedInputStream, g_buffered_input_stream_get_type if gio + GDataInputStream as DataInputStream, g_data_input_stream_get_type if gio + GFileInputStream as FileInputStream, g_file_input_stream_get_type if gio +# GDesktopAppInfo as DesktopAppInfo, g_desktop_app_info_get_type if gio + GFileMonitor as FileMonitor, g_file_monitor_get_type if gio + GVfs as Vfs, g_vfs_get_type if gio + GMountOperation as MountOperation, g_mount_operation_get_type if gio + GThemedIcon as ThemedIcon, g_themed_icon_get_type if gio + GEmblem as Emblem, g_emblem_get_type if gio + GEmblemedIcon as EmblemedIcon, g_emblemed_icon_get_type if gio + GFileEnumerator as FileEnumerator, g_file_enumerator_get_type if gio + GFilenameCompleter as FilenameCompleter, g_filename_completer_get_type if gio + GFileIcon as FileIcon, g_file_icon_get_type if gio + GVolumeMonitor as VolumeMonitor, g_volume_monitor_get_type if gio + GCancellable as Cancellable, g_cancellable_get_type if gio + GSimpleAsyncResult as SimpleAsyncResult, g_async_result_get_type if gio + GFileInfo as FileInfo, g_file_info_get_type if gio + GAppLaunchContext as AppLaunchContext, g_app_launch_context_get_type if gio +## these are actually GInterfaces + GIcon as Icon, g_icon_get_type if gio + GSeekable as Seekable, g_seekable_get_type if gio + GAppInfo as AppInfo, g_app_info_get_type if gio + GVolume as Volume, g_volume_get_type if gio + GAsyncResult as AsyncResult, g_async_result_get_type if gio + GLoadableIcon as LoadableIcon, g_loadable_icon_get_type if gio + GDrive as Drive, g_drive_get_type if gio + GFile noEq as File, g_file_get_type if gio + GMount as Mount, g_mount_get_type if gio + +## GStreamer classes + GstObject as Object, gst_object_get_type if gstreamer + GstPad as Pad, gst_pad_get_type if gstreamer + GstGhostPad as GhostPad, gst_ghost_pad_get_type if gstreamer + GstPluginFeature as PluginFeature, gst_plugin_feature_get_type if gstreamer + GstElementFactory as ElementFactory, gst_element_factory_get_type if gstreamer + GstTypeFindFactory as TypeFindFactory, gst_type_find_factory_get_type if gstreamer + GstIndexFactory as IndexFactory, gst_index_factory_get_type if gstreamer + GstElement as Element, gst_element_get_type if gstreamer + GstBin as Bin, gst_bin_get_type if gstreamer + GstPipeline as Pipeline, gst_pipeline_get_type if gstreamer + GstImplementsInterface as ImplementsInterface, gst_implements_interface_get_type if gstreamer + GstTagSetter as TagSetter, gst_tag_setter_get_type if gstreamer + GstBaseSrc as BaseSrc, gst_base_src_get_type if gstreamer + GstPushSrc as PushSrc, gst_push_src_get_type if gstreamer + GstBaseSink as BaseSink, gst_base_sink_get_type if gstreamer + GstBaseTransform as BaseTransform, gst_base_transform_get_type if gstreamer + GstPlugin as Plugin, gst_plugin_get_type if gstreamer + GstRegistry as Registry, gst_registry_get_type if gstreamer + GstBus as Bus, gst_bus_get_type if gstreamer + GstClock as Clock, gst_clock_get_type if gstreamer + GstAudioClock as AudioClock, gst_audio_clock_get_type if gstreamer + GstSystemClock as SystemClock, gst_system_clock_get_type if gstreamer + GstNetClientClock as NetClientClock, gst_net_client_clock_get_type if gstreamer + GstIndex as Index, gst_index_get_type if gstreamer + GstPadTemplate as PadTemplate, gst_pad_template_get_type if gstreamer + GstTask as Task, gst_task_get_type if gstreamer + GstXML as XML, gst_xml_get_type if gstreamer + GstChildProxy as ChildProxy, gst_child_proxy_get_type if gstreamer + GstCollectPads as CollectPads, gst_collect_pads_get_type if gstreamer +## these are actually GInterfaces + GstURIHandler as URIHandler, gst_uri_handler_get_type if gstreamer + GstAdapter as Adapter, gst_adapter_get_type if gstreamer + GstController as Controller, gst_controller_get_type if gstreamer + + WebKitWebFrame as WebFrame, webkit_web_frame_get_type if webkit [_$_] + WebKitWebSettings as WebSettings, webkit_web_settings_get_type if webkit + WebKitNetworkRequest as NetworkRequest, webkit_network_request_get_type if webkit + WebKitNetworkResponse as NetworkResponse, webkit_network_response_get_type if webkit + WebKitDownload as Download, webkit_download_get_type if webkit + WebKitWebBackForwardList as WebBackForwardList, webkit_web_back_forward_list_get_type if webkit + WebKitWebHistoryItem as WebHistoryItem, webkit_web_history_item_get_type if webkit + WebKitWebInspector as WebInspector, webkit_web_inspector_get_type if webkit + WebKitHitTestResult as HitTestResult, webkit_hit_test_result_get_type if webkit + WebKitSecurityOrigin as SecurityOrigin, webkit_security_origin_get_type if webkit + WebKitSoupAuthDialog as SoupAuthDialog, webkit_soup_auth_dialog_get_type if webkit + WebKitWebDatabase as WebDatabase, webkit_web_database_get_type if webkit + WebKitWebDataSource as WebDataSource, webkit_web_data_source_get_type if webkit + WebKitWebNavigationAction as WebNavigationAction, webkit_web_navigation_action_get_type if webkit + WebKitWebPolicyDecision as WebPolicyDecision, webkit_web_policy_decision_get_type if webkit + WebKitWebResource as WebResource, webkit_web_resource_get_type if webkit + WebKitWebWindowFeatures as WebWindowFeatures, webkit_web_window_features_get_type if webkit + addfile ./gtk/hsgtk.h hunk ./gtk/hsgtk.h 1 +#include <gtk/gtk.h> +/* these are necessary on Win32 to circumvent the strcuture size check */ +#undef gtk_init_check +#undef gtk_init + + hunk ./gtk/wingtk.h 1 -#include <gtk/gtk.h> -/* these are necessary on Win32 to circumvent the strcuture size check */ -#undef gtk_init_check -#undef gtk_init - rmfile ./gtk/wingtk.h |
From: Daniel W. <dm...@lu...> - 2013-02-15 01:57:24
|
diffing dir... Sun Jan 13 05:25:38 GMT 2013 Hamish Mackenzie <ham...@go...> * Fixes for Gtk3 on Win32 and basic StyleProvider support. Also switched -fgtk3 on by default (use -f-gtk3 to build with Gtk2). Ignore-this: adb6563387f40f5c9f9b3e36d40474b9 hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 282 +#if GTK_MAJOR_VERSION >= 3 + widgetGetStyleContext, +#endif hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 2624 - [_$_] + +#endif + +#if GTK_MAJOR_VERSION >= 3 +-- | Returns the style context associated to @widget@. +widgetGetStyleContext :: WidgetClass widget + => widget -- ^ @widget@ : a @Widget@ + -> IO StyleContext -- ^ a @StyleContext@ +widgetGetStyleContext widget = + makeNewGObject mkStyleContext $ + {# call gtk_widget_get_style_context #} + (toWidget widget) hunk ./gtk/Graphics/UI/Gtk/ActionMenuToolbar/UIManager.chs 452 -#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0) +#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0) && GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Display/Image.chs 193 -#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0) +#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0) && GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Display/Image.chs 296 -#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0) +#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0) && GTK_MAJOR_VERSION < 3 addfile ./gtk/Graphics/UI/Gtk/General/CssProvider.chs hunk ./gtk/Graphics/UI/Gtk/General/CssProvider.chs 1 +{-# LANGUAGE CPP #-} +-- -*-haskell-*- +-- GIMP Toolkit (GTK) Styles +-- +-- Author : Axel Simon +-- +-- Created: 13 February 2003 +-- +-- Copyright (C) 1999-2005 Axel Simon +-- +-- This library is free software; you can redistribute it and/or +-- modify it under the terms of the GNU Lesser General Public +-- License as published by the Free Software Foundation; either +-- version 2.1 of the License, or (at your option) any later version. +-- +-- This library is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-- Lesser General Public License for more details. +-- +-- | +-- Maintainer : gtk...@li... +-- Stability : provisional +-- Portability : portable (depends on GHC) +-- +-- CSS-like styling for widgets. +-- +module Graphics.UI.Gtk.General.CssProvider ( +-- * Description +-- +-- | @CssProvider@ is an object implementing the @StyleProvider@ interface. +-- It is able to parse CSS-like input in order to style widgets. +-- + +#if GTK_MAJOR_VERSION >= 3 +-- * Types + CssProvider, + CssProviderClass, + castToCssProvider, gTypeCssProvider, + toCssProvider, + +-- * Enums + CssProviderError(..), + +-- * Constructors + cssProviderNew, + +-- * Methods + cssProviderGetDefault, + cssProviderGetNamed, + cssProviderLoadFromData, + cssProviderLoadFromString, + cssProviderLoadFromPath, +#if GTK_CHECK_VERSION(3,2,0) + cssProviderToString, +#endif +#endif + + ) where + +{# context prefix ="gtk" #} + +import Control.Monad (liftM) + +import System.Glib.FFI +import System.Glib.UTFString +{#import Graphics.UI.Gtk.Types#} +import System.Glib.GError (GError(..), GErrorClass(..), GErrorDomain, + propagateGError) + +#if GTK_MAJOR_VERSION >= 3 +{#enum CssProviderError {underscoreToCase} deriving (Bounded,Eq,Show)#} + +-------------------- +-- Interfaces + +instance StyleProviderClass CssProvider + +-------------------- +-- Constructors + +-- | Returns a newly created CssProvider +cssProviderNew :: IO CssProvider -- ^ A new CssProvider +cssProviderNew = + wrapNewGObject mkCssProvider {# call gtk_css_provider_new #} + +-------------------- +-- Methods + +-- | Returns the provider containing the style settings used as a fallback for all widgets. +cssProviderGetDefault :: IO CssProvider -- ^ The provider used for fallback styling +cssProviderGetDefault = + makeNewGObject mkCssProvider {# call gtk_css_provider_get_default #} + +-- | Loads a theme from the usual theme paths +cssProviderGetNamed :: String -- ^ @name@ : A theme name + -> Maybe String -- ^ @variant@ to load, for example, "dark" + -> IO (Maybe CssProvider) -- ^ a @CssProvider@ with the theme loaded +cssProviderGetNamed name variant = + maybeNull (makeNewGObject mkCssProvider) $ + withUTFString name $ \namePtr -> + maybeWith withUTFString variant $ \variantPtr -> + {# call gtk_css_provider_get_named #} namePtr variantPtr + +-- | Loads @_data@ into @cssProvider@, making it clear any previously loaded information. +cssProviderLoadFromData :: CssProviderClass cssProvider + => cssProvider -- | ^ @cssProvider@ : a @CssProvider@ + -> Ptr CChar -- | ^ @_data@ : CSS data loaded in memory. [array length=length][element-type guint8] + -> Int -- | ^ @length@ : the length of @_data@ in bytes, or -1 for NUL terminated + -- strings. If @length@ is not -1, the code will assume it is + -- not NUL terminated and will potentially do a copy. + -> IO () +cssProviderLoadFromData cssProvider _data length = + propagateGError $ \errPtrPtr -> + {# call gtk_css_provider_load_from_data #} + (toCssProvider cssProvider) + _data + (fromIntegral length) + errPtrPtr >> return () + +-- | Loads @css@ into @cssProvider@, making it clear any previously loaded information. +cssProviderLoadFromString :: CssProviderClass cssProvider + => cssProvider -- | ^ @cssProvider@ : a @CssProvider@ + -> String -- | ^ @css@ : CSS data loaded in memory. + -> IO () +cssProviderLoadFromString cssProvider css = + withUTFStringLen css $ \(cssPtr, len) -> + cssProviderLoadFromData cssProvider cssPtr len + +-- |Loads the data contained in @path@ into @cssProvider@, making it clear any previously +-- loaded information +cssProviderLoadFromPath :: CssProviderClass cssProvider + => cssProvider -- | ^ @cssProvider@ a @CssProvider@ + -> FilePath -- | ^ the path of a filename to load + -> IO () +cssProviderLoadFromPath cssProvider path = + propagateGError $ \errPtrPtr -> + withUTFString path $ \pathPtr -> + {# call gtk_css_provider_load_from_path #} + (toCssProvider cssProvider) + pathPtr + errPtrPtr >> return () + +#if GTK_CHECK_VERSION(3,2,0) +-- | Convertes the @provider@ into a string representation in CSS format. +-- +-- Using @cssProviderLoadFromString@ with the return value from this function +-- on a new provider created with @cssProviderNew@ will basically create a +-- duplicate of this @provider@. +cssProviderToString :: CssProviderClass cssProvider + => cssProvider -- | ^ @provider@ a @CssProvider@ + -> IO String +cssProviderToString provider = + {# call gtk_css_provider_to_string #} + (toCssProvider provider) >>= peekUTFString +#endif + +#endif hunk ./gtk/Graphics/UI/Gtk/General/General.chs 144 + initialise hunk ./gtk/Graphics/UI/Gtk/General/General.chs 168 +foreign import ccall "hsgthread.h gtk2hs_initialise" + initialise :: IO () + hunk ./gtk/Graphics/UI/Gtk/General/IconFactory.chs 322 -#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0) [_$_] +#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0) && GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/IconFactory.chs 386 -#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0) [_$_] +#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0) && GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 609 -#elif defined(HAVE_QUARTZ_GTK) +#elif defined(HAVE_QUARTZ_GTK) || (defined(WIN32) && GTK_MAJOR_VERSION >= 3) hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 645 -#if defined(WIN32) -foreign import ccall unsafe "gdk_win32_drawable_get_handle" - gdk_win32_drawable_get_handle :: (Ptr Drawable) -> IO (Ptr a) -#elif !defined(HAVE_QUARTZ_GTK) +#if !defined(HAVE_QUARTZ_GTK) && !defined(WIN32) hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 664 -#if defined(WIN32) +#if defined(WIN32) && GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 672 -#elif !defined(HAVE_QUARTZ_GTK) +#elif !defined(HAVE_QUARTZ_GTK) && !defined(WIN32) addfile ./gtk/Graphics/UI/Gtk/General/StyleContext.chs hunk ./gtk/Graphics/UI/Gtk/General/StyleContext.chs 1 +{-# LANGUAGE CPP #-} +-- -*-haskell-*- +-- GIMP Toolkit (GTK) Styles +-- +-- Author : Axel Simon +-- +-- Created: 13 February 2003 +-- +-- Copyright (C) 1999-2005 Axel Simon +-- +-- This library is free software; you can redistribute it and/or +-- modify it under the terms of the GNU Lesser General Public +-- License as published by the Free Software Foundation; either +-- version 2.1 of the License, or (at your option) any later version. +-- +-- This library is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-- Lesser General Public License for more details. +-- +-- | +-- Maintainer : gtk...@li... +-- Stability : provisional +-- Portability : portable (depends on GHC) +-- +-- Rendering UI elements +-- +module Graphics.UI.Gtk.General.StyleContext ( +-- * Description +-- +-- | GtkStyleContext is an object that stores styling information +-- affecting a widget defined by @WidgetPath@. +-- +-- In order to construct the final style information, @StyleContext@ +-- queries information from all attached @StyleProviders@. Style +-- providers can be either attached explicitly to the context through +-- @styleContextAddProvider@, or to the screen through @styleContextAddProviderForScreen. +-- The resulting style is a combination of all providers' information +-- in priority order. +-- +-- For GTK+ widgets, any @StyleContext@ returned by widgetGetStyleContext +-- will already have a @WidgetPath@, a @Screen@ and RTL/LTR information set. +-- The style context will be also updated automatically if any of these +-- settings change on the widget. +-- +-- If you are using the theming layer standalone, you will need to set a +-- widget path and a screen yourself to the created style context through +-- @styleContextSetPath@ and @styleContextSetScreen@, as well as updating +-- the context yourself using @styleContextInvalidate@ whenever any of the +-- conditions change, such as a change in the "gtk-theme-name" setting or +-- a hierarchy change in the rendered widget. +-- + +#if GTK_MAJOR_VERSION >= 3 +-- * Types + StyleContext, + StyleContextClass, + castToStyleContext, gTypeStyleContext, + toStyleContext, + +-- * Constructors + styleContextNew, + +-- * Methods + styleContextAddProvider, + styleContextAddProviderForScreen, +#endif + + ) where + +{# context prefix ="gtk" #} + +import Control.Monad (liftM) + +import System.Glib.FFI +import System.Glib.UTFString +{#import Graphics.UI.Gtk.Types#} +import System.Glib.GError (GError(..), GErrorClass(..), GErrorDomain, + propagateGError) + +#if GTK_MAJOR_VERSION >= 3 +-- | Creates a standalone @StyleContext@, this style context won't be attached +-- to any widget, so you may want to call @styleContextSetPath@ yourself. +-- +-- Note : This function is only useful when using the theming layer separated +-- from GTK+, if you are using @StyleContext@ to theme @Widgets@, use +-- @widgetGetStyleContext@ in order to get a style context ready to theme +-- the widget. +styleContextNew :: IO StyleContext -- ^ A newly created StyleContext +styleContextNew = + wrapNewGObject mkStyleContext {# call gtk_style_context_new #} + +-- | Adds a style provider to @context@, to be used in style construction. +-- Note that a style provider added by this function only affects the +-- style of the widget to which @context@ belongs. If you want to affect +-- the style of all widgets, use @styleContextAddProviderForScreen@. +-- +-- Note : If both priorities are the same, A @StyleProvider@ added through +-- this function takes precedence over another added through +-- @styleContextAddProviderForScreen. +styleContextAddProvider :: (StyleContextClass context, StyleProviderClass provider) + => context -- ^ @context@ a @StyleContext@ + -> provider -- ^ @provider@ a @StyleProvider@ + -> Int -- ^ @priority@ : the priority of the style provider. + -- The lower it is, the earlier it will be used in the + -- style construction. Typically this will be in the + -- range between GTK_STYLE_PROVIDER_PRIORITY_FALLBACK + -- and GTK_STYLE_PROVIDER_PRIORITY_USER + -> IO () +styleContextAddProvider context provider priority = + {# call gtk_style_context_add_provider #} + (toStyleContext context) + (toStyleProvider provider) + (fromIntegral priority) + +-- | Adds a global style provider to @screen@, which will be used in style +-- construction for all @StyleContexts@ under @screen@. +-- +-- GTK+ uses this to make styling information from @Settings@ available. +-- +-- Note : If both priorities are the same, A @StyleProvider@ added through +-- @styleContextAddProvider@ takes precedence over another added through +-- this function. +styleContextAddProviderForScreen :: (ScreenClass screen, StyleProviderClass provider) + => screen -- ^ @screen@ a @Screen@ + -> provider -- ^ @provider@ a @StyleProvider@ + -> Int -- ^ @priority@ : the priority of the style provider. + -- The lower it is, the earlier it will be used in the + -- style construction. Typically this will be in the + -- range between GTK_STYLE_PROVIDER_PRIORITY_FALLBACK + -- and GTK_STYLE_PROVIDER_PRIORITY_USER + -> IO () +styleContextAddProviderForScreen screen provider priority = + {# call gtk_style_context_add_provider_for_screen #} + (toScreen screen) + (toStyleProvider provider) + (fromIntegral priority) + +#endif addfile ./gtk/Graphics/UI/Gtk/General/StyleProvider.chs hunk ./gtk/Graphics/UI/Gtk/General/StyleProvider.chs 1 +{-# LANGUAGE CPP #-} +-- -*-haskell-*- +-- GIMP Toolkit (GTK) Styles +-- +-- Author : Axel Simon +-- +-- Created: 13 February 2003 +-- +-- Copyright (C) 1999-2005 Axel Simon +-- +-- This library is free software; you can redistribute it and/or +-- modify it under the terms of the GNU Lesser General Public +-- License as published by the Free Software Foundation; either +-- version 2.1 of the License, or (at your option) any later version. +-- +-- This library is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-- Lesser General Public License for more details. +-- +-- | +-- Maintainer : gtk...@li... +-- Stability : provisional +-- Portability : portable (depends on GHC) +-- +-- Interface to provide style information to @StyleContext@ +-- +module Graphics.UI.Gtk.General.StyleProvider ( +-- * Description +-- +-- | @StyleProvider@ is an interface used to provide style information +-- to a @StyleContext@. See @styleContextAddProvider@ and +-- @styleContextAddProviderForScreen@. +-- +-- @StyleProvider@ is implemented by @CssProvider@ and @Settings@. +#if GTK_MAJOR_VERSION >= 3 +-- * Typess + StyleProvider, + StyleProviderClass, + castToStyleProvider, gTypeStyleProvider, + toStyleProvider, +#endif + + ) where + +{# context prefix ="gtk" #} + +import Control.Monad (liftM) + +import System.Glib.FFI +import System.Glib.UTFString +{#import Graphics.UI.Gtk.Types#} +import System.Glib.GError (GError(..), GErrorClass(..), GErrorDomain, + propagateGError) + +#if GTK_MAJOR_VERSION >= 3 +#endif hunk ./gtk/Graphics/UI/Gtk/General/hsgthread.c 28 +#define DEFINED_LPTYPELIB +#define DEFINDE_LPTYPEINFO +#define DEFINED_LPTYPECOMP +#define DEFINE_LPCREATETYPEINFO +#define DEFINED_LPDISPATCH + hunk ./gtk/Graphics/UI/Gtk/General/hsgthread.c 40 +#include <stdlib.h> +#include <fcntl.h> hunk ./gtk/Graphics/UI/Gtk/General/hsgthread.c 58 +/* Initialize the default _fmode on WIN32. */ +void gtk2hs_initialise (void) { +#if defined( WIN32 ) + _fmode = _O_BINARY; +#endif +} + hunk ./gtk/Graphics/UI/Gtk/General/hsgthread.h 6 +/* Initialize the default _fmode on WIN32 systems. */ +void gtk2hs_initialise (void); + hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooser.chs 377 -#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0) +#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0) && GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooser.chs 419 -#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0) +#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0) && GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooser.chs 438 -#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0) +#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0) && GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooser.chs 455 -#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0) +#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0) && GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooser.chs 484 -#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0) +#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0) && GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooser.chs 503 -#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0) +#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0) && GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooser.chs 519 -#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0) +#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0) && GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooser.chs 731 -#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0) +#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0) && GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooser.chs 832 -#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0) +#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0) && GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooser.chs 852 -#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0) +#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0) && GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooser.chs 867 -#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0) +#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0) && GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs 1491 -#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0) +#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0) && GTK_MAJOR_VERSION < 3 hunk ./gtk/gtk.cabal 132 - Default: False + Default: True hunk ./gtk/gtk.cabal 216 + Graphics.UI.Gtk.General.CssProvider hunk ./gtk/gtk.cabal 226 + Graphics.UI.Gtk.General.StyleContext + Graphics.UI.Gtk.General.StyleProvider hunk ./gtk/hierarchy3.list 186 - GtkBuilder [_$_] + GtkBuilder + GtkStyleContext + GtkStyleProvider + GtkCssProvider |
From: Daniel W. <dm...@lu...> - 2013-02-15 01:57:16
|
diffing dir... Fri Jul 13 18:35:24 BST 2012 ult...@gm... * Make functions in Calendar.chs not return True pointlessly. Ignore-this: a839dab81b7504ff8026922a1044fc99 Gtk2 returns booleans here for historical reasons, we should not perpetuate this behaviour (which is dropped in Gtk3). hunk ./gtk/Graphics/UI/Gtk/Misc/Calendar.chs 150 - -> IO Bool -- ^ returns @True@, always + -> IO () hunk ./gtk/Graphics/UI/Gtk/Misc/Calendar.chs 152 - liftM toBool $ + liftM (const ()) $ hunk ./gtk/Graphics/UI/Gtk/Misc/Calendar.chs 173 - -> IO Bool -- ^ returns @True@, always + -> IO () hunk ./gtk/Graphics/UI/Gtk/Misc/Calendar.chs 175 - liftM toBool $ + liftM (const ()) $ hunk ./gtk/Graphics/UI/Gtk/Misc/Calendar.chs 184 - -> IO Bool -- ^ returns @True@, always + -> IO () hunk ./gtk/Graphics/UI/Gtk/Misc/Calendar.chs 186 - liftM toBool $ + liftM (const ()) $ |
From: Daniel W. <dm...@lu...> - 2013-02-15 01:57:09
|
diffing dir... Sat Jan 5 02:07:55 GMT 2013 Hamish Mackenzie <ham...@go...> * Add scrolledWindowMinContentWidth/Height Ignore-this: 586322739d30f6e05630ec503afa07ef hunk ./gtk/Graphics/UI/Gtk/Scrolling/ScrolledWindow.chs 98 +#if GTK_MAJOR_VERSION >= 3 + scrolledWindowSetMinContentWidth, + scrolledWindowGetMinContentWidth, + scrolledWindowSetMinContentHeight, + scrolledWindowGetMinContentHeight, +#endif hunk ./gtk/Graphics/UI/Gtk/Scrolling/ScrolledWindow.chs 118 +#if GTK_MAJOR_VERSION >= 3 + scrolledWindowMinContentWidth, + scrolledWindowMinContentHeight, +#endif hunk ./gtk/Graphics/UI/Gtk/Scrolling/ScrolledWindow.chs 272 +#if GTK_MAJOR_VERSION >= 3 +-- | Sets the minimum width that @scrolledWindow@ should keep visible. +-- Note that this can and (usually will) be smaller than the minimum size of the content. +-- +scrolledWindowSetMinContentWidth :: ScrolledWindowClass self => self -> Int -> IO () +scrolledWindowSetMinContentWidth self width = + {# call gtk_scrolled_window_set_min_content_width #} + (toScrolledWindow self) + (fromIntegral width) + +-- | Gets the minimum content width of @scrolledWindow@, or -1 if not set. +-- +scrolledWindowGetMinContentWidth :: ScrolledWindowClass self => self -> IO Int +scrolledWindowGetMinContentWidth self = + liftM fromIntegral $ + {# call unsafe scrolled_window_get_min_content_width #} + (toScrolledWindow self) + +-- | Sets the minimum height that @scrolledWindow@ should keep visible. +-- Note that this can and (usually will) be smaller than the minimum size of the content. +-- +scrolledWindowSetMinContentHeight :: ScrolledWindowClass self => self -> Int -> IO () +scrolledWindowSetMinContentHeight self height = + {# call gtk_scrolled_window_set_min_content_height #} + (toScrolledWindow self) + (fromIntegral height) + +-- | Gets the minimum content height of @scrolledWindow@, or -1 if not set. +-- +scrolledWindowGetMinContentHeight :: ScrolledWindowClass self => self -> IO Int +scrolledWindowGetMinContentHeight self = + liftM fromIntegral $ + {# call unsafe scrolled_window_get_min_content_height #} + (toScrolledWindow self) +#endif + hunk ./gtk/Graphics/UI/Gtk/Scrolling/ScrolledWindow.chs 404 +#if GTK_MAJOR_VERSION >= 3 +-- | Minimum width that @scrolledWindow@ should keep visible. +-- +-- Default value: -1 +-- +scrolledWindowMinContentWidth :: ScrolledWindowClass self => Attr self Int +scrolledWindowMinContentWidth = newAttr + scrolledWindowGetMinContentWidth + scrolledWindowSetMinContentWidth + +-- | Minimum height that @scrolledWindow@ should keep visible. +-- +-- Default value: -1 +-- +scrolledWindowMinContentHeight :: ScrolledWindowClass self => Attr self Int +scrolledWindowMinContentHeight = newAttr + scrolledWindowGetMinContentHeight + scrolledWindowSetMinContentHeight +#endif + |
From: Daniel W. <dm...@lu...> - 2013-02-15 01:57:01
|
diffing dir... Sat Jan 5 02:06:54 GMT 2013 Hamish Mackenzie <ham...@go...> * Fix merge Ignore-this: 7995f7a9ae26906c1928a4c0b56804b4 hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 485 -#if GTK_CHECK_VERSION(2,18,0) --- | Get the 'EntryBuffer' object which holds the text for this widget. -entryGetBuffer :: EntryClass self => self - -> IO EntryBuffer -entryGetBuffer self = - makeNewGObject mkEntryBuffer $ - {# call gtk_entry_get_buffer #} - (toEntry self) - --- | Set the 'EntryBuffer' object which holds the text for this widget. -entrySetBuffer :: (EntryClass self, EntryBufferClass buffer) => self - -> buffer -> IO () -entrySetBuffer self = - {# call gtk_entry_set_buffer #} - (toEntry self) . toEntryBuffer -#endif - +#if GTK_MAJOR_VERSION < 3 hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 104 + menuItemActivatedItem, + menuItemActivated, hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 361 +menuItemActivatedItem :: MenuItemClass self => Signal self (IO ()) +menuItemActivatedItem = Signal (connect_NONE__NONE "activate-item") + +-- | Deprecated. See 'menuItemActivatedItem'. |
From: Daniel W. <dm...@lu...> - 2013-01-02 02:18:56
|
diffing dir... Wed Jan 2 02:17:56 GMT 2013 Daniel Wagner <da...@wa...> * Trac #1269: export the type name TypedTreeModelFilter Ignore-this: 6bd0b5dccbbdbf2b7199ab0d1d5e31c8 hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs 53 +-- | +----TypedTreeModelFilter hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs 59 + TypedTreeModelFilter, |
From: Daniel W. <dm...@lu...> - 2012-12-19 01:26:16
|
diffing dir... Wed Dec 19 01:23:54 GMT 2012 Daniel Wagner <da...@wa...> * switch FileChooser over to new-style signals, and add the fileSelectionChanged signal (per trac #1273) Ignore-this: b525fc13f8ef583426cf1eb79bda02df hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooser.chs 210 + currentFolderChanged, + fileActivated, + fileSelectionChanged, + updatePreview, +#if GTK_CHECK_VERSION(2,8,0) + confirmOverwrite, +#endif + +#ifndef DISABLE_DEPRECATED +-- * Deprecated hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooser.chs 231 -#endif -#endif +#endif -- version 2.8 +#endif -- deprecated +#endif -- version 2.4 hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooser.chs 1086 -onCurrentFolderChanged, afterCurrentFolderChanged :: FileChooserClass self => self - -> IO () - -> IO (ConnectId self) -onCurrentFolderChanged = connect_NONE__NONE "current-folder-changed" False -afterCurrentFolderChanged = connect_NONE__NONE "current-folder-changed" True +currentFolderChanged :: FileChooserClass self => Signal self (IO ()) +currentFolderChanged = Signal (connect_NONE__NONE "current-folder-changed") hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooser.chs 1102 ---onSelectionChanged, afterSelectionChanged :: FileChooserClass self => self --- -> IO () --- -> IO (ConnectId self) ---onSelectionChanged = connect_NONE__NONE "selection-changed" False ---afterSelectionChanged = connect_NONE__NONE "selection-changed" True +fileSelectionChanged :: FileChooserClass self => Signal self (IO ()) +fileSelectionChanged = Signal (connect_NONE__NONE "selection-changed") hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooser.chs 1122 -onUpdatePreview, afterUpdatePreview :: FileChooserClass self => self - -> IO () - -> IO (ConnectId self) -onUpdatePreview = connect_NONE__NONE "update-preview" False -afterUpdatePreview = connect_NONE__NONE "update-preview" True +updatePreview :: FileChooserClass self => Signal self (IO ()) +updatePreview = Signal (connect_NONE__NONE "update-preview") hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooser.chs 1136 -onFileActivated, afterFileActivated :: FileChooserClass self => self - -> IO () - -> IO (ConnectId self) -onFileActivated = connect_NONE__NONE "file-activated" False -afterFileActivated = connect_NONE__NONE "file-activated" True +fileActivated :: FileChooserClass self => Signal self (IO ()) +fileActivated = Signal (connect_NONE__NONE "file-activated") hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooser.chs 1162 +confirmOverwrite :: FileChooserClass self => Signal self (IO FileChooserConfirmation) +confirmOverwrite = Signal (connect_NONE__ENUM "confirm-overwrite") +#endif + +#ifndef DISABLE_DEPRECATED + +-- * Deprecated + +onCurrentFolderChanged, afterCurrentFolderChanged :: FileChooserClass self => self + -> IO () + -> IO (ConnectId self) +onCurrentFolderChanged = connect_NONE__NONE "current-folder-changed" False +afterCurrentFolderChanged = connect_NONE__NONE "current-folder-changed" True +{-# DEPRECATED onCurrentFolderChanged "use currentFolderChanged instead" #-} +{-# DEPRECATED afterCurrentFolderChanged "use currentFolderChanged instead" #-} + +--onSelectionChanged, afterSelectionChanged :: FileChooserClass self => self +-- -> IO () +-- -> IO (ConnectId self) +--onSelectionChanged = connect_NONE__NONE "selection-changed" False +--afterSelectionChanged = connect_NONE__NONE "selection-changed" True + +onUpdatePreview, afterUpdatePreview :: FileChooserClass self => self + -> IO () + -> IO (ConnectId self) +onUpdatePreview = connect_NONE__NONE "update-preview" False +afterUpdatePreview = connect_NONE__NONE "update-preview" True +{-# DEPRECATED onUpdatePreview "use updatePreview instead" #-} +{-# DEPRECATED afterUpdatePreview "use updatePreview instead" #-} + +onFileActivated, afterFileActivated :: FileChooserClass self => self + -> IO () + -> IO (ConnectId self) +onFileActivated = connect_NONE__NONE "file-activated" False +afterFileActivated = connect_NONE__NONE "file-activated" True +{-# DEPRECATED onFileActivated "use fileActivated instead" #-} +{-# DEPRECATED afterFileActivated "use fileActivated instead" #-} + +#if GTK_CHECK_VERSION(2,8,0) hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooser.chs 1206 +{-# DEPRECATED onConfirmOverwrite "use confirmOverwrite instead" #-} +{-# DEPRECATED afterConfirmOverwrite "use confirmOverwrite instead" #-} +#endif + |
From: Daniel W. <dm...@lu...> - 2012-12-01 20:28:27
|
diffing dir... Sat Dec 1 20:27:10 GMT 2012 Daniel Wagner <da...@wa...> * merge install instructions from around the web Ignore-this: 21266707a13ca99b6f3d1f55cad7f6dd hunk ./INSTALL 1 -Gtk2Hs: A GUI Library for Haskell based on Gtk+ +This is a mirror of the wiki document available at http://www.haskell.org/haskellwiki/Gtk2Hs/Installation. See that document for the most up-to-date version of the installation instructions. If you are reading this document on a Linux machine, you probably already have a copy of the gtk2hs source code available, so you should skip straight to the "From Source" section of those instructions. +---------------------------------- hunk ./INSTALL 4 -Contents: +These instructions are for installing everything necessary to go from a newly installed operating system to a minimal (but working) Gtk2Hs installation. hunk ./INSTALL 6 -* Overview -* Building -* Building form darcs -* Running the demos -* Documentation -* Deinstallation -* Building on Windows +Table of Contents +1 Windows + 1.1 Haskell Build System + 1.2 GTK Libraries + 1.3 Gtk2Hs Bindings + 1.4 Changing Environment Variables + 1.4.1 Command Prompt + 1.4.2 Windows XP GUI + 1.4.3 Windows 7 GUI + 1.5 Unzipping + 1.6 Installing darcs +2 Linux + 2.1 Preferred Way: Via Package Manager + 2.2 From Source + 2.3 Installing darcs +3 Mac +4 FreeBSD +5 Appendix + 5.1 Supported Versions + 5.1.1 Operating System + 5.1.2 Gtk+ + 5.1.3 GHC + 5.1.4 Tested Configurations + 5.2 Going Beyond Minimal: All Available Packages + 5.3 Getting the Latest and Greatest + 5.4 Getting the Oldest and Moldiest + 5.5 Troubleshooting + 5.5.1 glade.h is not found + 5.5.2 cabal cannot find gtk2hsC2hs + 5.5.3 "Spinner" errors while trying to compile the "notebook" demo + 5.6 Uninstalling hunk ./INSTALL 38 -Overview --------- +== Windows == +=== Haskell Build System === +You will need at least GHC and cabal-install. The simplest way to get these is to install [http://www.haskell.org/platform/ the Haskell Platform]. You will need to add cabal-install's executable directory to your %PATH% (it will tell you which path to add in a warning after you install your first executable there). See [[#Changing Environment Variables]] for details on how to do this. hunk ./INSTALL 42 -http://haskell.org/gtk2hs/ +=== GTK Libraries === +Download an all-in-one bundle from [http://www.gtk.org/download/win32.php the Gtk+ website]. Unpack the bundle to a path that does not have spaces in it, and add the /bin directory created by unpacking to your %PATH%. Important points: +* Get an all-in-one bundle. Do not install each of the packages separately. +* Do not install the bundle to a path that has spaces in it. +* Do not get the 2.16 bundle. hunk ./INSTALL 48 -Gtk2hs is a set of Haskell packages wrapping the GTK+ GUI stack: - -* tools (Tools to build gtk2hs) -* glib (GLib2 library) -* gio (VFS library) -* cairo (Vector graphics library) -* pango (Unicode text rendering) -* gtk (GTK+ GUI toolkit) - -The following are also available, but are not built by default when installing -the 'gtk' package. In particular, these might not have a binary library on -Windows available: - -* gconf (GConf2 configuration system) -* glade (libglade UI loader) -* gstreamer (Media codec library) -* gtkglext (Gtk+ OpenGL extension) -* gtksourceview2 (Source code editor) -* svgcairo (Cairo SVG loader) -* vte (Terminal emulator) -* webkit (WebKit rendering engine) -* soegtk (Graphics library for book "The Haskell School of Expression") - -The following packages are deprecated: -* gnomevfs (replaced by gio) -* mozembed (replaced by webkit) -* sourceview (replaced by gtksourceview2) - -The GHC Haskell compiler, version 6.10.x or greater, is required. -Gtk2Hs is known to compile on Linux, Windows, OSX, FreeBSD, and Solaris. -ghc-6.12.2 has a runtime issue that can cause gtk2hs apps to crash -(http://hackage.haskell.org/trac/ghc/ticket/4038), so better avoid it. - -These instructions are about building Gtk2Hs from source. Certain Linux -distributions might provide binary packages via their packaging system. - - -Building --------- - -From version 0.11, gtk2hs is now distributed as separate packages on hackage. -So the easiest way to install it is using "cabal-install", eg.: - -cabal install gtk - -Building the Gtk2Hs packages requires the installation of Gtk2Hs-specific -build tools. You can install these by issuing: +You can check that you have done everything in this step correctly by opening a command prompt and entering + <nowiki>pkg-config --cflags gtk+-2.0</nowiki> +If you see some compiler flags that contain the path into which you have installed the binary bundle, you are okay. hunk ./INSTALL 52 +=== Gtk2Hs Bindings === +This step should be as easy as running + <nowiki> +cabal update hunk ./INSTALL 57 +cabal install gtk</nowiki> +After installing gtk2hs-buildtools, make sure that gtk2hsC2hs is in a directory that is on your %PATH%. +=== Changing Environment Variables === +The installation process involves modifying (or, if necessary, adding) the %PATH% environment variable. This subtopic describes how to do this. The %PATH% variable is a ';'-separated list of directories. hunk ./INSTALL 62 -Note that you need to have ~/.cabal/bin on your PATH since otherwise building -the libraries will fail, saying that e.g. gtk2hsC2hs cannot be found. - -Building on Windows --------------------- - -Installation on Windows is nearly as easy as on Unix platforms. However, you -need to download the pre-compiled binary libraries of Gtk+ and all it's -dependent libraries. Point your browser to - -http://www.gtk.org/download-windows.html - -and download one of the "All-in-one bundles". Note that you do *not* need to -install MinGW nor MSys (but it does not hurt if they are installed on your -system). Install the binaries by unpacking them into a directory without -spaces. Again, this is very important: - -*** Do not install the binaries into a directory with embedded spaces. *** +==== Command Prompt ==== +You can see and modify variables with echo and set: + <nowiki> +echo %PATH% +set PATH=dir1;dir2;...</nowiki> hunk ./INSTALL 68 -Ensure that the /bin directory is added to your %PATH%. You can ensure that -everything is installed correctly if you can say +==== Windows XP GUI ==== +* Start -> Control Panel -> System -> Advanced -> Environment Variables +* In the <em>top</em> window, click "New" to add a variable or "Edit" to modify an existing one. hunk ./INSTALL 72 -pkg-config --cflags gtk+-2.0 +==== Windows 7 GUI ==== +* Click on the Windows symbol on the bottom-left where "Start" used to be +* Choose Computer -> Properties -> Advanced System Settings +* In the <em>top</em> window, click "New" to add a variable or "Edit" to modify an existing one. hunk ./INSTALL 77 -and you see some compiler flags that contain the path into which you have -installed the binary bundle. We had reports that the binaries containing version 2.22 do not work and that the version 2.16 gives the following errors when running cabal: +=== Unzipping === +There are many good tools for extracting zip archives on Windows. If you don't have one already, [http://www.7-zip.org/ 7-zip] is a fine choice to install. You can extract a file with a command like + <nowiki> +cd c:\path\to\where\you\want\to\extract\files +7za x c:\path\to\file.zip</nowiki> hunk ./INSTALL 83 -setup.exe: gtk-0.12.0: library-dirs: c:/.../dist/win64/libpng-1.4.3-1/lib doesn't exist or isn't a directory +=== Installing darcs === +You can get a copy of darcs for Windows from [http://darcs.net/Binaries the official download page]. hunk ./INSTALL 86 -This problem can be worked around by creating said directory and copying libpng into it. Any further feedback regarding the installation of the binary packages is welcome. +== Linux == +=== Preferred Way: Via Package Manager === +You should check if your package manager already has gtk2hs, as this is the easiest and most reliable way to get everything installed. Below is a short list of package names for some distributions (feel free to add your favorite). +* Debian: libghc-gtk-dev +* Fedora: ghc-gtk-devel +* Gentoo: available in the haskell overlay as dev-haskell/gtk hunk ./INSTALL 93 -You may now install the cabal packages of Gtk2Hs into any directory you like -(including one that contains embedded spaces). Note that cabal installs the -tools necessary to build into something like +=== From Source === +First install the dependencies: a Haskell build system and the Gtk+ libraries. For the build system, you need at least GHC and cabal-install; for the Gtk+ libraries you will need (the development versions of) glib, gio, cairo, pango, and gtk. The names of the appropriate packages are listed below for some distributions (feel free to add your favorite). +* Debian: ghc cabal-install libglib2.0-dev libcairo2-dev libpango1.0-dev libgtk2.0-dev +* Fedora: ghc-compiler cabal-install glib2-devel cairo-devel pango-devel gtk2-devel hunk ./INSTALL 98 -C:\Documents and Settings\%user%\Application Data\cabal\bin +You must add cabal's executable directory to your $PATH next. By default, this directory is $HOME/.cabal/bin. To do this locally for a single shell, write + <nowiki>export PATH=$HOME/.cabal/bin:$PATH</nowiki> +Add a line with the same contents to your shell's rc file to make this change in all future invocations of your shell. hunk ./INSTALL 102 -Make sure that this path is also in your %PATH% variable! - -ghci and Gtk2Hs on Windows - -Due to the way cabal registers packages with ghc, it is quite difficult to -perform the renaming of libraries which is necessary for the binary Windows -bundle to work. As a consequence, the cabal package can do this renaming only -with Cabal 1.8 (shipped with ghc 6.12). If you use ghc 6.10 or earlier, you -need to upgrade your Cabal system to 1.8 if you want to build Gtk2Hs with ghci -support. Note that it is always possible to build executables on Windows. - -Building on Mac OS X --------------------- - -There is nothing particular about Mac OS X, except that pango 1.26 has a bug -that makes application seem to hang. - -Furthermore, there are libraries that use the native Aqua API as a backend to -Gdk. It seems that this porting effort has stalled and as of now does not -support certain features as copy and paste. Use at your own risk. - -NOTE: If you use Quartz backend on Mac OS X, please building with the [_$_] -flag -have-quartz-gtk to disable function gdk_x11_drawable_get_xid, [_$_] -otherwise you will get linking error : - - Loading package gtk-0.12.0 ... linking ... <interactive>: - unknown symbol `_gdk_x11_drawable_get_xid' - ghc: unable to load package `gtk-0.12.0' - -Building from darcs -------------------- - -This section assumes that you are building from a darcs checkout or snapshot. -If you are building on Windows, read "Building on Windows" first. - -The following assumes that the sources are in ~/gtk2hs. - -Building the latest sources from the darcs repository is normally straight -forward. In fact, since Gtk2Hs is only a wrapper around Gtk+, the development -version is usually not as "unstable" as it is for most software projects. -You must have all the appropriate development packages installed of course -(glib-2.0, gio-2.0, pango, cairo, gtk+-2.0) for all the packages you wish to build. You can check the existence by running 'pkg-config --list-all'. - -You can get the latest development darcs source tree by running: - -~:$ darcs get --lazy http://code.haskell.org/gtk2hs - -The easiest way to build everything is to run the script: +You can now build Gtk2Hs itself, with the commands + <nowiki> +cabal update +cabal install gtk2hs-buildtools +cabal install gtk</nowiki> hunk ./INSTALL 108 -~/gtk2hs:$ sh bootstrap.sh +=== Installing darcs === +There are binaries available on [http://darcs.net/Binaries the official download page], or in almost all cases via your package manager as a package named darcs. hunk ./INSTALL 111 -which build the tools and all the main supported libraries. +== Mac == +There are one-off experience reports of varying age available at [[Gtk2Hs/Mac]]. Please write to the mailing list if you are willing to maintain good instructions (or just start editing this page!). hunk ./INSTALL 114 -Otherwise you can run "cabal install" by hand in a appropriate order -in a desired subset of the individual package directories. +== FreeBSD == +Gtk2Hs is available as [http://www.freshports.org/x11-toolkits/hs-gtk2hs/ hs-gtk2hs] in FreshPorts. hunk ./INSTALL 117 +== Appendix == +=== Supported Versions === +The most recent release of Gtk2Hs was tested on the a variety of systems. Below we offer two kinds of statistics; the second thing we give is a list of system configurations on which the minimal gtk2hs installation described above has been tested. (Please feel free to add your system configuration if you build gtk2hs.) Above that, we list the versions of each component for which some system configuration successfully built gtk2hs, with an asterisk marking those that are officially supported. Any system configuration containing officially supported versions of each component should be able to build gtk2hs successfully; please report a bug if you find this not to be true! hunk ./INSTALL 121 -Running the demos. ------------------- +==== Operating System ==== +* Windows XP* +* Ubuntu 12.10* +* Fedora 17* hunk ./INSTALL 126 -To get started, you can compile and run one of the programs that reside in -the demo/ directory in the respective packages. For example: +==== Gtk+ ==== +* 2.12* +* 2.14* +* 2.18* +* 2.20* +* 2.22* +* 2.24* hunk ./INSTALL 134 -~/gtk2hs/gtk/demo/hello:$ make +==== GHC ==== +* 7.0* +* 7.2* +* 7.4* +* 7.6* hunk ./INSTALL 140 -which has the same effect as typing +==== Tested Configurations ==== +gtk-0.12.4: +* Windows XP, Gtk+ 2.12, GHC 7.6 +* Windows XP, Gtk+ 2.14, GHC 7.6 +* Windows XP, Gtk+ 2.18, GHC 7.6 +* Windows XP, Gtk+ 2.20, GHC 7.6 +* Windows XP, Gtk+ 2.22, GHC 7.6 +* Windows XP, Gtk+ 2.24, GHC 7.6 +* Windows XP, Gtk+ 2.24, GHC 7.4 +* Windows XP, Gtk+ 2.24, GHC 7.2 +* Windows XP, Gtk+ 2.24, GHC 7.0 +* Fedora 17, Gtk+ 2.24, GHC 7.6 +gtk-0.12.3: +* Ubuntu 12.10, Gtk+ 2.24, GHC 7.4 +* Windows 7, Gtk+ ??, GHC ?? hunk ./INSTALL 156 -~/gtk2hs/gtk/demo/hello:$ ghc --make World.hs -o helloworld +=== Going Beyond Minimal: All Available Packages === +There are many packages available. The basic one installed by the above instructions are: hunk ./INSTALL 159 -The program should pop up a dialog box when you run +* [http://hackage.haskell.org/package/gtk2hs-buildtools gtk2hs-buildtools]: build tools, required to build from source +* [http://hackage.haskell.org/package/glib glib]: object type system and data structures +* [http://hackage.haskell.org/package/gio gio]: an OS-agnostic file access API +* [http://hackage.haskell.org/package/cairo cairo]: a 2D vector graphics library +* [http://hackage.haskell.org/package/pango pango]: a Unicode-aware font rendering engine +* [http://hackage.haskell.org/package/gtk gtk]: the base GUI library hunk ./INSTALL 166 -~/gtk2hs/gtk/demo/hello:$ ./helloworld +The following packages are also available: hunk ./INSTALL 168 +* [http://hackage.haskell.org/package/gconf gconf]: configuration database +* [http://hackage.haskell.org/package/glade glade]: a library to build user interfaces from XML descriptions +* [http://hackage.haskell.org/package/gstreamer gstreamer]: a multimedia streaming framework +* [http://hackage.haskell.org/package/gtkglext gtkglext]: an OpenGL widget +* [http://hackage.haskell.org/package/gtksourceview2 gtksourceview2]: a source-code widget +* [http://hackage.haskell.org/package/soegtk soegtk]: an API providing functions for Paul Hudak's Haskell School of Expressions book +* [http://hackage.haskell.org/package/svgcairo svgcairo]: writing Cairo graphics to SVG files +* [http://hackage.haskell.org/package/vte vte]: a terminal widget +* [http://hackage.haskell.org/package/webkit webkit]: a web-browser widget, based on Apple's webkit library hunk ./INSTALL 178 -Documentation -------------- +The following deprecated packages are no longer supported, and are only available via darcs (see, funnily enough, [[#Getting the Latest and Greatest]] below for instructions on using this tool): hunk ./INSTALL 180 -The documentation is available on the website and in hackage. -You can also build the documentation locally with cabal. +* [http://www2.in.tum.de/~simona/sourceview sourceview]: version 1 of the SourceView widget +* [http://www2.in.tum.de/~simona/gnomevfs gnomevfs]: Gnome Virtual File System, superseded by gio +* [http://www2.in.tum.de/~simona/mozembed mozembed]: a web-browser widget, superseded by webkit hunk ./INSTALL 184 +=== Getting the Latest and Greatest === +First follow your operating system's instructions for installing dependencies and for installing darcs. You can then get a copy of the newest code by running the command + <nowiki>darcs get --lazy http://code.haskell.org/gtk2hs</nowiki> +On Linux, you can build all the basic packages by running + <nowiki>cd gtk2hs && sh bootstrap.sh</nowiki> +On Windows, run cabal install in each directory by hand: + <nowiki> +cd gtk2hs/tools +cabal install +cd ../glib +cabal install +cd ../gio +cabal install +cd ../cairo +cabal install +cd ../pango +cabal install +cd ../gtk +cabal install</nowiki> hunk ./INSTALL 204 -Deinstallation ------------------ +One benefit of getting the source repository is that there are demos available in each package's demo directory. For example, you can run gtk's Hello World example by: + <nowiki> +cd gtk2hs/gtk/demo/hello +ghc World +./World</nowiki> +There are also Makefiles in each directory if you have a suitable make installation. hunk ./INSTALL 211 -Although cabal doesn't allow to uninstall files at the moment, you can -unregister the packages with ghc-pkg and delete the installed files manually. -Eg reversing the order in bootstrap.sh: +=== Getting the Oldest and Moldiest === +There are bundles of some very old versions available [http://sourceforge.net/project/showfiles.php?group_id=49207&package_id=42440 on the SourceForge downloads page]. For newer versions, follow the instructions for installing darcs for your operating system. You can then get version x.y.z with the command + <nowiki>darcs get -t x.y.z http://code.haskell.org/gtk2hs</nowiki> hunk ./INSTALL 215 -for pkg in webkit vte svgcairo soegtk gtksourceview2 gtkglext gstreamer glade gconf gtk pango cairo gio glib ; \ -do ghc-pkg unregister $pkg; done +=== Troubleshooting === +==== glade.h is not found ==== +The symptom is this error message: + <nowiki>gtk2hsC2hs.exe : glade/glade.h: File does not exist</nowiki> +Probably this means that instead of installing the GTK/Glade bundle you installed them separately. The Gtk+/glade bundle comes with the "include/libglade-2.0" containing a number of header files. For some reason this directory is not included in stand-alone Gtk+ and glade installers. Install the bundle and add this directory to the INCLUDE environment variable. hunk ./INSTALL 221 -Unregistering packages is usually enough to be able to work with different -versions of Gtk2Hs. +==== cabal cannot find gtk2hsC2hs ==== +Either you forgot to install gtk2hs-buildtools, or you have not yet put cabal's executable directory in your path. Default directories are +* Linux: $HOME/.cabal/bin +* Windows XP: %USERPROFILE%\Application Data\cabal\bin +* Windows 7: %USERPROFILE%\AppData\Roaming\cabal\bin +See [[#Changing Environment Variables]] for instructions on changing environment variables on Windows. hunk ./INSTALL 228 -Please report problems to the Gtk2hs mailing list -<gtk...@li...>. +==== "Spinner" errors while trying to compile the "notebook" demo ==== +The symptom is errors like the following: + <nowiki> + [1 of 1] Compiling Main ( Notebook.hs, Notebook.o ) + Notebook.hs:14:35: + Not in scope: type constructor or class `Spinner' + Notebook.hs:78:13: Not in scope: `spinnerNew' + Notebook.hs:101:2: Not in scope: `spinnerStart' + Notebook.hs:109:2: Not in scope: `spinnerStop'</nowiki> +The Spinner widget first appears in Gtk+-2.22, so this will happen if you installed an older version of Gtk+. hunk ./INSTALL 239 -The Gtk2Hs team. +=== Uninstalling === +Uninstallation is currently ill-supported. You can unregister packages with GHC using ghc-pkg unregister, and the installed files can be manually deleted from GHC's local directories, but cabal does not yet support automatic uninstallation. |
From: Daniel W. <dm...@lu...> - 2012-11-24 03:13:12
|
diffing dir... Sat Nov 24 03:07:24 GMT 2012 Daniel Wagner <da...@wa...> * entryNewWithBuffer is new since GTK-2.18 Ignore-this: 7df7fba36ca04f85caf87d54783f79c8 hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 55 +#if GTK_CHECK_VERSION(2,18,0) hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 57 +#endif hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 195 +#if GTK_CHECK_VERSION(2,18,0) hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 209 -#if GTK_CHECK_VERSION(2,18,0) |
From: Daniel W. <dm...@lu...> - 2012-11-24 03:13:09
|
diffing dir... Sat Nov 24 03:04:32 GMT 2012 Daniel Wagner <da...@wa...> * "activate" -> "activated" in signal names for consistency Ignore-this: bbb696073f71787e0d3f1328e37ccebe hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs 113 + statusIconActivated, hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs 554 +statusIconActivated :: StatusIconClass self => Signal self (IO ()) +statusIconActivated = Signal (connect_NONE__NONE "activate") + +-- | Deprecated. See 'statusIconActivated'. hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs 559 -statusIconActivate = Signal (connect_NONE__NONE "activate") - [_$_] +statusIconActivate = statusIconActivated + hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 117 + entryActivated, hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 688 +entryActivated :: EntryClass ec => Signal ec (IO ()) +entryActivated = Signal (connect_NONE__NONE "activate") + +-- | Deprecated. See 'entryActivated'. hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 693 -entryActivate = Signal (connect_NONE__NONE "activate") +entryActivate = entryActivated hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBoxEntry.chs 156 --- connect to the 'Graphics.UI.Gtk.Entry.Entry.entryActivate' signal of the --- contained 'Graphics.UI.Gtk.Entry.Entry.Entry' an insert the text into the +-- connect to the 'Graphics.UI.Gtk.Entry.Entry.entryActivated' signal of the +-- contained 'Graphics.UI.Gtk.Entry.Entry.Entry' and insert the text into the hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 104 + menuItemActivatedItem, + menuItemActivated, hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 346 +menuItemActivated :: MenuItemClass self => Signal self (IO ()) +menuItemActivated = Signal (connect_NONE__NONE "activate") + +-- | Deprecated. See 'menuItemActivated'. hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 351 -menuItemActivate = Signal (connect_NONE__NONE "activate") +menuItemActivate = menuItemActivated hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 358 +menuItemActivatedItem :: MenuItemClass self => Signal self (IO ()) +menuItemActivatedItem = Signal (connect_NONE__NONE "activate-item") + +-- | Deprecated. See 'menuItemActivatedItem'. hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 363 -menuItemActivateItem = Signal (connect_NONE__NONE "activate-item") +menuItemActivateItem = menuItemActivatedItem hunk ./gtk/demo/statusicon/StatusIcon.hs 28 - on i menuItemActivate act + on i menuItemActivated act |
From: Daniel W. <dm...@lu...> - 2012-11-24 03:13:06
|
diffing dir... Sat Nov 24 03:02:42 GMT 2012 Daniel Wagner <da...@wa...> * de-duplicate entry{G,S}etBuffer (how did this ever build before?) Ignore-this: 1ebbf7852a75b303807b0dd519cf65a9 hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 106 - entryBuffer, hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 205 --- | Sets the given buffer as the buffer being displayed. --- -entrySetBuffer :: (EntryClass self, EntryBufferClass buffer) => self -> buffer -> IO () -entrySetBuffer self buffer = - {# call entry_set_buffer #} - (toEntry self) - (toEntryBuffer buffer) - +#if GTK_CHECK_VERSION(2,18,0) hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 211 --- | Returns the 'EntryBuffer' being displayed. --- -entryGetBuffer :: EntryClass self => self -> IO EntryBuffer +-- | Get the 'EntryBuffer' object which holds the text for this widget. +entryGetBuffer :: EntryClass self => self + -> IO EntryBuffer hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 216 - {# call entry_get_buffer #} + {# call gtk_entry_get_buffer #} hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 219 +-- | Set the 'EntryBuffer' object which holds the text for this widget. +entrySetBuffer :: (EntryClass self, EntryBufferClass buffer) => self + -> buffer -> IO () +entrySetBuffer self = + {# call gtk_entry_set_buffer #} + (toEntry self) . toEntryBuffer +#endif + hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 475 -#if GTK_CHECK_VERSION(2,18,0) --- | Get the 'EntryBuffer' object which holds the text for this widget. -entryGetBuffer :: EntryClass self => self - -> IO EntryBuffer -entryGetBuffer self = - makeNewGObject mkEntryBuffer $ - {# call gtk_entry_get_buffer #} - (toEntry self) - --- | Set the 'EntryBuffer' object which holds the text for this widget. -entrySetBuffer :: (EntryClass self, EntryBufferClass buffer) => self - -> buffer -> IO () -entrySetBuffer self = - {# call gtk_entry_set_buffer #} - (toEntry self) . toEntryBuffer -#endif - hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 633 --- | The buffer being displayed. --- -entryBuffer :: EntryClass self => Attr self EntryBuffer -entryBuffer = newAttr - entryGetBuffer - entrySetBuffer - hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 670 +-- | The buffer being displayed. +-- |