[wxhaskell-devel] darcs patch: Clean up #ifdef wxUSE_UNICODE flag by wx... (and 3 more)

[shelarcy <she...@gm...>]

DarcsURL: C:/home/shelarcy/wxhaskell
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=_"

--=_
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Fri Apr 25 14:14:04 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008  shelarcy <shelarc=
y...@gm...>
  * Clean up #ifdef wxUSE_UNICODE flag by wxStrdup function.

Fri Apr 25 14:41:52 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008  shelarcy <shelarc=
y...@gm...>
  * Clean up wxWindows class's function declaration.

Fri Apr 25 19:24:16 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008  shelarcy <shelarc=
y...@gm...>
  * Fix: dists dropped two samples in samples/wx direcotory.

Fri Apr 25 20:49:09 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008  shelarcy <shelarc=
y...@gm...>
  * Change Var type synonym from IORef to stm's TVar for thread safety.

--=_
Content-Type: text/x-darcs-patch; name="clean-up-_ifdef-wxuse_unicode-flag-by-wxstrdup-function_.dpatch"
Content-Transfer-Encoding: quoted-printable
Content-Description: A darcs patch for your repository!


New patches:

[Clean up #ifdef wxUSE_UNICODE flag by wxStrdup function.
shelarcy <she...@gm...>**20080425051404] {
hunk ./wxc/src/eljvalidator.cpp 158
-#ifdef wxUSE_UNICODE=0D
hunk ./wxc/src/eljvalidator.cpp 159
-#else=0D
-      items_copy[i] =3D strdup(items.Item(i).GetData());=0D
-#endif=0D
hunk ./wxc/src/eljvalidator.cpp 187
-#ifdef wxUSE_UNICODE=0D
hunk ./wxc/src/eljvalidator.cpp 188
-#else=0D
-      items_copy[i] =3D strdup(items.Item(i).GetData());=0D
-#endif=0D
}

[Clean up wxWindows class's function declaration.
shelarcy <she...@gm...>**20080425054152] {
hunk ./wxc/include/wxc.h 92
-void  wxWindow_GetVirtualSize( TSelf(wxWindow) _obj, TSizeOut(_w,_h) );
-void  wxWindow_SetVirtualSize( TSelf(wxWindow) _obj, TSize(w,h) );
-void  wxWindow_FitInside(TSelf(wxWindow) _obj);=0D
-void  wxWindow_ClientToScreen(TSelf(wxWindow) self, TPoint(x,y), TPointOut=
(sx,sy));=0D
}

[Fix: dists dropped two samples in samples/wx direcotory.
shelarcy <she...@gm...>**20080425102416] {
hunk ./makefile 221
+	samples/wx/ListCtrl.hs \
hunk ./makefile 225
+	samples/wx/Print.hs \
}

[Change Var type synonym from IORef to stm's TVar for thread safety.
shelarcy <she...@gm...>**20080425114909] {
hunk ./configure 661
+# Test if we can include the stm package explicitly
+$hcpkg -s stm > /dev/null 2> /dev/null
+case $? in
+  0) pkgstm=3D"-package stm";;
+  *) pkgstm=3D"";;
+esac
+
hunk ./configure 889
+PKG-STM=3D$pkgstm
hunk ./configure 952
+# behave like Cabal's configuration.
+if test "$pkgcontainers"; then
+  wxcoredepends=3D"base, containers"
+else
+  wxcoredepends=3D"base"
+fi
+
hunk ./configure 993
-depends: base,haskell98
+depends: ${wxcoredepends}, haskell98, stm
hunk ./configure 1016
+	Graphics.UI.WX.TopLevelWindow,
hunk ./configure 1025
-depends:wxcore-${version}
+depends: wxcore-${version}, stm
hunk ./makefile 527
-WXCORE-HCFLAGS	=3D$(HCFLAGS) $(PKG-CONTAINERS) -fvia-C -package-name $(WXC=
ORE)-$(VERSION)
+WXCORE-HCFLAGS	=3D$(HCFLAGS) $(PKG-CONTAINERS) $(PKG-STM) -fvia-C -package=
-name $(WXCORE)-$(VERSION)
hunk ./makefile 716
-WX-HCFLAGS	=3D$(HCFLAGS) -fvia-C -package-name $(WX)-$(VERSION) -package $=
(WXCORE)-$(VERSION)
+WX-HCFLAGS	=3D$(HCFLAGS) $(PKG-STM) -fvia-C -package-name $(WX)-$(VERSION)=
 -package $(WXCORE)-$(VERSION)
hunk ./wx/src/Graphics/UI/WX/Variable.hs 17
-import Data.IORef
+import Control.Concurrent.STM.TVar
hunk ./wx/src/Graphics/UI/WX/Variable.hs 25
-instance Valued IORef where
+instance Valued TVar where
hunk ./wx/wx.cabal 19
-        build-depends: base >=3D 3, wxcore >=3D 0.10.1
+        build-depends: base >=3D 3, wxcore >=3D 0.10.1, stm
hunk ./wx/wx.cabal 21
-        build-depends: base <  3, wxcore >=3D 0.10.1
+        build-depends: base <  3, wxcore >=3D 0.10.1, stm
hunk ./wxcore/src/Graphics/UI/WXCore/Types.hs 89
-import Data.IORef
+import Control.Concurrent.STM
hunk ./wxcore/src/Graphics/UI/WXCore/Types.hs 199
-type Var a  =3D IORef a
+type Var a  =3D TVar a
hunk ./wxcore/src/Graphics/UI/WXCore/Types.hs 203
-varCreate x    =3D newIORef x
+varCreate x    =3D newTVarIO x
hunk ./wxcore/src/Graphics/UI/WXCore/Types.hs 207
-varGet v    =3D readIORef v
+varGet v    =3D atomically $ readTVar v
hunk ./wxcore/src/Graphics/UI/WXCore/Types.hs 211
-varSet v x =3D writeIORef v x
+varSet v x =3D atomically $ writeTVar v x
hunk ./wxcore/src/Graphics/UI/WXCore/Types.hs 215
-varSwap v x =3D do prev <- varGet v; varSet v x; return prev
+varSwap v x =3D atomically $ do
+                   prev <- readTVar v
+                   writeTVar v x
+                   return prev
hunk ./wxcore/src/Graphics/UI/WXCore/Types.hs 222
-varUpdate v f =3D do x <- varGet v
-                   varSet v (f x)
+varUpdate v f =3D atomically $ do
+                   x <- readTVar v
+                   writeTVar v (f x)
hunk ./wxcore.cabal 17
-        build-depends: base >=3D 3, parsec, array, containers, directory, =
old-time, time
+        build-depends: base >=3D 3, array, containers, directory,
+                       parsec, old-time, time, stm
hunk ./wxcore.cabal 20
-        build-depends: base <  3, parsec, time
+        build-depends: base <  3, parsec, time, stm
}

Context:

[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:
e27d73f5edd4c5a80d6a2f9a515d6deb3b515127

--=_--

.