From: Duncan C. <dun...@us...> - 2005-01-16 21:32:45
|
Update of /cvsroot/gtk2hs/gtk2hs/mogul/Graphics/UI/Gtk/Mogul In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv340/mogul/Graphics/UI/Gtk/Mogul Modified Files: WidgetTable.hs Log Message: More import tweaks for compatability with older versions of ghc. Index: WidgetTable.hs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/mogul/Graphics/UI/Gtk/Mogul/WidgetTable.hs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- WidgetTable.hs 8 Jan 2005 16:41:58 -0000 1.1 +++ WidgetTable.hs 16 Jan 2005 21:32:32 -0000 1.2 @@ -34,13 +34,12 @@ ) where import Monad (liftM) -import Foreign -import Foreign.ForeignPtr (unsafeForeignPtrToPtr) import Control.Concurrent.MVar (MVar, newMVar, takeMVar, putMVar, readMVar) import System.IO.Unsafe (unsafePerformIO) import Data.FiniteMap (FiniteMap, emptyFM, addToFM, delFromFM, lookupFM, elemFM) +import System.Glib.FFI import Graphics.UI.Gtk.Abstract.Object (makeNewObject) import Graphics.UI.Gtk.Types import Graphics.UI.Gtk.Abstract.Widget (widgetSetName, onUnrealize) @@ -83,7 +82,7 @@ let wId = (mkWidgetId name) table <- takeMVar widgetTable putMVar widgetTable (addToFM table wId - ((unsafeForeignPtrToPtr.unWidget.toWidget) w)) + ((foreignPtrToPtr.unWidget.toWidget) w)) w `onUnrealize` (do table <- takeMVar widgetTable putMVar widgetTable (table `delFromFM` wId)) |