Menu
▾
▴
[wxhaskell-devel] darcs patch: Fix a bug in haddock documentation struc... (and 4 more)
|
From: shelarcy <she...@gm...> - 2008-06-23 15:43:11
|
DarcsURL: C:/home/shelarcy/wxhaskell
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=_"
--=_
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
Thu May 29 20:14:15 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008 shelarcy <shelarc=
y...@gm...>
* Fix a bug in haddock documentation structure of Rectangle.
Thu May 29 21:02:34 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008 shelarcy <shelarc=
y...@gm...>
* Remove unused make before-dist.
Fri May 30 11:47:30 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008 shelarcy <shelarc=
y...@gm...>
* Use CDouble and realToFrac instead of marshaling Double type directly.
Sat May 31 20:40:50 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008 shelarcy <shelarc=
y...@gm...>
* Add --enable-optimization opition for building library with optimizatio=
n flags.
Tue Jun 24 00:22:56 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008 shelarcy <shelarc=
y...@gm...>
* Partialy fix a bug in wxhaskell-register.bat.
--=_
Content-Type: text/x-darcs-patch; name="fix-a-bug-in-haddock-documentation-structure-of-rectangle_.dpatch"
Content-Transfer-Encoding: quoted-printable
Content-Description: A darcs patch for your repository!
New patches:
[Fix a bug in haddock documentation structure of Rectangle.
shelarcy <she...@gm...>**20080529111415] {
hunk ./wxcore/src/Graphics/UI/WXCore/WxcTypes.hs 43
- -- * Rectangle
+ -- ** Rectangle
}
[Remove unused make before-dist.
shelarcy <she...@gm...>**20080529120234] {
hunk ./makefile 28
- @echo " before-dist uninstall wxcore files, and make wxcore again"
hunk ./makefile 338
-before-dist: wxcore-unregister wxcore-uninstall-files wxcore
-
}
[Use CDouble and realToFrac instead of marshaling Double type directly.
shelarcy <she...@gm...>**20080530024730] {
hunk ./wxcore/src/Graphics/UI/WXCore/WxcTypes.hs 54
- , withPointDoubleResult, withCPointDouble
+ , withPointDoubleResult, toCDoublePointX, toCDoublePointY, fro=
mCPointDouble, withCPointDouble
hunk ./wxcore/src/Graphics/UI/WXCore/WxcTypes.hs 56
- , withSizeDoubleResult, withCSizeDouble
+ , withSizeDoubleResult, toCDoubleSizeW, toCDoubleSizeH, fromCS=
izeDouble, withCSizeDouble
hunk ./wxcore/src/Graphics/UI/WXCore/WxcTypes.hs 58
- , withVectorDoubleResult, withCVectorDouble
+ , withVectorDoubleResult, toCDoubleVectorX, toCDoubleVectorY, =
fromCVectorDouble, withCVectorDouble
hunk ./wxcore/src/Graphics/UI/WXCore/WxcTypes.hs 60
- , withRectDoubleResult, withCRectDouble
+ , withRectDoubleResult, toCDoubleRectX, toCDoubleRectY, toCDou=
bleRectW, toCDoubleRectH, fromCRectDouble, withCRectDouble
hunk ./wxcore/src/Graphics/UI/WXCore/WxcTypes.hs 98
+ -- *** CDouble
+ , CDouble, toCDouble, fromCDouble, withDoubleResult
hunk ./wxcore/src/Graphics/UI/WXCore/WxcTypes.hs 256
-withCPointDouble :: Point2 Double -> (Double -> Double -> IO a) -> IO a
+withCPointDouble :: Point2 Double -> (CDouble -> CDouble -> IO a) -> IO a
hunk ./wxcore/src/Graphics/UI/WXCore/WxcTypes.hs 258
- =3D f x y
+ =3D f (toCDouble x) (toCDouble y)
hunk ./wxcore/src/Graphics/UI/WXCore/WxcTypes.hs 260
-withPointDoubleResult :: (Ptr Double -> Ptr Double -> IO ()) -> IO (Point2=
Double)
+withPointDoubleResult :: (Ptr CDouble -> Ptr CDouble -> IO ()) -> IO (Poin=
t2 Double)
hunk ./wxcore/src/Graphics/UI/WXCore/WxcTypes.hs 267
- return (Point x y)
+ return (fromCPointDouble x y)
+
+toCDoublePointX, toCDoublePointY :: Point2 Double -> CDouble
+toCDoublePointX (Point x y) =3D toCDouble x
+toCDoublePointY (Point x y) =3D toCDouble y
+
+fromCPointDouble :: CDouble -> CDouble -> Point2 Double
+fromCPointDouble x y
+ =3D Point (fromCDouble x) (fromCDouble y)
hunk ./wxcore/src/Graphics/UI/WXCore/WxcTypes.hs 341
-withCSizeDouble :: Size2D Double -> (Double -> Double -> IO a) -> IO a
-withCSizeDouble (Size x y) f
- =3D f x y
+withCSizeDouble :: Size2D Double -> (CDouble -> CDouble -> IO a) -> IO a
+withCSizeDouble (Size w h) f
+ =3D f (toCDouble w) (toCDouble h)
hunk ./wxcore/src/Graphics/UI/WXCore/WxcTypes.hs 345
-withSizeDoubleResult :: (Ptr Double -> Ptr Double -> IO ()) -> IO (Size2D =
Double)
+withSizeDoubleResult :: (Ptr CDouble -> Ptr CDouble -> IO ()) -> IO (Size2=
D Double)
hunk ./wxcore/src/Graphics/UI/WXCore/WxcTypes.hs 347
- =3D alloca $ \px ->
- alloca $ \py ->
- do f px py
- x <- peek px
- y <- peek py
- return (Size x y)
+ =3D alloca $ \cw ->
+ alloca $ \ch ->
+ do f cw ch
+ w <- peek cw
+ h <- peek ch
+ return (fromCSizeDouble w h)
+
+fromCSizeDouble :: CDouble -> CDouble -> Size2D Double
+fromCSizeDouble w h
+ =3D Size (fromCDouble w) (fromCDouble h)
+
+toCDoubleSizeW, toCDoubleSizeH :: Size2D Double -> CDouble
+toCDoubleSizeW (Size w h) =3D toCDouble w
+toCDoubleSizeH (Size w h) =3D toCDouble h
hunk ./wxcore/src/Graphics/UI/WXCore/WxcTypes.hs 425
-withCVectorDouble :: Vector2 Double -> (Double -> Double -> IO a) -> IO a
+withCVectorDouble :: Vector2 Double -> (CDouble -> CDouble -> IO a) -> IO =
a
hunk ./wxcore/src/Graphics/UI/WXCore/WxcTypes.hs 427
- =3D f x y
+ =3D f (toCDouble x) (toCDouble y)
hunk ./wxcore/src/Graphics/UI/WXCore/WxcTypes.hs 429
-withVectorDoubleResult :: (Ptr Double -> Ptr Double -> IO ()) -> IO (Vecto=
r2 Double)
+withVectorDoubleResult :: (Ptr CDouble -> Ptr CDouble -> IO ()) -> IO (Vec=
tor2 Double)
hunk ./wxcore/src/Graphics/UI/WXCore/WxcTypes.hs 436
- return (Vector x y)
+ return (fromCVectorDouble x y)
+
+toCDoubleVectorX, toCDoubleVectorY :: Vector2 Double -> CDouble
+toCDoubleVectorX (Vector x y) =3D toCDouble x
+toCDoubleVectorY (Vector x y) =3D toCDouble y
+
+fromCVectorDouble :: CDouble -> CDouble -> Vector2 Double
+fromCVectorDouble x y
+ =3D Vector (fromCDouble x) (fromCDouble y)
hunk ./wxcore/src/Graphics/UI/WXCore/WxcTypes.hs 539
-withCRectDouble :: Rect2D Double -> (Double -> Double -> Double -> Double =
-> IO a) -> IO a
+withCRectDouble :: Rect2D Double -> (CDouble -> CDouble -> CDouble -> CDou=
ble -> IO a) -> IO a
hunk ./wxcore/src/Graphics/UI/WXCore/WxcTypes.hs 541
- =3D f x0 y0 x1 y1
+ =3D f (toCDouble (x0)) (toCDouble (y0)) (toCDouble (x1)) (toCDouble (y1)=
)
hunk ./wxcore/src/Graphics/UI/WXCore/WxcTypes.hs 543
-withRectDoubleResult :: (Ptr Double -> Ptr Double -> Ptr Double -> Ptr Dou=
ble -> IO ()) -> IO (Rect2D Double)
+withRectDoubleResult :: (Ptr CDouble -> Ptr CDouble -> Ptr CDouble -> Ptr =
CDouble -> IO ()) -> IO (Rect2D Double)
hunk ./wxcore/src/Graphics/UI/WXCore/WxcTypes.hs 554
- return (Rect x y w h)
+ return (fromCRectDouble x y w h)
+
+fromCRectDouble :: CDouble -> CDouble -> CDouble -> CDouble -> Rect2D Doub=
le
+fromCRectDouble x y w h
+ =3D Rect (fromCDouble x) (fromCDouble y) (fromCDouble w) (fromCDouble h)
+
+toCDoubleRectX, toCDoubleRectY, toCDoubleRectW, toCDoubleRectH :: Rect2D D=
ouble -> CDouble
+toCDoubleRectX (Rect x y w h) =3D toCDouble x
+toCDoubleRectY (Rect x y w h) =3D toCDouble y
+toCDoubleRectW (Rect x y w h) =3D toCDouble w
+toCDoubleRectH (Rect x y w h) =3D toCDouble h
hunk ./wxcore/src/Graphics/UI/WXCore/WxcTypes.hs 581
+{-------------------------------------------------------------------------=
----------------
+ CDouble
+--------------------------------------------------------------------------=
---------------}
+withDoubleResult :: IO CDouble -> IO Double
+withDoubleResult io
+ =3D do x <- io
+ return (fromCDouble x)
+
+toCDouble :: Double -> CDouble
+toCDouble d =3D realToFrac d
+
+fromCDouble :: CDouble -> Double
+fromCDouble cd
+ =3D realToFrac cd
+
hunk ./wxdirect/src/CompileClasses.hs 442
- Point CDouble -> pparens ("pointX " ++ name) ++ " " ++ pparens( "poi=
ntY " ++ name)
+ Point CDouble -> pparens ("toCDoublePointX " ++ name) ++ " " ++ ppar=
ens( "toCDoublePointY " ++ name)
hunk ./wxdirect/src/CompileClasses.hs 444
- Vector CDouble -> pparens ("vecX " ++ name) ++ " " ++ pparens( "vecY=
" ++ name)
+ Vector CDouble -> pparens ("toCDoubleVectorX " ++ name) ++ " " ++ pp=
arens( "toCDoubleVectorY " ++ name)
hunk ./wxdirect/src/CompileClasses.hs 446
- Size CDouble -> pparens ("sizeW " ++ name) ++ " " ++ pparens( "sizeH=
" ++ name)
+ Size CDouble -> pparens ("toCDoubleSizeW " ++ name) ++ " " ++ pparen=
s( "toCDoubleSizeH " ++ name)
hunk ./wxdirect/src/CompileClasses.hs 448
- Rect CDouble -> pparens ("rectLeft " ++ name) ++ " " ++ pparens( "re=
ctTop " ++ name)
- ++ pparens ("rectWidth " ++ name) ++ " " ++ pparens( "r=
ectHeight " ++ name)
+ Rect CDouble -> pparens ("toCDoubleRectX " ++ name) ++ " " ++ pparen=
s( "toCDoubleRectY " ++ name)
+ ++ pparens ("toCDoubleRectW " ++ name) ++ " " ++ pparen=
s( "toCDoubleRectH " ++ name)
hunk ./wxdirect/src/CompileClasses.hs 602
- Point CDouble -> "Ptr Double -> Ptr Double -> IO ()"
+ Point CDouble -> "Ptr CDouble -> Ptr CDouble -> IO ()"
hunk ./wxdirect/src/CompileClasses.hs 606
- Size CDouble -> "Ptr Double -> Ptr Double -> IO ()"
+ Size CDouble -> "Ptr CDouble -> Ptr CDouble -> IO ()"
hunk ./wxdirect/src/CompileClasses.hs 608
- Rect CDouble -> "Ptr Double -> Ptr Double -> Ptr Double -> Ptr Doubl=
e -> IO ()"
+ Rect CDouble -> "Ptr CDouble -> Ptr CDouble -> Ptr CDouble -> Ptr CD=
ouble -> IO ()"
hunk ./wxdirect/src/CompileClasses.hs 630
- Point CDouble -> "Double -> Double"
+ Point CDouble -> "CDouble -> CDouble"
hunk ./wxdirect/src/CompileClasses.hs 632
- Vector CDouble -> "Double -> Double"
+ Vector CDouble -> "CDouble -> CDouble"
hunk ./wxdirect/src/CompileClasses.hs 634
- Size CDouble -> "Double -> Double"
+ Size CDouble -> "CDouble -> CDouble"
hunk ./wxdirect/src/CompileClasses.hs 637
- Rect CDouble -> "Double -> Double -> Double -> Double"
+ Rect CDouble -> "CDouble -> CDouble -> CDouble -> CDouble"
}
[Add --enable-optimization opition for building library with optimization f=
lags.
shelarcy <she...@gm...>**20080531114050] {
hunk ./configure 360
+ -enable-optimization|--enable-optimization)
+ enableoptimization=3D"yes";;
hunk ./configure 823
+
+if test "$enableoptimization" =3D "yes"; then
+ hcflags=3D"$hcflags -O2"
+fi
}
[Partialy fix a bug in wxhaskell-register.bat.
shelarcy <she...@gm...>**20080623152256] {
hunk ./bin/wxhaskell-register-template.bat 20
-SET installdir=3D%CURDIR%=0D
+SET installdir=3D%CURDIR: =3D^ %=0D
hunk ./bin/wxhaskell-register-template.bat 29
-COPY /Y %installdir%\bin\wx-partial.pkg %installdir%\bin\wx.pkg=0D
-ECHO import-dirs:%installdir%\lib\imports >> %installdir%\bin\wx.pkg=0D
-ECHO library-dirs:%installdir%\lib >> %installdir%\bin\wx.pkg=0D
-COPY /Y %installdir%\bin\wxcore-partial.pkg %installdir%\bin\wxcore.pkg=0D
-ECHO import-dirs:%installdir%\lib\imports >> %installdir%\bin\wxcore.pkg=
=0D
-ECHO library-dirs:%installdir%\lib >> %installdir%\bin\wxcore.pkg=
=0D
+COPY /Y "%installdir%\bin\wx-partial.pkg" "%installdir%\bin\wx.pkg"=0D
+ECHO import-dirs:%installdir%\lib\imports >> "%installdir%\bin\wx.pkg"=0D
+ECHO library-dirs:%installdir%\lib >> "%installdir%\bin\wx.pkg"=0D
+COPY /Y "%installdir%\bin\wxcore-partial.pkg" "%installdir%\bin\wxcore.pkg=
"=0D
+ECHO import-dirs:%installdir%\lib\imports >> "%installdir%\bin\wxcore.pkg"=
=0D
+ECHO library-dirs:%installdir%\lib >> "%installdir%\bin\wxcore.pkg"=
=0D
hunk ./bin/wxhaskell-register-template.bat 51
-COPY %installdir%\lib\%wxclibname%.dll %WINDIR%\system\%wxclibname%.dll=0D
+COPY "%installdir%\lib\%wxclibname%.dll" %WINDIR%\system\%wxclibname%.dll=
=0D
hunk ./bin/wxhaskell-register-template.bat 56
-COPY %installdir%\lib\%wxclibname%.dll %WINDIR%\system32\%wxclibname%.dll=
=0D
+COPY "%installdir%\lib\%wxclibname%.dll" %WINDIR%\system32\%wxclibname%.dl=
l=0D
}
Context:
[Use putTraceMsg instead of hPutStrLn for Windows GUI-only program.
shelarcy <she...@gm...>**20080526070627] =
[Add very experimental wxGraphicsContext support.
shelarcy <she...@gm...>**20080526063228] =
[Change Point, Size, Vector and Rect to be type synonym for adding wxGraphi=
csContext support.
shelarcy <she...@gm...>**20080526055033] =
[Fix: wxSound isn't managed object.
shelarcy <she...@gm...>**20080524021436] =
[Remove wxWidgets 2.4.x's wxWave code.
shelarcy <she...@gm...>**20080430002921] =
[Remove Wave type synonym.
shelarcy <she...@gm...>**20080429233348] =
[Change samples/contrib/PaintDirect to use withPixelBuffer instead of image=
GetPixelBuffer.
shelarcy <she...@gm...>**20080429232026] =
[Change imageGetPixelArray and imageCreateFromPixelArray to be more flexibl=
e.
shelarcy <she...@gm...>**20080429183518] =
[Fix: some samples don't run because of using undefined function since wxWi=
dgets 2.8.x support.
shelarcy <she...@gm...>**20080429145931] =
[Add note about defaultButton's incompatible change since wxWidgets 2.8.x s=
upport.
shelarcy <she...@gm...>**20080429141545] =
[Change Var type synonym from IORef to stm's TVar for thread safety.
shelarcy <she...@gm...>**20080425114909] =
[Fix: dists dropped two samples in samples/wx direcotory.
shelarcy <she...@gm...>**20080425102416] =
[Clean up wxWindows class's function declaration.
shelarcy <she...@gm...>**20080425054152] =
[Clean up #ifdef wxUSE_UNICODE flag by wxStrdup function.
shelarcy <she...@gm...>**20080425051404] =
[Replace _wcsdup with wxStrdup in wxWidgets 2.8 compat code.
Eric Kow <eri...@gm...>**20080420115042
According to shelarcy and Jeremy, _wcsdup is Windows-specific.
] =
[wxWidgets 2.8.7 on 0.10.3 release version
jer...@gm...**20080410134132] =
[TAG wxWidgets2.8.7_on_0.10.3rc1
jer...@gm...**20080410113256] =
[Add TopLevelWindow for wxWidgets 2.8.7 support
jer...@gm...**20080410113113] =
[Preliminary wxWidgets 2.8.7 support
jer...@gm...**20080410112559] =
[Shifted to Pavel's Debian build system
Mads Lindstroem <mad...@ya...>**20080413131752
=
I have changed the current Debian build system to the one made by
Pavel Shramov. It is a lot simpler than the current one. Also it is
similar to what can normally be found in the Debian archieve, and I
therefore assume that it will be easier to some day get an offecial
WxHaskell Debian package.
=
All of the files in the debian directory is the work of Pavel.
=
I changed only one thing, as compared to Pavel's version. Namely that
I removed the dependcy on libghc6-time-dev. I did it, as this
dependency makes the package un-buildable on Debian unstable (GHC
6.8). At release 0.10.3, some users requested a GHC 6.8 version, and
it is therefore important that we can provide one.
=
=
] =
[Removed check for Data.Time
Mads Lindstroem <mad...@ya...>**20080413114242
=
Removed the check for Data.Time as it is not needed. I originally
added it as I had somehow overlooked the Debian package
libghc6-time-dev. Sorry about the unneccessary noise :(
=
] =
[Fix: samples/wx/makefile's "make clean" doesn't clean Windows things.
shelarcy <she...@gm...>**20080409133446] =
[Fix 1932640: samples/wx/FileBrowse is broken on Windows. =
shelarcy <she...@gm...>**20080409132157] =
[Add containers package dependency to wxcore.cabal.
shelarcy <she...@gm...>**20080328131307] =
[Remove IntMap from wxcore. Use the containers version instead.
shelarcy <she...@gm...>**20080328131144] =
[Add containers package to wxcore.
shelarcy <she...@gm...>**20080328123744] =
[Remove Set from wxdirect. Use the containers version instead.
Eric Kow <eri...@gm...>**20080322140544] =
[Remove Map from wxdirect. Use the containers version instead.
Eric Kow <eri...@gm...>**20080322140245] =
[Add containers package to wxdirect.
Eric Kow <eri...@gm...>**20080322135933] =
[Split makefile entry for wxdirect containers into separate lines.
Eric Kow <eri...@gm...>**20080322135824
For more independence between patches which remove Map, Set and
MultiSet in favour of the containers version.
] =
[Use string comparison in haddockversion test.
Eric Kow <eri...@gm...>**20080326224059
Again, for the case where haddock is not found.
] =
[Fix bug in configure script if Haddock is not found.
Eric Kow <eri...@gm...>**20080324155706
(discovered by S. Doaitse Swierstra)
] =
[Add wx/license.txt to srcdist (to avoid build error).
Eric Kow <eri...@gm...>**20080323125315] =
[Fix download link typos.
Eric Kow <eri...@gm...>**20080322130605] =
[Kill a broken link (we no longer use CVS).
Eric Kow <eri...@gm...>**20080322125822] =
[Overwrite 0.10.3rc1 news with proper 0.10.3 news.
Eric Kow <eri...@gm...>**20080322125032] =
[TAG 0.10.3
Eric Kow <eri...@gm...>**20080321183613] =
Patch bundle hash:
cc42992c2118a1054d655b0140290df3890dbfe6
--=_--
.
|
