Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Migrate from mtl to transformers for ghc 6.12 build

  • Loading branch information...
commit 5f031472c2b390764c567ebced5c957c99a8c7d4 1 parent 208f7a2
Hamish Mackenzie authored December 31, 2011
69  ltk.cabal
... ...
@@ -1,34 +1,35 @@
1  
-name: ltk
2  
-version: 0.11.0.0
3  
-cabal-version: >= 1.8
4  
-build-type: Simple
5  
-license: GPL
6  
-license-file: LICENSE
7  
-copyright: Juergen "jutaro" Nicklisch-Franken
8  
-maintainer: maintainer@leksah.org
9  
-homepage: http://www.leksah.org
10  
-package-url: http://code.haskell.org/ltk
11  
-bug-reports: http://code.google.com/p/leksah/issues/list
12  
-synopsis: Leksah tool kit
13  
-description: UI Framework used by leksah
14  
-category: GUI
15  
-author: Juergen "jutaro" Nicklisch-Franken
16  
-tested-with: GHC ==6.10 || ==6.12 || ==7.0
17  
-
18  
-Library
19  
-    build-depends: Cabal >=1.6.0 && <1.13, base >=4.0.0.0 && <4.5,
20  
-               containers >=0.2 && <0.5, filepath >=1.1.0 && <1.3,
21  
-               glib >=0.10.0 && <0.13, gtk >=0.10.0 && <0.13,
22  
-               mtl >=1.1.0.2 && <2.1, parsec >=2.1.0.1 && <3.2,
23  
-               pretty >=1.0.1.0 && <1.2
24  
-    exposed-modules: Default MyMissing Control.Event
25  
-                 Graphics.UI.Editor.Basics Graphics.UI.Editor.Composite
26  
-                 Graphics.UI.Editor.DescriptionPP Graphics.UI.Editor.MakeEditor
27  
-                 Graphics.UI.Editor.Parameters Graphics.UI.Editor.Simple
28  
-                 Graphics.UI.Frame.Panes Graphics.UI.Frame.ViewFrame
29  
-                 Text.PrinterParser
30  
-    exposed: True
31  
-    buildable: True
32  
-    extensions: CPP, FlexibleInstances, BangPatterns
33  
-    hs-source-dirs: src
34  
-
  1
+name: ltk
  2
+version: 0.11.0.0
  3
+cabal-version: >= 1.8
  4
+build-type: Simple
  5
+license: GPL
  6
+license-file: LICENSE
  7
+copyright: Juergen "jutaro" Nicklisch-Franken
  8
+maintainer: maintainer@leksah.org
  9
+homepage: http://www.leksah.org
  10
+package-url: http://code.haskell.org/ltk
  11
+bug-reports: http://code.google.com/p/leksah/issues/list
  12
+synopsis: Leksah tool kit
  13
+description: UI Framework used by leksah
  14
+category: GUI
  15
+author: Juergen "jutaro" Nicklisch-Franken
  16
+tested-with: GHC ==6.10 || ==6.12 || ==7.0
  17
+
  18
+Library
  19
+    build-depends: Cabal >=1.6.0 && <1.14, base >=4.0.0.0 && <4.5,
  20
+               containers >=0.2 && <0.5, filepath >=1.1.0 && <1.3,
  21
+               glib >=0.10.0 && <0.13, gtk >=0.10.0 && <0.13,
  22
+               mtl >=1.1.0.2 && <2.1, parsec >=2.1.0.1 && <3.2,
  23
+               pretty >=1.0.1.0 && <1.2, transformers >=0.2.2.0 && <0.3
  24
+
  25
+    exposed-modules: Default MyMissing Control.Event
  26
+                 Graphics.UI.Editor.Basics Graphics.UI.Editor.Composite
  27
+                 Graphics.UI.Editor.DescriptionPP Graphics.UI.Editor.MakeEditor
  28
+                 Graphics.UI.Editor.Parameters Graphics.UI.Editor.Simple
  29
+                 Graphics.UI.Frame.Panes Graphics.UI.Frame.ViewFrame
  30
+                 Text.PrinterParser
  31
+    exposed: True
  32
+    buildable: True
  33
+    extensions: CPP, FlexibleInstances, BangPatterns
  34
+    hs-source-dirs: src
  35
+
2  src/Graphics/UI/Frame/Panes.hs
@@ -43,9 +43,9 @@ import Data.Maybe
43 43
 import Data.Map (Map)
44 44
 import qualified Data.Map as Map
45 45
 import Data.Typeable
46  
-import Control.Monad.Trans
47 46
 import Graphics.UI.Editor.Basics
48 47
        (Connection(..), Connection, Connections)
  48
+import Control.Monad.IO.Class (MonadIO)
49 49
 
50 50
 -- ---------------------------------------------------------------------
51 51
 -- Panes and pane layout
6  src/Graphics/UI/Frame/ViewFrame.hs
@@ -90,7 +90,6 @@ module Graphics.UI.Frame.ViewFrame (
90 90
 ) where
91 91
 
92 92
 import Graphics.UI.Gtk hiding (afterToggleOverwrite,onToggleOverwrite)
93  
-import Control.Monad.Reader
94 93
 import qualified Data.Map as Map
95 94
 import Data.List
96 95
 import Data.Maybe
@@ -122,6 +121,9 @@ import Graphics.UI.Editor.Basics
122 121
 import qualified Data.Set as  Set (unions, member)
123 122
 import Data.Set (Set(..))
124 123
 import Graphics.UI.Gtk.Gdk.Events (Event(..))
  124
+import Control.Monad.IO.Class (MonadIO(..))
  125
+import Control.Monad (when, liftM, foldM)
  126
+import qualified Control.Monad.Reader as Gtk (liftIO)
125 127
 
126 128
 --import Debug.Trace (trace)
127 129
 trace a b = b
@@ -1021,7 +1023,7 @@ newNotebook pp = do
1021 1023
             case mbText of
1022 1024
                 Nothing -> return ()
1023 1025
                 Just str -> do
1024  
-                    liftIO $ func (str,nb)
  1026
+                    Gtk.liftIO $ func (str,nb)
1025 1027
                     return ()
1026 1028
 
1027 1029
 terminalsWithPanePath :: PaneLayout -> [(PanePath,PaneLayout)]

0 notes on commit 5f03147

Please sign in to comment.
Something went wrong with that request. Please try again.