Permalink
Browse files

Migrate from mtl to transformers for ghc 6.12 build

  • Loading branch information...
1 parent 208f7a2 commit 5f031472c2b390764c567ebced5c957c99a8c7d4 @hamishmack hamishmack committed Dec 30, 2011
Showing with 40 additions and 37 deletions.
  1. +35 −34 ltk.cabal
  2. +1 −1 src/Graphics/UI/Frame/Panes.hs
  3. +4 −2 src/Graphics/UI/Frame/ViewFrame.hs
View
69 ltk.cabal
@@ -1,34 +1,35 @@
-name: ltk
-version: 0.11.0.0
-cabal-version: >= 1.8
-build-type: Simple
-license: GPL
-license-file: LICENSE
-copyright: Juergen "jutaro" Nicklisch-Franken
-maintainer: maintainer@leksah.org
-homepage: http://www.leksah.org
-package-url: http://code.haskell.org/ltk
-bug-reports: http://code.google.com/p/leksah/issues/list
-synopsis: Leksah tool kit
-description: UI Framework used by leksah
-category: GUI
-author: Juergen "jutaro" Nicklisch-Franken
-tested-with: GHC ==6.10 || ==6.12 || ==7.0
-
-Library
- build-depends: Cabal >=1.6.0 && <1.13, base >=4.0.0.0 && <4.5,
- containers >=0.2 && <0.5, filepath >=1.1.0 && <1.3,
- glib >=0.10.0 && <0.13, gtk >=0.10.0 && <0.13,
- mtl >=1.1.0.2 && <2.1, parsec >=2.1.0.1 && <3.2,
- pretty >=1.0.1.0 && <1.2
- exposed-modules: Default MyMissing Control.Event
- Graphics.UI.Editor.Basics Graphics.UI.Editor.Composite
- Graphics.UI.Editor.DescriptionPP Graphics.UI.Editor.MakeEditor
- Graphics.UI.Editor.Parameters Graphics.UI.Editor.Simple
- Graphics.UI.Frame.Panes Graphics.UI.Frame.ViewFrame
- Text.PrinterParser
- exposed: True
- buildable: True
- extensions: CPP, FlexibleInstances, BangPatterns
- hs-source-dirs: src
-
+name: ltk
+version: 0.11.0.0
+cabal-version: >= 1.8
+build-type: Simple
+license: GPL
+license-file: LICENSE
+copyright: Juergen "jutaro" Nicklisch-Franken
+maintainer: maintainer@leksah.org
+homepage: http://www.leksah.org
+package-url: http://code.haskell.org/ltk
+bug-reports: http://code.google.com/p/leksah/issues/list
+synopsis: Leksah tool kit
+description: UI Framework used by leksah
+category: GUI
+author: Juergen "jutaro" Nicklisch-Franken
+tested-with: GHC ==6.10 || ==6.12 || ==7.0
+
+Library
+ build-depends: Cabal >=1.6.0 && <1.14, base >=4.0.0.0 && <4.5,
+ containers >=0.2 && <0.5, filepath >=1.1.0 && <1.3,
+ glib >=0.10.0 && <0.13, gtk >=0.10.0 && <0.13,
+ mtl >=1.1.0.2 && <2.1, parsec >=2.1.0.1 && <3.2,
+ pretty >=1.0.1.0 && <1.2, transformers >=0.2.2.0 && <0.3
+
+ exposed-modules: Default MyMissing Control.Event
+ Graphics.UI.Editor.Basics Graphics.UI.Editor.Composite
+ Graphics.UI.Editor.DescriptionPP Graphics.UI.Editor.MakeEditor
+ Graphics.UI.Editor.Parameters Graphics.UI.Editor.Simple
+ Graphics.UI.Frame.Panes Graphics.UI.Frame.ViewFrame
+ Text.PrinterParser
+ exposed: True
+ buildable: True
+ extensions: CPP, FlexibleInstances, BangPatterns
+ hs-source-dirs: src
+
View
2 src/Graphics/UI/Frame/Panes.hs
@@ -43,9 +43,9 @@ import Data.Maybe
import Data.Map (Map)
import qualified Data.Map as Map
import Data.Typeable
-import Control.Monad.Trans
import Graphics.UI.Editor.Basics
(Connection(..), Connection, Connections)
+import Control.Monad.IO.Class (MonadIO)
-- ---------------------------------------------------------------------
-- Panes and pane layout
View
6 src/Graphics/UI/Frame/ViewFrame.hs
@@ -90,7 +90,6 @@ module Graphics.UI.Frame.ViewFrame (
) where
import Graphics.UI.Gtk hiding (afterToggleOverwrite,onToggleOverwrite)
-import Control.Monad.Reader
import qualified Data.Map as Map
import Data.List
import Data.Maybe
@@ -122,6 +121,9 @@ import Graphics.UI.Editor.Basics
import qualified Data.Set as Set (unions, member)
import Data.Set (Set(..))
import Graphics.UI.Gtk.Gdk.Events (Event(..))
+import Control.Monad.IO.Class (MonadIO(..))
+import Control.Monad (when, liftM, foldM)
+import qualified Control.Monad.Reader as Gtk (liftIO)
--import Debug.Trace (trace)
trace a b = b
@@ -1021,7 +1023,7 @@ newNotebook pp = do
case mbText of
Nothing -> return ()
Just str -> do
- liftIO $ func (str,nb)
+ Gtk.liftIO $ func (str,nb)
return ()
terminalsWithPanePath :: PaneLayout -> [(PanePath,PaneLayout)]

0 comments on commit 5f03147

Please sign in to comment.