hoodle is compilable both with gtk2 and with gtk3! gtk2 hoodle works …

…as it is supposed to do!

build.sh

@@ -3,5 +3,5 @@
 # our use cabal-meta
 #
 #    cabal-meta install
-cat sources.txt | xargs cabal install --constraint="gtk > 1.0"  -fgtk3 --force-reinstalls -j  -v
+cat sources.txt | xargs cabal install --force-reinstalls -j 
 

buildgtk3.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# our use cabal-meta
+#
+#    cabal-meta install
+cat sources.txt | xargs cabal install --constraint="gtk > 1.0"  -fgtk3 --force-reinstalls -j  -v
+

hoodle-core/csrc/c_initdevice.c

@@ -2,10 +2,11 @@
 #include <stdio.h>
 #include <string.h>
 
+#ifndef GTK3
+#include "XInput.h"
+#endif // GTK3
 
-// #include "XInput.h"
-
-/*
+#ifndef GTK3
 //
 // Globals.
 //
@@ -114,9 +115,9 @@ static bool xinput_findDevices(Display *display, XDeviceInfo *stylus_info, XDevi
 
   return (found == 2);
 }
-*/
 
-/*
+
+
 void find_wacom( char* stylus_name, char* eraser_name) 
 {
   Display *display = XOpenDisplay(NULL); 
@@ -138,7 +139,7 @@ void find_wacom( char* stylus_name, char* eraser_name)
   }
   return ; 
 }
-*/
+#endif // not GTK3
 
 void initdevice ( int* core
                 , int* stylus
@@ -156,10 +157,14 @@ void initdevice ( int* core
 
   GList* dev_list;
   GdkDevice* device;
+#ifdef GTK3
   GdkDisplay* disp = gdk_display_get_default();
   GdkDeviceManager *devman = gdk_display_get_device_manager(disp);
 
   dev_list = gdk_device_manager_list_devices(devman, GDK_DEVICE_TYPE_SLAVE );
+#else // GTK3
+  dev_list = gdk_devices_list();
+#endif // GTK3
   (*stylus) = 0;
   while (dev_list != NULL) {
     device = (GdkDevice *)dev_list->data;
@@ -184,22 +189,24 @@ void initdevice ( int* core
         (*core) = (int) device; 
       } 
     } 
+#ifdef GTK3
     dev_list = g_list_next(dev_list); 
+#else // GTK3
+    dev_list = dev_list->next;
+#endif // GTK3
   }
 
 }
 
-/*
+#ifndef GTK3
 void enable_touch( char* touch_name ) 
 {
   printf("enable touch: %s\n", touch_name ) ; 
 }
-*/
 
- /*
 void disable_touch( GdkDrawable *gdkwin, char* touch_name ) 
 {
   printf("disable touch: %s\n", touch_name ); 
 
 }
-*/
+#endif // GTK3

hoodle-core/src/Hoodle/GUI.hs

@@ -69,9 +69,9 @@ startGUI mfname mhook = do
     -- 
     let canvases = map (getDrawAreaFromBox) . M.elems . view (unitHoodles.currentUnit.cvsInfoMap) $ st0
 #ifndef GTK3      
-  if xinputbool
-      then mapM_ (flip Gtk.widgetSetExtensionEvents [Gtk.ExtensionEventsAll]) canvases
-      else mapM_ (flip Gtk.widgetSetExtensionEvents [Gtk.ExtensionEventsNone]) canvases
+    if xinputbool
+        then mapM_ (flip Gtk.widgetSetExtensionEvents [Gtk.ExtensionEventsAll]) canvases
+        else mapM_ (flip Gtk.widgetSetExtensionEvents [Gtk.ExtensionEventsNone]) canvases
 #endif // not GTK3
     --
     outerLayout ui vbox st0 

hoodle-core/src/Hoodle/ModelAction/Layer.hs

@@ -54,7 +54,7 @@ layerChooseDialog layernumref cidx len = do
     Gtk.containerAdd upper hbox
 #else // GTK3
     upper <- Gtk.dialogGetUpper dialog
-    Gtk.boxPackStart upper hbox PackNatural 0 
+    Gtk.boxPackStart upper hbox Gtk.PackNatural 0 
 #endif // GTK3
     Gtk.boxPackStart hbox layerentry Gtk.PackNatural 0 
     Gtk.boxPackStart hbox label Gtk.PackGrow 0 

hoodle-core/src/Hoodle/ModelAction/Window.hs

@@ -180,16 +180,16 @@ connectDefaultEventCanvasInfo xstate _uhdl cinfo = do
                       case x of 
                         [] -> error "No action group? "
                         y:_ -> return y )
-    uxinputa <- liftIO (Gtk.actionGroupGetAction agr "UXINPUTA" >>= \(Just x) -> 
+    uxinputa <- liftIO (Gtk.actionGroupGetAction agr ("UXINPUTA" :: String) >>= \(Just x) -> 
                           return (Gtk.castToToggleAction x) )
     b <- liftIO $ Gtk.toggleActionGetActive uxinputa
 #ifdef GTK3    
 #else // GTK3
     if b then Gtk.widgetSetExtensionEvents canvas [Gtk.ExtensionEventsAll]
          else Gtk.widgetSetExtensionEvents canvas [Gtk.ExtensionEventsNone]
 #endif // GTK3
-    hadjconnid <- afterValueChanged hadj $ do 
-                    v <- adjustmentGetValue hadj 
+    hadjconnid <- Gtk.afterValueChanged hadj $ do 
+                    v <- Gtk.adjustmentGetValue hadj 
                     (callback . UsrEv) (HScrollBarMoved cid v)
     vadjconnid <- Gtk.afterValueChanged vadj $ do 
                     v <- Gtk.adjustmentGetValue vadj     

hoodle-core/src/Hoodle/View/Draw.hs

@@ -354,7 +354,7 @@ drawContPageGen render = ContPageDraw func
 #ifdef GTK3          
           Just win <- Gtk.widgetGetWindow canvas
 #else // GTK3
-          win <- widgetGetDrawWindow canvas
+          win <- Gtk.widgetGetDrawWindow canvas
 #endif // GTK3
           let ibboxnew = getViewableBBox geometry mbbox 
           let mbboxnew = toMaybe ibboxnew 

hoodle-extra/exe/idfilepathdb.hs

@@ -47,7 +47,7 @@ import           Text.Hoodle.Parse.Attoparsec
 import           Hoodle.Manage.Connect
 import           Hoodle.Manage.DocDatabase
 import           DiffDB
-import           Migrate
+-- import           Migrate
 import qualified Hoodle.Manage.SqliteDB as SqliteDB
 import qualified TextFileDB
 import           Util

hoodle-extra/hoodle-extra.cabal

@@ -116,7 +116,7 @@ Executable idfilepathdb
                    hoodle-extra
 
   Other-modules:   DiffDB
-                   Migrate
+                   -- Migrate
                    TextFileDB
                    Util
 

hoodle-extra/lib/Hoodle/Manage/DocDatabase.hs

@@ -1,6 +1,8 @@
 {-# LANGUAGE EmptyDataDecls #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE GADTs #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE QuasiQuotes #-}
 {-# LANGUAGE TemplateHaskell #-}