wxdirect 0.92.0.0 → 0.92.1.0

raw patch · 4 files changed

+26/−19 lines, 4 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• src/CompileClassInfo.hs +5/−5
• src/CompileClasses.hs +3/−2
• src/HaskellNames.hs +16/−10
• wxdirect.cabal +2/−2

@@ -60,10 +60,10 @@                                 , "-- | Test if an object is of a certain kind. (Returns also 'True' when the object is null.)"
                                 , "{-# NOINLINE instanceOf #-}"
                                 , "instanceOf :: WxObject b -> ClassType a -> Bool"
-                                , "instanceOf obj (ClassType classInfo) "
+                                , "instanceOf obj (ClassType classInfo') "
                                 , "  = if (objectIsNull obj)"
                                 , "     then True"
-                                , "     else unsafePerformIO (objectIsKindOf obj classInfo)"
+                                , "     else unsafePerformIO (objectIsKindOf obj classInfo')"
                                 , ""
                                 , "-- | Test if an object is of a certain kind, based on a full wxWidgets class name. (Use with care)."
                                 , "{-# NOINLINE instanceOfName #-}"
@@ -72,10 +72,10 @@                                 , "  = if (objectIsNull obj)"
                                 , "     then True"
                                 , "     else unsafePerformIO ("
-                                , "          do classInfo <- classInfoFindClass className"
-                                , "             if (objectIsNull classInfo)"
+                                , "          do classInfo'   <- classInfoFindClass className"
+                                , "             if (objectIsNull classInfo')"
                                 , "              then return False" 
-                                , "              else objectIsKindOf obj classInfo)"
+                                , "              else objectIsKindOf obj classInfo')"
                                 , ""
                                 , "-- | A safe object cast. Returns 'Nothing' if the object is of the wrong type. Note that a null object can always be cast."
                                 , "safeCast :: WxObject b -> ClassType (WxObject a) -> Maybe (WxObject a)"

@@ -105,11 +105,12 @@                               , exportsClassClasses
                               , [ "    ) where"
                                 , ""
+                                , "import Prelude hiding (id, last, length, lines, max, min, show)"
                                 , "import qualified Data.ByteString as B (ByteString, useAsCStringLen)"
                                 , "import qualified Data.ByteString.Lazy as LB (ByteString, length, unpack)"
                                 , "import System.IO.Unsafe( unsafePerformIO )"
-                                , "import Foreign.C.Types(CInt(..), CWchar(..), CChar(..), CDouble(..))"
-                                , "import " ++ moduleRoot ++ "WxcTypes"
+                             -- , "import Foreign.C.Types(CInt(..), CWchar(..), CChar(..), CDouble(..))"
+                                , "import " ++ moduleRoot ++ "WxcTypes hiding (rect, rgb, rgba, sz)"
                                 , "import " ++ moduleRoot ++ moduleClassTypesName
                                 , ""
                                 ]

@@ -1,12 +1,13 @@ -----------------------------------------------------------------------------------------
-{-| Module      :  HaskellNames
+{-| 
+    Module      :  HaskellNames
     Copyright   :  (c) Daan Leijen 2003
     License     :  BSD-style
-
+    
     Maintainer  :  wxhaskell-devel@lists.sourceforge.net
     Stability   :  provisional
     Portability :  portable
-
+    
     Utility module to create Haskell compatible names.
 -}
 -----------------------------------------------------------------------------------------
@@ -156,13 +157,14 @@ getPrologue :: String -> String -> String -> [String] -> [String]
 getPrologue moduleName content contains inputFiles
   = [line
-    ,"{-|\tModule      :  " ++ moduleName
-    ,"\tCopyright   :  Copyright (c) Daan Leijen 2003, 2004"
-    ,"\tLicense     :  wxWidgets"
+    ,"{-|"
+    ,"Module      :  " ++ moduleName
+    ,"Copyright   :  Copyright (c) Daan Leijen 2003, 2004"
+    ,"License     :  wxWindows"
     ,""
-    ,"\tMaintainer  :  wxhaskell-devel@lists.sourceforge.net"
-    ,"\tStability   :  provisional"
-    ,"\tPortability :  portable"
+    ,"Maintainer  :  wxhaskell-devel@lists.sourceforge.net"
+    ,"Stability   :  provisional"
+    ,"Portability :  portable"
     ,""
     ,"Haskell " ++ content ++ " definitions for the wxWidgets C library (@wxc.dll@)."
     ,""
@@ -183,9 +185,13 @@     line = replicate 80 '-'
 
     showFile fname
-         = ["","  * @" ++ concatMap escapeSlash fname ++ "@"]
+         = ["","  * @" ++ removeDirName fname ++ "@"]
 
+    removeDirName = reverse . takeWhile (/= '\\') . takeWhile (/= '/') . reverse
+    
+{-
     escapeSlash c
          | c == '/'   = "\\/"
          | c == '\"'  = "\\\""
          | otherwise  = [c]
+-}

@@ -1,5 +1,5 @@ name:         wxdirect
-version:      0.92.0.0
+version:      0.92.1.0
 license:      BSD3
 license-file: LICENSE
 author:       Daan Leijen
@@ -11,7 +11,7 @@   top of wxWidgets, a comprehensive C++ library that is portable across all
   major GUI platforms, including GTK, Windows, X11, and MacOS X. This version
   works with wxWidgets 2.9 and 3.0.
-homepage:     http://haskell.org/haskellwiki/WxHaskell
+homepage:     https://wiki.haskell.org/WxHaskell
 
 cabal-version: >= 1.2
 build-type:    Simple