Get rid of existential Widget type and Widget lists

1 files changed, 4 insertions, 14 deletions

diff --git a/lib/Phi/Widgets/Systray.hs b/lib/Phi/Widgets/Systray.hs
index e9311de..6812018 100644
--- a/lib/Phi/Widgets/Systray.hs
+++ b/lib/Phi/Widgets/Systray.hs
@@ -35,19 +35,9 @@ import Phi.Widget
 import Phi.X11.Atoms
 
 
-instance Show Display where
-  show _ = "Display <?>"
-
-instance Show Phi where
-  show _ = "Phi <?>"
-
-instance Show (IORef a) where
-  show _ = "IORef <?>"
-
-
 data SystrayIconState = SystrayIconState !Window !Window deriving Show
 
-data SystrayState = SystrayState !Phi !Rectangle !Int !(IORef Int) ![SystrayIconState] deriving Show
+data SystrayState = SystrayState !Phi !Rectangle !Int !(IORef Int) ![SystrayIconState]
 instance Eq SystrayState where
   _ == _ = False
 
@@ -57,7 +47,7 @@ data SystrayMessage = AddIcon !Window !Window | RemoveIcon !Window | RenderIcon
                       deriving (Show, Typeable)
 
 
-instance WidgetClass Systray SystrayState where
+instance Widget Systray SystrayState where
   initWidget (Systray) phi dispvar = do
     phi' <- dupPhi phi
     forkIO $ systrayRunner phi' dispvar
@@ -298,5 +288,5 @@ removeIcon phi disp reparent window = do
       return ()
 
 
-systray :: Widget
-systray = Widget $ Systray
+systray :: Systray
+systray = Systray