Merge pull request #56 from rcook/p-rcook-issue-55

Fixes #55: Add Mac OS X application initialization to enable support …

Author: Mikolaj

GUI/App.hs

@@ -0,0 +1,39 @@
+{-# LANGUAGE CPP #-}
+
+-------------------------------------------------------------------------------
+-- | Module : GUI.App
+--
+-- Platform-specific application functionality
+-------------------------------------------------------------------------------
+
+module GUI.App (initApp) where
+
+-- Imports for GTK
+import qualified Graphics.UI.Gtk as Gtk
+
+-- Mac OS X-specific GTK imports
+#if defined(darwin_HOST_OS)
+import qualified Graphics.UI.Gtk.OSX as OSX
+#endif
+
+-------------------------------------------------------------------------------
+
+#if defined(darwin_HOST_OS)
+
+-- | Initialize application
+-- Perform Mac OS X-specific application initialization
+initApp :: IO ()
+initApp = do
+  app <- OSX.applicationNew
+  menuBar <- Gtk.menuBarNew
+  OSX.applicationSetMenuBar app menuBar
+  OSX.applicationReady app
+
+#else
+
+-- | Initialize application
+-- Perform application initialization for non-Mac OS X platforms
+initApp :: IO ()
+initApp = return ()
+
+#endif

GUI/Main.hs

@@ -21,6 +21,7 @@ import Data.Maybe
 import Paths_threadscope
 
 -- Imports for ThreadScope
+import qualified GUI.App as App
 import qualified GUI.MainWindow as MainWindow
 import GUI.Types
 import Events.HECs hiding (Event)
@@ -445,6 +446,8 @@ runGUI :: Maybe (Either FilePath String) -> IO ()
 runGUI initialTrace = do
   Gtk.initGUI
 
+  App.initApp
+
   uiEnv <- constructUI
 
   let post = postEvent (eventQueue uiEnv)

threadscope.cabal

@@ -48,6 +48,9 @@ Executable threadscope
                      deepseq >= 1.1,
                      text,
                      time >= 1.1
+  if os(osx)
+    build-depends:   gtk-mac-integration
+
   Extensions:        RecordWildCards, NamedFieldPuns, BangPatterns, PatternGuards
   Other-Modules:     Events.HECs,
                      Events.EventDuration,
@@ -56,6 +59,7 @@ Executable threadscope
                      Events.SparkStats,
                      Events.SparkTree,
                      Events.TestEvents,
+                     GUI.App,
                      GUI.Main,
                      GUI.MainWindow,
                      GUI.EventsView,