scopeCairoNew: return an IORef

kfish · Mar 16, 2012 · 850a7dc · 850a7dc
1 parent ebeac11
commit 850a7dc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Scope/Cairo.hs b/Scope/Cairo.hs
@@ -16,6 +16,7 @@ import Prelude hiding (catch)
 
 import Control.Monad.CatchIO
 import Control.Monad.Reader
+import Data.IORef
 import qualified Graphics.Rendering.Cairo as C
 import Graphics.Rendering.Cairo.Internal (Render(..))
 import Graphics.Rendering.Cairo.Types (Cairo)
@@ -30,8 +31,8 @@ data ViewCairo = ViewCairo
     , adj    :: G.Adjustment
     }
 
-scopeCairoNew :: G.DrawingArea -> G.Adjustment -> Scope ViewCairo
-scopeCairoNew c a = scopeNew (viewCairoInit c a)
+scopeCairoNew :: G.DrawingArea -> G.Adjustment -> IO (IORef (Scope ViewCairo))
+scopeCairoNew c a = newIORef $ scopeNew (viewCairoInit c a)
 
 viewCairoInit :: G.DrawingArea -> G.Adjustment -> ViewCairo
 viewCairoInit c a = ViewCairo c a

diff --git a/src/GUI.hs b/src/GUI.hs
@@ -112,8 +112,7 @@ guiMain chan args = do
   adj <- G.adjustmentNew (0.0) (0.0) (1.0) (0.1) 1.0 1.0
   drawingArea <- G.drawingAreaNew
 
-  let scope = scopeCairoNew drawingArea adj
-  scopeRef <- newIORef scope
+  scopeRef <- scopeCairoNew drawingArea adj
 
   quita `G.on` G.actionActivated $ myQuit scopeRef window chan