[Fencommits] fenfire-hs: swap parameter types as in the patch Duncan Coutts applied to gtk2hs

[Benja Fallenstein]

Thu Feb 15 17:46:14 EET 2007  Benja Fallenstein <benja.fallenstein at gmail.com>
  * swap parameter types as in the patch Duncan Coutts applied to gtk2hs
diff -rN -u old-fenfire-hs/Fenfire.fhs new-fenfire-hs/Fenfire.fhs
--- old-fenfire-hs/Fenfire.fhs	2007-02-15 17:46:32.000000000 +0200
+++ new-fenfire-hs/Fenfire.fhs	2007-02-15 17:46:32.000000000 +0200
@@ -625,12 +625,12 @@
     window <- windowNew
     style <- widgetGetStyle window
 
-    bgColor <- styleGetBackground StateSelected style
-    blurBgColor <- styleGetBackground StateActive style
-    focusColor <- styleGetBase StateSelected style
-    blurColor <- styleGetBase StateActive style
-    textColor <- styleGetText StateSelected style
-    blurTextColor <- styleGetText StateActive style
+    bgColor <- styleGetBackground style StateSelected
+    blurBgColor <- styleGetBackground style StateActive
+    focusColor <- styleGetBase style StateSelected
+    blurColor <- styleGetBase style StateActive
+    textColor <- styleGetText style StateSelected
+    blurTextColor <- styleGetText style StateActive
 
     let alpha x (Color r g b a) = Color r g b (x*a)
 
diff -rN -u old-fenfire-hs/GtkFixes.hs new-fenfire-hs/GtkFixes.hs
--- old-fenfire-hs/GtkFixes.hs	2007-02-15 17:46:32.000000000 +0200
+++ new-fenfire-hs/GtkFixes.hs	2007-02-15 17:46:32.000000000 +0200
@@ -53,34 +53,34 @@
   gtk_widget_get_style :: ((Ptr Widget) -> (IO (Ptr Style)))
 
 -- from Structs.hs generated from Benja's style patch to gtk2hs:
-styleGetForeground :: StateType -> Style -> IO Color
-styleGetForeground ty st = withForeignPtr (unStyle st) $ \stPtr -> do
+styleGetForeground :: Style -> StateType -> IO Color
+styleGetForeground st ty = withForeignPtr (unStyle st) $ \stPtr -> do
   peek $ advancePtr ((\hsc_ptr -> hsc_ptr `plusPtr` 12) stPtr) (fromEnum ty)
 
-styleGetBackground :: StateType -> Style -> IO Color
-styleGetBackground ty st = withForeignPtr (unStyle st) $ \stPtr ->
+styleGetBackground :: Style -> StateType -> IO Color
+styleGetBackground st ty = withForeignPtr (unStyle st) $ \stPtr ->
   peek $ advancePtr ((\hsc_ptr -> hsc_ptr `plusPtr` 72) stPtr) (fromEnum ty)
 
-styleGetLight :: StateType -> Style -> IO Color
-styleGetLight ty st = withForeignPtr (unStyle st) $ \stPtr ->
+styleGetLight :: Style -> StateType -> IO Color
+styleGetLight st ty = withForeignPtr (unStyle st) $ \stPtr ->
   peek $ advancePtr ((\hsc_ptr -> hsc_ptr `plusPtr` 132) stPtr) (fromEnum ty)
 
-styleGetMiddle :: StateType -> Style -> IO Color
-styleGetMiddle ty st = withForeignPtr (unStyle st) $ \stPtr ->
+styleGetMiddle :: Style -> StateType -> IO Color
+styleGetMiddle st ty = withForeignPtr (unStyle st) $ \stPtr ->
   peek $ advancePtr ((\hsc_ptr -> hsc_ptr `plusPtr` 252) stPtr) (fromEnum ty)
 
-styleGetDark :: StateType -> Style -> IO Color
-styleGetDark ty st = withForeignPtr (unStyle st) $ \stPtr ->
+styleGetDark :: Style -> StateType -> IO Color
+styleGetDark st ty = withForeignPtr (unStyle st) $ \stPtr ->
   peek $ advancePtr ((\hsc_ptr -> hsc_ptr `plusPtr` 192) stPtr) (fromEnum ty)
 
-styleGetText :: StateType -> Style -> IO Color
-styleGetText ty st = withForeignPtr (unStyle st) $ \stPtr ->
+styleGetText :: Style -> StateType -> IO Color
+styleGetText st ty = withForeignPtr (unStyle st) $ \stPtr ->
   peek $ advancePtr ((\hsc_ptr -> hsc_ptr `plusPtr` 312) stPtr) (fromEnum ty)
 
-styleGetBase :: StateType -> Style -> IO Color
-styleGetBase ty st = withForeignPtr (unStyle st) $ \stPtr ->
+styleGetBase :: Style -> StateType -> IO Color
+styleGetBase st ty = withForeignPtr (unStyle st) $ \stPtr ->
   peek $ advancePtr ((\hsc_ptr -> hsc_ptr `plusPtr` 372) stPtr) (fromEnum ty)
 
-styleGetAntiAliasing :: StateType -> Style -> IO Color
-styleGetAntiAliasing ty st = withForeignPtr (unStyle st) $ \stPtr ->
+styleGetAntiAliasing :: Style -> StateType -> IO Color
+styleGetAntiAliasing st ty = withForeignPtr (unStyle st) $ \stPtr ->
   peek $ advancePtr ((\hsc_ptr -> hsc_ptr `plusPtr` 432) stPtr) (fromEnum ty)