Menu
▾
▴
wxhaskell-devel — wxhaskell developers
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
(53) |
Mar
(145) |
Apr
(22) |
May
(7) |
Jun
(14) |
Jul
(14) |
Aug
(9) |
Sep
(10) |
Oct
(48) |
Nov
(59) |
Dec
(45) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(36) |
Feb
(5) |
Mar
(33) |
Apr
(28) |
May
(5) |
Jun
(6) |
Jul
(1) |
Aug
(7) |
Sep
(11) |
Oct
(3) |
Nov
(31) |
Dec
|
| 2010 |
Jan
(8) |
Feb
(3) |
Mar
|
Apr
(2) |
May
(9) |
Jun
(1) |
Jul
(2) |
Aug
|
Sep
(1) |
Oct
(1) |
Nov
|
Dec
|
| 2011 |
Jan
(1) |
Feb
(3) |
Mar
(4) |
Apr
(1) |
May
(2) |
Jun
(12) |
Jul
(36) |
Aug
(7) |
Sep
(40) |
Oct
(6) |
Nov
(40) |
Dec
(8) |
| 2012 |
Jan
(54) |
Feb
(8) |
Mar
(1) |
Apr
(16) |
May
(2) |
Jun
(12) |
Jul
(1) |
Aug
(1) |
Sep
(2) |
Oct
(2) |
Nov
|
Dec
(7) |
| 2013 |
Jan
(8) |
Feb
|
Mar
(13) |
Apr
(2) |
May
(13) |
Jun
(44) |
Jul
|
Aug
(13) |
Sep
(12) |
Oct
(11) |
Nov
(7) |
Dec
(6) |
| 2014 |
Jan
(3) |
Feb
(4) |
Mar
(9) |
Apr
(1) |
May
|
Jun
(3) |
Jul
(1) |
Aug
(1) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2015 |
Jan
|
Feb
(2) |
Mar
|
Apr
|
May
(2) |
Jun
(3) |
Jul
|
Aug
(2) |
Sep
(5) |
Oct
(2) |
Nov
(1) |
Dec
(1) |
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2020 |
Jan
(1) |
Feb
|
Mar
|
Apr
(1) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Audrey T. <au...@au...> - 2008-07-18 05:58:11
|
shelarcy 提到: > I always build wxhaskell binary with MedidaCtrl, GLCanvas, Sound, STC, > etc .... But current MediaCtrl support has bug. MediaCtrl doesn't work > on Windows or Wx 2.8. It's okay, I built Wx2.8+MediaCtrl and it works correctly now, using MSYS + MINGW instead of MSVC. Now if you can teach me how to make a binary distribution I'd be happy to share it... Cheers, Audrey |
|
From: shelarcy <she...@gm...> - 2008-07-17 16:26:28
|
Hi, On Thu, 17 Jul 2008 22:17:18 +0900, Audrey Tang <au...@au...> wrote: > I understand that there's a wxhaskell-bin-msw2.6.4-ghc6.8.3-0.10.3-0.zip > but it seems it's built without MediaCtrl. Would it be too much to ask > if the binary packager for Win32 can kindly provide a build with > MediaCtrl available? Either Wx 2.6 or Wx 2.8 would be sufficient for my > application. I always build wxhaskell binary with MedidaCtrl, GLCanvas, Sound, STC, etc .... But current MediaCtrl support has bug. MediaCtrl doesn't work on Windows or Wx 2.8. And currect Wx 2.8 support also has critical bug on Windows. samples\wx\BouncingBalls doesn't handle keyboard event on Windows, though samples\wxcore\BouncingBalls works correctly. I don't know why panel's flag and on click (clockRight?) cause this problem. I want to fix these bugs. But I'm very busy now. So, I can't make correct MediaCtrl support binary soonly. I'm sorry for that, -- shelarcy <shelarcy hotmail.co.jp> http://page.freett.com/shelarcy/ |
|
From: Audrey T. <au...@au...> - 2008-07-17 13:17:23
|
Hi, I've been following the instructions from: http://wxhaskell.sourceforge.net/building-msc.html with (GHC 6.8.3 / Wx 2.8.8 / VC++ 6.0), but stuck on the step of "Export Makefile" as it failed to export any .mak file. :-/ I understand that there's a wxhaskell-bin-msw2.6.4-ghc6.8.3-0.10.3-0.zip but it seems it's built without MediaCtrl. Would it be too much to ask if the binary packager for Win32 can kindly provide a build with MediaCtrl available? Either Wx 2.6 or Wx 2.8 would be sufficient for my application. Many thanks! Audrey |
|
From: Eric Y. K. <eri...@gm...> - 2008-07-09 11:31:43
|
Pushed! Thanks! -- Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow> PGP Key ID: 08AC04F9 |
|
From: shelarcy <she...@gm...> - 2008-07-09 06:54:58
|
DarcsURL: C:/home/shelarcy/wxhaskell
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=_"
--=_
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
Wed Jul 9 15:38:20 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008 shelarcy <shelarc=
y...@gm...>
* Fix: linking incorrect runtime on Visual Studio (pointed out by John La=
sk).
Wed Jul 9 15:38:51 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008 shelarcy <shelarc=
y...@gm...>
* Fix building with old version of Visual Studio (according to John Lask).
--=_
Content-Type: text/x-darcs-patch; name="fix_-linking-incorrect-runtime-on-visual-studio-_pointed-out-by-john-lask__.dpatch"
Content-Transfer-Encoding: quoted-printable
Content-Description: A darcs patch for your repository!
New patches:
[Fix: linking incorrect runtime on Visual Studio (pointed out by John Lask)=
.
shelarcy <she...@gm...>**20080709063820] {
hunk ./wxc/wxc-2.4.dsp 45
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS=
" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /YX /FD /c=0D
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\wxWindows-2.4.2\lib\mswu" /I "=
include" /I "..\..\wxWindows-2.4.2\contrib\include" /I "..\..\wxWindows-2.4=
.2\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D=
"WXC_EXPORTS" /D WINVER=3D0x400 /D "_MT" /D wxUSE_GUI=3D1 /D wxUSE_UNICODE=
=3D1 /D BUILD_WXC=3D1 /D "_DLL" /YX /FD /c=0D
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS=
" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /YX /FD /c=0D
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\wxWindows-2.4.2\lib\mswu" /I "=
include" /I "..\..\wxWindows-2.4.2\contrib\include" /I "..\..\wxWindows-2.4=
.2\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D=
"WXC_EXPORTS" /D WINVER=3D0x400 /D "_MT" /D wxUSE_GUI=3D1 /D wxUSE_UNICODE=
=3D1 /D BUILD_WXC=3D1 /D "_DLL" /YX /FD /c=0D
hunk ./wxc/wxc-2.4.dsp 75
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D =
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /YX /FD /GZ /c=0D
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\wxWindows-2.4.2\lib\m=
swud" /I "..\..\wxWindows-2.4.2\contrib\include" /I "include" /I "..\..\wxW=
indows-2.4.2\include" /D "_DEBUG" /D "__WXDEBUG__" /D WXDEBUG=3D1 /D "WIN32=
" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /D WINVER=3D0x400 =
/D "_MT" /D wxUSE_GUI=3D1 /D wxUSE_UNICODE=3D1 /D BUILD_WXC=3D1 /D "_DLL" /=
YX /FD /GZ /c=0D
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D =
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /YX /FD /GZ /c=0D
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\wxWindows-2.4.2\lib\m=
swud" /I "..\..\wxWindows-2.4.2\contrib\include" /I "include" /I "..\..\wxW=
indows-2.4.2\include" /D "_DEBUG" /D "__WXDEBUG__" /D WXDEBUG=3D1 /D "WIN32=
" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /D WINVER=3D0x400 =
/D "_MT" /D wxUSE_GUI=3D1 /D wxUSE_UNICODE=3D1 /D BUILD_WXC=3D1 /D "_DLL" /=
YX /FD /GZ /c=0D
hunk ./wxc/wxc-2.6.dsp 45
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS=
" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /YX /FD /c=0D
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\wxWidgets-2.6.4\lib\vc_lib\msw=
u" /I "..\..\wxWidgets-2.6.4\contrib\include" /I "include" /I "..\..\wxWidg=
ets-2.6.4\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USR=
DLL" /D "WXC_EXPORTS" /D WINVER=3D0x400 /D "_MT" /D wxUSE_GUI=3D1 /D wxUSE_=
UNICODE=3D1 /D wxUSE_STC=3D1 /D wxUSE_SVG=3D1 /D BUILD_WXC=3D1 /D "_DLL" /Y=
X /FD /c=0D
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS=
" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /YX /FD /c=0D
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\wxWidgets-2.6.4\lib\vc_lib\msw=
u" /I "..\..\wxWidgets-2.6.4\contrib\include" /I "include" /I "..\..\wxWidg=
ets-2.6.4\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USR=
DLL" /D "WXC_EXPORTS" /D WINVER=3D0x400 /D "_MT" /D wxUSE_GUI=3D1 /D wxUSE_=
UNICODE=3D1 /D wxUSE_STC=3D1 /D wxUSE_SVG=3D1 /D BUILD_WXC=3D1 /D "_DLL" /Y=
X /FD /c=0D
hunk ./wxc/wxc-2.6.dsp 76
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D =
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /YX /FD /GZ /c=0D
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\wxWidgets-2.6.4\lib\v=
c_lib\mswud" /I "include" /I "..\..\wxWidgets-2.6.4\include" /I "..\..\wxWi=
dgets-2.6.4\contrib\include" /D "_DEBUG" /D "__WXDEBUG__" /D WXDEBUG=3D1 /D=
"WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /D WINVER=
=3D0x400 /D "_MT" /D wxUSE_GUI=3D1 /D wxUSE_UNICODE=3D1 /D wxUSE_STC=3D1 /D=
wxUSE_SVG=3D1 /D BUILD_WXC=3D1 /D "_DLL" /YX /FD /GZ /c=0D
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D =
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /YX /FD /GZ /c=0D
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\wxWidgets-2.6.4\lib\v=
c_lib\mswud" /I "include" /I "..\..\wxWidgets-2.6.4\include" /I "..\..\wxWi=
dgets-2.6.4\contrib\include" /D "_DEBUG" /D "__WXDEBUG__" /D WXDEBUG=3D1 /D=
"WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /D WINVER=
=3D0x400 /D "_MT" /D wxUSE_GUI=3D1 /D wxUSE_UNICODE=3D1 /D wxUSE_STC=3D1 /D=
wxUSE_SVG=3D1 /D BUILD_WXC=3D1 /D "_DLL" /YX /FD /GZ /c=0D
hunk ./wxc/wxc-2.8.dsp 45
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS=
" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /YX /FD /c=0D
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\wxWidgets-2.8.7\lib\vc_lib\msw=
u" /I "..\..\wxWidgets-2.8.7\contrib\include" /I "include" /I "..\..\wxWidg=
ets-2.8.7\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USR=
DLL" /D "WXC_EXPORTS" /D WINVER=3D0x400 /D "_MT" /D wxUSE_GUI=3D1 /D wxUSE_=
UNICODE=3D1 /D wxUSE_STC=3D1 /D wxUSE_SVG=3D1 /D BUILD_WXC=3D1 /D "_DLL" /Y=
X /FD /c=0D
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS=
" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /YX /FD /c=0D
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\wxWidgets-2.8.7\lib\vc_lib\msw=
u" /I "..\..\wxWidgets-2.8.7\contrib\include" /I "include" /I "..\..\wxWidg=
ets-2.8.7\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USR=
DLL" /D "WXC_EXPORTS" /D WINVER=3D0x400 /D "_MT" /D wxUSE_GUI=3D1 /D wxUSE_=
UNICODE=3D1 /D wxUSE_STC=3D1 /D wxUSE_SVG=3D1 /D BUILD_WXC=3D1 /D "_DLL" /Y=
X /FD /c=0D
hunk ./wxc/wxc-2.8.dsp 76
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D =
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /YX /FD /GZ /c=0D
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\wxWidgets-2.8.7\lib\v=
c_lib\mswud" /I "include" /I "..\..\wxWidgets-2.8.7\include" /I "..\..\wxWi=
dgets-2.8.7\contrib\include" /D "_DEBUG" /D "__WXDEBUG__" /D WXDEBUG=3D1 /D=
"WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /D WINVER=
=3D0x400 /D "_MT" /D wxUSE_GUI=3D1 /D wxUSE_UNICODE=3D1 /D wxUSE_STC=3D1 /D=
wxUSE_SVG=3D1 /D BUILD_WXC=3D1 /D "_DLL" /YX /FD /GZ /c=0D
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D =
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /YX /FD /GZ /c=0D
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\wxWidgets-2.8.7\lib\v=
c_lib\mswud" /I "include" /I "..\..\wxWidgets-2.8.7\include" /I "..\..\wxWi=
dgets-2.8.7\contrib\include" /D "_DEBUG" /D "__WXDEBUG__" /D WXDEBUG=3D1 /D=
"WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /D WINVER=
=3D0x400 /D "_MT" /D wxUSE_GUI=3D1 /D wxUSE_UNICODE=3D1 /D wxUSE_STC=3D1 /D=
wxUSE_SVG=3D1 /D BUILD_WXC=3D1 /D "_DLL" /YX /FD /GZ /c=0D
}
[Fix building with old version of Visual Studio (according to John Lask).
shelarcy <she...@gm...>**20080709063851] {
hunk ./wxc/include/wrapper.h 12
+/* MSVC-6 defines _MSC_VER=3D1200 */
+#elif _MSC_VER> 1200
+#else
+/* MSVC-6 does not define intptr_t */
+typedef int intptr_t;
hunk ./wxc/src/sound.cpp 63
- return self->Stop();
+ self->Stop();
}
Context:
[Add download link to two GHC 6.8.3's binary.
shelarcy <she...@gm...>**20080630144522] =
[Fix Building without WXWIN_COMPATIBILITY_2_6 in eljrc.cpp.
shelarcy <she...@gm...>**20080630120326] =
[Fix: hardcoded keycode doesn't work well when using wxWidgets 2.8.x.
shelarcy <she...@gm...>**20080630120118] =
[Clean up duplicate ewxw_def.h file.
shelarcy <she...@gm...>**20080628114449] =
[Remove wxScintilla code (use wxStyledTextCtrl instead).
shelarcy <she...@gm...>**20080626055907] =
[Fix: eljdcsvg.cpp doesn't build other than Windows.
shelarcy <she...@gm...>**20080625095858] =
[Just reviving ELJ's wxXmlResource code.
shelarcy <she...@gm...>**20080625052046] =
[Use Int64 representing wxFileOffset type.
shelarcy <she...@gm...>**20080624152015] =
[Add dropped wxMedia's events to wxc.
shelarcy <she...@gm...>**20080624140139] =
[Add dropped wx*DCs.
shelarcy <she...@gm...>**20080624122641] =
[Update building information about --with-contrib option.
shelarcy <she...@gm...>**20080624113243] =
[Revive wxSVGFileDC code.
shelarcy <she...@gm...>**20080624113214] =
[Change --with-stc to --with-contrib for future contrib libraries support.
shelarcy <she...@gm...>**20080624032429] =
[Update information about builiding wxWidgets and wxc with Microsoft Visual=
C++ Express Edition.
shelarcy <she...@gm...>**20080624023628] =
[Fix #1400488: Win install problem when path with spaces, e.g. "Program Fil=
es".
shelarcy <she...@gm...>**20080624020657] =
[Partialy fix a bug in wxhaskell-register.bat.
shelarcy <she...@gm...>**20080623152256] =
[Add --enable-optimization opition for building library with optimization f=
lags.
shelarcy <she...@gm...>**20080531114050] =
[Use CDouble and realToFrac instead of marshaling Double type directly.
shelarcy <she...@gm...>**20080530024730] =
[Remove unused make before-dist.
shelarcy <she...@gm...>**20080529120234] =
[Fix a bug in haddock documentation structure of Rectangle.
shelarcy <she...@gm...>**20080529111415] =
[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:
ef8bb653f2416634cbc120fb4db13943dbe4fcaa
--=_--
.
|
|
From: john l. <jv...@ho...> - 2008-07-09 02:42:56
|
For those interested (you should consider adding this to the wiki), if you would like your wxApp to launch under windows like any standard windows app, without the command console (prompt) window also appearing this can be achieved with ghc (in effect you need to instruct the linker to use the WinMain entry point) this can be done by passing -mwindows to gcc (used in the ghc link phase) as follows ... >ghc -o HelloWorld.o -fglasgow-exts -c HelloWorld.hs >ghc -optl-mwindows -o HelloWorld.exe HelloWorld.o -package wxcore NB: you can do the above in one step as well. now double click HelloWorld.exe and it will launch like a standard windows app (no DOS box). to work HelloWorld must contain a Main module, will also work with ghc -main-is option _________________________________________________________________ Are you paid what you're worth? Find out: SEEK Salary Centre http://a.ninemsn.com.au/b.aspx?URL=http%3A%2F%2Fninemsn%2Eseek%2Ecom%2Eau%2Fcareer%2Dresources%2Fsalary%2Dcentre%2F%3Ftracking%3Dsk%3Ahet%3Asc%3Anine%3A0%3Ahot%3Atext&_t=764565661&_r=OCT07_endtext_salary&_m=EXT |
|
From: john l. <jv...@ho...> - 2008-07-09 02:32:07
|
Concerning the following problems refered to in the wxHaskell wiki page: Loading package wxcore-0.10.3 ... : can't load .so/.DLL for: wxc-msw2.6.4-0.10.3 (addDLL: unknown error) (GHCi) see tckiet that I logged: http://hackage.haskell.org/trac/ghc/ticket/2429 sample applications terminate with following error message (Windows). The applicattion failed to initialize properly (0xc0150002). Click OK to terminate the application. your solution might fix the symptoms but not the root cause. The problem appears to be that you have compiled wxHaskell dll with the /MT MS VC compiler option. wxWidgets is compiled with the /MD compiler option by default quoteing MS: "With these options, you can select either single-threaded or multithreaded run-time routines, indicate that a multithreaded module is a dynamic-link library (DLL), and select the retail or debug version of the library." "Note Having more than one copy of the run-time libraries in a process can cause problems, because static data in one copy is not shared with the other copy. To ensure that your process contains only one copy, avoid mixing static and dynamic versions of the run-time libraries. The linker will prevent you from linking with both static and dynamic versions within one .EXE file, but you can still end up with two (or more) copies of the run-time libraries. For example, a dynamic-link library linked with the static (non-DLL) versions of the run-time libraries can cause problems when used with an .EXE file that was linked with the dynamic (DLL) version of the run-time libraries. (You should also avoid mixing the debug and non-debug versions of the libraries in one process.)" the MS VC 2005 patch is not the fix, although it might ameliorate the above problem. I compiled both wxWidgets 2.6.4 and wxCore with MS-VC6 and experienced the above mentioned problem. By changing the compiler option on the wxCore wxc to /MD the above problem was solved. please note that most gnu-win32 projects link adainst MSVCRT.LIB i.e. /MD, so it is advised you change accordingly Compiling using old version of MS-VC: I needed to make the following changes: sound.cpp: EWXWEXPORT(void,wxSound_Stop)(wxSound* self) { #ifdef wxUSE_SOUND return self->Stop(); #endif } ...can't return a void type changed to ... EWXWEXPORT(void,wxSound_Stop)(wxSound* self) { #ifdef wxUSE_SOUND self->Stop(); #endif } then .. defined in wrapper.h ... /* just to ensure that intptr_t exists */ #ifndef _MSC_VER #include /* MSVC-6 defines _MSC_VER=1200 */ #elif _MSC_VER> 1200 #else /* MSVC-6 does not define intptr_t */ typedef int intptr_t; #endif _MSC_VER _________________________________________________________________ Are you paid what you're worth? Find out: SEEK Salary Centre http://a.ninemsn.com.au/b.aspx?URL=http%3A%2F%2Fninemsn%2Eseek%2Ecom%2Eau%2Fcareer%2Dresources%2Fsalary%2Dcentre%2F%3Ftracking%3Dsk%3Ahet%3Asc%3Anine%3A0%3Ahot%3Atext&_t=764565661&_r=OCT07_endtext_salary&_m=EXT |
|
From: Eric Y. K. <eri...@gm...> - 2008-06-30 23:16:10
|
Pushed, thanks! -- Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow> PGP Key ID: 08AC04F9 |
|
From: shelarcy <she...@gm...> - 2008-06-30 14:55:19
|
DarcsURL: C:/home/shelarcy/wxhaskell
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=_"
--=_
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
Thu Jun 26 14:59:07 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008 shelarcy <shelarc=
y...@gm...>
* Remove wxScintilla code (use wxStyledTextCtrl instead).
Sat Jun 28 20:44:49 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008 shelarcy <shelarc=
y...@gm...>
* Clean up duplicate ewxw_def.h file.
Mon Jun 30 21:01:18 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008 shelarcy <shelarc=
y...@gm...>
* Fix: hardcoded keycode doesn't work well when using wxWidgets 2.8.x.
Mon Jun 30 21:03:26 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008 shelarcy <shelarc=
y...@gm...>
* Fix Building without WXWIN_COMPATIBILITY_2_6 in eljrc.cpp.
Mon Jun 30 23:45:22 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008 shelarcy <shelarc=
y...@gm...>
* Add download link to two GHC 6.8.3's binary.
--=_
Content-Type: text/x-darcs-patch; name="remove-wxscintilla-code-_use-wxstyledtextctrl-instead__.dpatch"
Content-Transfer-Encoding: quoted-printable
Content-Description: A darcs patch for your repository!
New patches:
[Remove wxScintilla code (use wxStyledTextCtrl instead).
shelarcy <she...@gm...>**20080626055907] {
hunk ./wxc/include/wxc_glue.h 3885
-=0D
-/* wxScintilla */=0D
-TClassDef(wxScintilla)=0D
-TClass(wxScintilla) wxScintilla_Create( void* obj, void* fnc, TClass(wxWin=
dow) _prt, int _id, TRect(_lft,_top,_wdt,_hgt), int _stl );=0D
-int wxScintilla_Exec( TSelf(wxScintilla) obj, int code, int param1,=
int param2 );=0D
hunk ./wxc/src/Scintilla.h 1
-// Scintilla source code edit control
-/** @file Scintilla.h
- ** Interface to the edit control.
- **/
-// Copyright 1998-2002 by Neil Hodgson <ne...@sc...>
-// The License.txt file describes the conditions under which this software=
may be distributed.
-
-// Most of this file is automatically generated from the Scintilla.iface i=
nterface definition
-// file which contains any comments about the definitions. HFacer.py does =
the generation.
-
-#ifndef SCINTILLA_H
-#define SCINTILLA_H
-
-#if PLAT_WIN
-// Return false on failure:
-bool Scintilla_RegisterClasses(void *hInstance);
-bool Scintilla_ReleaseResources();
-#endif
-int Scintilla_LinkLexers();
-
-// Here should be placed typedefs for uptr_t, an unsigned integer type lar=
ge enough to
-// hold a pointer and sptr_t, a signed integer large enough to hold a poin=
ter.
-// May need to be changed for 64 bit platforms.
-#ifdef __int3264
-typedef ULONG_PTR uptr_t;
-typedef LONG_PTR sptr_t;
-#else
-typedef unsigned long uptr_t;
-typedef long sptr_t;
-#endif
-
-typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wP=
aram, sptr_t lParam);
-
-//++Autogenerated -- start of section automatically generated from Scintil=
la.iface
-#define INVALID_POSITION -1
-#define SCI_START 2000
-#define SCI_OPTIONAL_START 3000
-#define SCI_LEXER_START 4000
-#define SCI_ADDTEXT 2001
-#define SCI_ADDSTYLEDTEXT 2002
-#define SCI_INSERTTEXT 2003
-#define SCI_CLEARALL 2004
-#define SCI_CLEARDOCUMENTSTYLE 2005
-#define SCI_GETLENGTH 2006
-#define SCI_GETCHARAT 2007
-#define SCI_GETCURRENTPOS 2008
-#define SCI_GETANCHOR 2009
-#define SCI_GETSTYLEAT 2010
-#define SCI_REDO 2011
-#define SCI_SETUNDOCOLLECTION 2012
-#define SCI_SELECTALL 2013
-#define SCI_SETSAVEPOINT 2014
-#define SCI_GETSTYLEDTEXT 2015
-#define SCI_CANREDO 2016
-#define SCI_MARKERLINEFROMHANDLE 2017
-#define SCI_MARKERDELETEHANDLE 2018
-#define SCI_GETUNDOCOLLECTION 2019
-#define SCWS_INVISIBLE 0
-#define SCWS_VISIBLEALWAYS 1
-#define SCWS_VISIBLEAFTERINDENT 2
-#define SCI_GETVIEWWS 2020
-#define SCI_SETVIEWWS 2021
-#define SCI_POSITIONFROMPOINT 2022
-#define SCI_POSITIONFROMPOINTCLOSE 2023
-#define SCI_GOTOLINE 2024
-#define SCI_GOTOPOS 2025
-#define SCI_SETANCHOR 2026
-#define SCI_GETCURLINE 2027
-#define SCI_GETENDSTYLED 2028
-#define SC_EOL_CRLF 0
-#define SC_EOL_CR 1
-#define SC_EOL_LF 2
-#define SCI_CONVERTEOLS 2029
-#define SCI_GETEOLMODE 2030
-#define SCI_SETEOLMODE 2031
-#define SCI_STARTSTYLING 2032
-#define SCI_SETSTYLING 2033
-#define SCI_GETBUFFEREDDRAW 2034
-#define SCI_SETBUFFEREDDRAW 2035
-#define SCI_SETTABWIDTH 2036
-#define SCI_GETTABWIDTH 2121
-#define SC_CP_UTF8 65001
-#define SCI_SETCODEPAGE 2037
-#define SCI_SETUSEPALETTE 2039
-#define MARKER_MAX 31
-#define SC_MARK_CIRCLE 0
-#define SC_MARK_ROUNDRECT 1
-#define SC_MARK_ARROW 2
-#define SC_MARK_SMALLRECT 3
-#define SC_MARK_SHORTARROW 4
-#define SC_MARK_EMPTY 5
-#define SC_MARK_ARROWDOWN 6
-#define SC_MARK_MINUS 7
-#define SC_MARK_PLUS 8
-#define SC_MARK_VLINE 9
-#define SC_MARK_LCORNER 10
-#define SC_MARK_TCORNER 11
-#define SC_MARK_BOXPLUS 12
-#define SC_MARK_BOXPLUSCONNECTED 13
-#define SC_MARK_BOXMINUS 14
-#define SC_MARK_BOXMINUSCONNECTED 15
-#define SC_MARK_LCORNERCURVE 16
-#define SC_MARK_TCORNERCURVE 17
-#define SC_MARK_CIRCLEPLUS 18
-#define SC_MARK_CIRCLEPLUSCONNECTED 19
-#define SC_MARK_CIRCLEMINUS 20
-#define SC_MARK_CIRCLEMINUSCONNECTED 21
-#define SC_MARK_BACKGROUND 22
-#define SC_MARK_CHARACTER 10000
-#define SC_MARKNUM_FOLDEREND 25
-#define SC_MARKNUM_FOLDEROPENMID 26
-#define SC_MARKNUM_FOLDERMIDTAIL 27
-#define SC_MARKNUM_FOLDERTAIL 28
-#define SC_MARKNUM_FOLDERSUB 29
-#define SC_MARKNUM_FOLDER 30
-#define SC_MARKNUM_FOLDEROPEN 31
-#define SC_MASK_FOLDERS 0xFE000000
-#define SCI_MARKERDEFINE 2040
-#define SCI_MARKERSETFORE 2041
-#define SCI_MARKERSETBACK 2042
-#define SCI_MARKERADD 2043
-#define SCI_MARKERDELETE 2044
-#define SCI_MARKERDELETEALL 2045
-#define SCI_MARKERGET 2046
-#define SCI_MARKERNEXT 2047
-#define SCI_MARKERPREVIOUS 2048
-#define SC_MARGIN_SYMBOL 0
-#define SC_MARGIN_NUMBER 1
-#define SCI_SETMARGINTYPEN 2240
-#define SCI_GETMARGINTYPEN 2241
-#define SCI_SETMARGINWIDTHN 2242
-#define SCI_GETMARGINWIDTHN 2243
-#define SCI_SETMARGINMASKN 2244
-#define SCI_GETMARGINMASKN 2245
-#define SCI_SETMARGINSENSITIVEN 2246
-#define SCI_GETMARGINSENSITIVEN 2247
-#define STYLE_DEFAULT 32
-#define STYLE_LINENUMBER 33
-#define STYLE_BRACELIGHT 34
-#define STYLE_BRACEBAD 35
-#define STYLE_CONTROLCHAR 36
-#define STYLE_INDENTGUIDE 37
-#define STYLE_LASTPREDEFINED 39
-#define STYLE_MAX 127
-#define SC_CHARSET_ANSI 0
-#define SC_CHARSET_DEFAULT 1
-#define SC_CHARSET_BALTIC 186
-#define SC_CHARSET_CHINESEBIG5 136
-#define SC_CHARSET_EASTEUROPE 238
-#define SC_CHARSET_GB2312 134
-#define SC_CHARSET_GREEK 161
-#define SC_CHARSET_HANGUL 129
-#define SC_CHARSET_MAC 77
-#define SC_CHARSET_OEM 255
-#define SC_CHARSET_RUSSIAN 204
-#define SC_CHARSET_SHIFTJIS 128
-#define SC_CHARSET_SYMBOL 2
-#define SC_CHARSET_TURKISH 162
-#define SC_CHARSET_JOHAB 130
-#define SC_CHARSET_HEBREW 177
-#define SC_CHARSET_ARABIC 178
-#define SC_CHARSET_VIETNAMESE 163
-#define SC_CHARSET_THAI 222
-#define SCI_STYLECLEARALL 2050
-#define SCI_STYLESETFORE 2051
-#define SCI_STYLESETBACK 2052
-#define SCI_STYLESETBOLD 2053
-#define SCI_STYLESETITALIC 2054
-#define SCI_STYLESETSIZE 2055
-#define SCI_STYLESETFONT 2056
-#define SCI_STYLESETEOLFILLED 2057
-#define SCI_STYLERESETDEFAULT 2058
-#define SCI_STYLESETUNDERLINE 2059
-#define SC_CASE_MIXED 0
-#define SC_CASE_UPPER 1
-#define SC_CASE_LOWER 2
-#define SCI_STYLESETCASE 2060
-#define SCI_STYLESETCHARACTERSET 2066
-#define SCI_SETSELFORE 2067
-#define SCI_SETSELBACK 2068
-#define SCI_SETCARETFORE 2069
-#define SCI_ASSIGNCMDKEY 2070
-#define SCI_CLEARCMDKEY 2071
-#define SCI_CLEARALLCMDKEYS 2072
-#define SCI_SETSTYLINGEX 2073
-#define SCI_STYLESETVISIBLE 2074
-#define SCI_GETCARETPERIOD 2075
-#define SCI_SETCARETPERIOD 2076
-#define SCI_SETWORDCHARS 2077
-#define SCI_BEGINUNDOACTION 2078
-#define SCI_ENDUNDOACTION 2079
-#define INDIC_MAX 7
-#define INDIC_PLAIN 0
-#define INDIC_SQUIGGLE 1
-#define INDIC_TT 2
-#define INDIC_DIAGONAL 3
-#define INDIC_STRIKE 4
-#define INDIC0_MASK 0x20
-#define INDIC1_MASK 0x40
-#define INDIC2_MASK 0x80
-#define INDICS_MASK 0xE0
-#define SCI_INDICSETSTYLE 2080
-#define SCI_INDICGETSTYLE 2081
-#define SCI_INDICSETFORE 2082
-#define SCI_INDICGETFORE 2083
-#define SCI_SETSTYLEBITS 2090
-#define SCI_GETSTYLEBITS 2091
-#define SCI_SETLINESTATE 2092
-#define SCI_GETLINESTATE 2093
-#define SCI_GETMAXLINESTATE 2094
-#define SCI_GETCARETLINEVISIBLE 2095
-#define SCI_SETCARETLINEVISIBLE 2096
-#define SCI_GETCARETLINEBACK 2097
-#define SCI_SETCARETLINEBACK 2098
-#define SCI_STYLESETCHANGEABLE 2099
-#define SCI_AUTOCSHOW 2100
-#define SCI_AUTOCCANCEL 2101
-#define SCI_AUTOCACTIVE 2102
-#define SCI_AUTOCPOSSTART 2103
-#define SCI_AUTOCCOMPLETE 2104
-#define SCI_AUTOCSTOPS 2105
-#define SCI_AUTOCSETSEPARATOR 2106
-#define SCI_AUTOCGETSEPARATOR 2107
-#define SCI_AUTOCSELECT 2108
-#define SCI_AUTOCSETCANCELATSTART 2110
-#define SCI_AUTOCGETCANCELATSTART 2111
-#define SCI_AUTOCSETFILLUPS 2112
-#define SCI_AUTOCSETCHOOSESINGLE 2113
-#define SCI_AUTOCGETCHOOSESINGLE 2114
-#define SCI_AUTOCSETIGNORECASE 2115
-#define SCI_AUTOCGETIGNORECASE 2116
-#define SCI_USERLISTSHOW 2117
-#define SCI_AUTOCSETAUTOHIDE 2118
-#define SCI_AUTOCGETAUTOHIDE 2119
-#define SCI_AUTOCSETDROPRESTOFWORD 2270
-#define SCI_AUTOCGETDROPRESTOFWORD 2271
-#define SCI_SETINDENT 2122
-#define SCI_GETINDENT 2123
-#define SCI_SETUSETABS 2124
-#define SCI_GETUSETABS 2125
-#define SCI_SETLINEINDENTATION 2126
-#define SCI_GETLINEINDENTATION 2127
-#define SCI_GETLINEINDENTPOSITION 2128
-#define SCI_GETCOLUMN 2129
-#define SCI_SETHSCROLLBAR 2130
-#define SCI_GETHSCROLLBAR 2131
-#define SCI_SETINDENTATIONGUIDES 2132
-#define SCI_GETINDENTATIONGUIDES 2133
-#define SCI_SETHIGHLIGHTGUIDE 2134
-#define SCI_GETHIGHLIGHTGUIDE 2135
-#define SCI_GETLINEENDPOSITION 2136
-#define SCI_GETCODEPAGE 2137
-#define SCI_GETCARETFORE 2138
-#define SCI_GETUSEPALETTE 2139
-#define SCI_GETREADONLY 2140
-#define SCI_SETCURRENTPOS 2141
-#define SCI_SETSELECTIONSTART 2142
-#define SCI_GETSELECTIONSTART 2143
-#define SCI_SETSELECTIONEND 2144
-#define SCI_GETSELECTIONEND 2145
-#define SCI_SETPRINTMAGNIFICATION 2146
-#define SCI_GETPRINTMAGNIFICATION 2147
-#define SC_PRINT_NORMAL 0
-#define SC_PRINT_INVERTLIGHT 1
-#define SC_PRINT_BLACKONWHITE 2
-#define SC_PRINT_COLOURONWHITE 3
-#define SC_PRINT_COLOURONWHITEDEFAULTBG 4
-#define SCI_SETPRINTCOLOURMODE 2148
-#define SCI_GETPRINTCOLOURMODE 2149
-#define SCFIND_WHOLEWORD 2
-#define SCFIND_MATCHCASE 4
-#define SCFIND_WORDSTART 0x00100000
-#define SCFIND_REGEXP 0x00200000
-#define SCI_FINDTEXT 2150
-#define SCI_FORMATRANGE 2151
-#define SCI_GETFIRSTVISIBLELINE 2152
-#define SCI_GETLINE 2153
-#define SCI_GETLINECOUNT 2154
-#define SCI_SETMARGINLEFT 2155
-#define SCI_GETMARGINLEFT 2156
-#define SCI_SETMARGINRIGHT 2157
-#define SCI_GETMARGINRIGHT 2158
-#define SCI_GETMODIFY 2159
-#define SCI_SETSEL 2160
-#define SCI_GETSELTEXT 2161
-#define SCI_GETTEXTRANGE 2162
-#define SCI_HIDESELECTION 2163
-#define SCI_POINTXFROMPOSITION 2164
-#define SCI_POINTYFROMPOSITION 2165
-#define SCI_LINEFROMPOSITION 2166
-#define SCI_POSITIONFROMLINE 2167
-#define SCI_LINESCROLL 2168
-#define SCI_SCROLLCARET 2169
-#define SCI_REPLACESEL 2170
-#define SCI_SETREADONLY 2171
-#define SCI_NULL 2172
-#define SCI_CANPASTE 2173
-#define SCI_CANUNDO 2174
-#define SCI_EMPTYUNDOBUFFER 2175
-#define SCI_UNDO 2176
-#define SCI_CUT 2177
-#define SCI_COPY 2178
-#define SCI_PASTE 2179
-#define SCI_CLEAR 2180
-#define SCI_SETTEXT 2181
-#define SCI_GETTEXT 2182
-#define SCI_GETTEXTLENGTH 2183
-#define SCI_GETDIRECTFUNCTION 2184
-#define SCI_GETDIRECTPOINTER 2185
-#define SCI_SETOVERTYPE 2186
-#define SCI_GETOVERTYPE 2187
-#define SCI_SETCARETWIDTH 2188
-#define SCI_GETCARETWIDTH 2189
-#define SCI_SETTARGETSTART 2190
-#define SCI_GETTARGETSTART 2191
-#define SCI_SETTARGETEND 2192
-#define SCI_GETTARGETEND 2193
-#define SCI_REPLACETARGET 2194
-#define SCI_REPLACETARGETRE 2195
-#define SCI_SEARCHINTARGET 2197
-#define SCI_SETSEARCHFLAGS 2198
-#define SCI_GETSEARCHFLAGS 2199
-#define SCI_CALLTIPSHOW 2200
-#define SCI_CALLTIPCANCEL 2201
-#define SCI_CALLTIPACTIVE 2202
-#define SCI_CALLTIPPOSSTART 2203
-#define SCI_CALLTIPSETHLT 2204
-#define SCI_CALLTIPSETBACK 2205
-#define SCI_VISIBLEFROMDOCLINE 2220
-#define SCI_DOCLINEFROMVISIBLE 2221
-#define SC_FOLDLEVELBASE 0x400
-#define SC_FOLDLEVELWHITEFLAG 0x1000
-#define SC_FOLDLEVELHEADERFLAG 0x2000
-#define SC_FOLDLEVELNUMBERMASK 0x0FFF
-#define SCI_SETFOLDLEVEL 2222
-#define SCI_GETFOLDLEVEL 2223
-#define SCI_GETLASTCHILD 2224
-#define SCI_GETFOLDPARENT 2225
-#define SCI_SHOWLINES 2226
-#define SCI_HIDELINES 2227
-#define SCI_GETLINEVISIBLE 2228
-#define SCI_SETFOLDEXPANDED 2229
-#define SCI_GETFOLDEXPANDED 2230
-#define SCI_TOGGLEFOLD 2231
-#define SCI_ENSUREVISIBLE 2232
-#define SCI_SETFOLDFLAGS 2233
-#define SCI_ENSUREVISIBLEENFORCEPOLICY 2234
-#define SCI_SETTABINDENTS 2260
-#define SCI_GETTABINDENTS 2261
-#define SCI_SETBACKSPACEUNINDENTS 2262
-#define SCI_GETBACKSPACEUNINDENTS 2263
-#define SC_TIME_FOREVER 10000000
-#define SCI_SETMOUSEDWELLTIME 2264
-#define SCI_GETMOUSEDWELLTIME 2265
-#define SCI_WORDSTARTPOSITION 2266
-#define SCI_WORDENDPOSITION 2267
-#define SC_WRAP_NONE 0
-#define SC_WRAP_WORD 1
-#define SCI_SETWRAPMODE 2268
-#define SCI_GETWRAPMODE 2269
-#define SC_CACHE_NONE 0
-#define SC_CACHE_CARET 1
-#define SC_CACHE_PAGE 2
-#define SC_CACHE_DOCUMENT 3
-#define SCI_SETLAYOUTCACHE 2272
-#define SCI_GETLAYOUTCACHE 2273
-#define SCI_SETSCROLLWIDTH 2274
-#define SCI_GETSCROLLWIDTH 2275
-#define SCI_TEXTWIDTH 2276
-#define SCI_SETENDATLASTLINE 2277
-#define SCI_GETENDATLASTLINE 2278
-#define SCI_LINEDOWN 2300
-#define SCI_LINEDOWNEXTEND 2301
-#define SCI_LINEUP 2302
-#define SCI_LINEUPEXTEND 2303
-#define SCI_CHARLEFT 2304
-#define SCI_CHARLEFTEXTEND 2305
-#define SCI_CHARRIGHT 2306
-#define SCI_CHARRIGHTEXTEND 2307
-#define SCI_WORDLEFT 2308
-#define SCI_WORDLEFTEXTEND 2309
-#define SCI_WORDRIGHT 2310
-#define SCI_WORDRIGHTEXTEND 2311
-#define SCI_HOME 2312
-#define SCI_HOMEEXTEND 2313
-#define SCI_LINEEND 2314
-#define SCI_LINEENDEXTEND 2315
-#define SCI_DOCUMENTSTART 2316
-#define SCI_DOCUMENTSTARTEXTEND 2317
-#define SCI_DOCUMENTEND 2318
-#define SCI_DOCUMENTENDEXTEND 2319
-#define SCI_PAGEUP 2320
-#define SCI_PAGEUPEXTEND 2321
-#define SCI_PAGEDOWN 2322
-#define SCI_PAGEDOWNEXTEND 2323
-#define SCI_EDITTOGGLEOVERTYPE 2324
-#define SCI_CANCEL 2325
-#define SCI_DELETEBACK 2326
-#define SCI_TAB 2327
-#define SCI_BACKTAB 2328
-#define SCI_NEWLINE 2329
-#define SCI_FORMFEED 2330
-#define SCI_VCHOME 2331
-#define SCI_VCHOMEEXTEND 2332
-#define SCI_ZOOMIN 2333
-#define SCI_ZOOMOUT 2334
-#define SCI_DELWORDLEFT 2335
-#define SCI_DELWORDRIGHT 2336
-#define SCI_LINECUT 2337
-#define SCI_LINEDELETE 2338
-#define SCI_LINETRANSPOSE 2339
-#define SCI_LOWERCASE 2340
-#define SCI_UPPERCASE 2341
-#define SCI_LINESCROLLDOWN 2342
-#define SCI_LINESCROLLUP 2343
-#define SCI_DELETEBACKNOTLINE 2344
-#define SCI_MOVECARETINSIDEVIEW 2401
-#define SCI_LINELENGTH 2350
-#define SCI_BRACEHIGHLIGHT 2351
-#define SCI_BRACEBADLIGHT 2352
-#define SCI_BRACEMATCH 2353
-#define SCI_GETVIEWEOL 2355
-#define SCI_SETVIEWEOL 2356
-#define SCI_GETDOCPOINTER 2357
-#define SCI_SETDOCPOINTER 2358
-#define SCI_SETMODEVENTMASK 2359
-#define EDGE_NONE 0
-#define EDGE_LINE 1
-#define EDGE_BACKGROUND 2
-#define SCI_GETEDGECOLUMN 2360
-#define SCI_SETEDGECOLUMN 2361
-#define SCI_GETEDGEMODE 2362
-#define SCI_SETEDGEMODE 2363
-#define SCI_GETEDGECOLOUR 2364
-#define SCI_SETEDGECOLOUR 2365
-#define SCI_SEARCHANCHOR 2366
-#define SCI_SEARCHNEXT 2367
-#define SCI_SEARCHPREV 2368
-#define CARET_SLOP 0x01
-#define CARET_CENTER 0x02
-#define CARET_STRICT 0x04
-#define CARET_XEVEN 0x08
-#define CARET_XJUMPS 0x10
-#define SCI_SETCARETPOLICY 2369
-#define SCI_LINESONSCREEN 2370
-#define SCI_USEPOPUP 2371
-#define SCI_SELECTIONISRECTANGLE 2372
-#define SCI_SETZOOM 2373
-#define SCI_GETZOOM 2374
-#define SCI_CREATEDOCUMENT 2375
-#define SCI_ADDREFDOCUMENT 2376
-#define SCI_RELEASEDOCUMENT 2377
-#define SCI_GETMODEVENTMASK 2378
-#define SCI_SETFOCUS 2380
-#define SCI_GETFOCUS 2381
-#define SCI_SETSTATUS 2382
-#define SCI_GETSTATUS 2383
-#define SCI_SETMOUSEDOWNCAPTURES 2384
-#define SCI_GETMOUSEDOWNCAPTURES 2385
-#define SC_CURSORNORMAL -1
-#define SC_CURSORWAIT 3
-#define SCI_SETCURSOR 2386
-#define SCI_GETCURSOR 2387
-#define SCI_SETCONTROLCHARSYMBOL 2388
-#define SCI_GETCONTROLCHARSYMBOL 2389
-#define SCI_WORDPARTLEFT 2390
-#define SCI_WORDPARTLEFTEXTEND 2391
-#define SCI_WORDPARTRIGHT 2392
-#define SCI_WORDPARTRIGHTEXTEND 2393
-#define VISIBLE_SLOP 0x01
-#define VISIBLE_STRICT 0x04
-#define SCI_SETVISIBLEPOLICY 2394
-#define SCI_DELLINELEFT 2395
-#define SCI_DELLINERIGHT 2396
-#define SCI_SETXOFFSET 2397
-#define SCI_GETXOFFSET 2398
-#define SCI_GRABFOCUS 2400
-#define SCI_STARTRECORD 3001
-#define SCI_STOPRECORD 3002
-#define SCI_SETLEXER 4001
-#define SCI_GETLEXER 4002
-#define SCI_COLOURISE 4003
-#define SCI_SETPROPERTY 4004
-#define SCI_SETKEYWORDS 4005
-#define SCI_SETLEXERLANGUAGE 4006
-#define SC_MOD_INSERTTEXT 0x1
-#define SC_MOD_DELETETEXT 0x2
-#define SC_MOD_CHANGESTYLE 0x4
-#define SC_MOD_CHANGEFOLD 0x8
-#define SC_PERFORMED_USER 0x10
-#define SC_PERFORMED_UNDO 0x20
-#define SC_PERFORMED_REDO 0x40
-#define SC_LASTSTEPINUNDOREDO 0x100
-#define SC_MOD_CHANGEMARKER 0x200
-#define SC_MOD_BEFOREINSERT 0x400
-#define SC_MOD_BEFOREDELETE 0x800
-#define SC_MODEVENTMASKALL 0xF77
-#define SCEN_CHANGE 768
-#define SCEN_SETFOCUS 512
-#define SCEN_KILLFOCUS 256
-#define SCK_DOWN 300
-#define SCK_UP 301
-#define SCK_LEFT 302
-#define SCK_RIGHT 303
-#define SCK_HOME 304
-#define SCK_END 305
-#define SCK_PRIOR 306
-#define SCK_NEXT 307
-#define SCK_DELETE 308
-#define SCK_INSERT 309
-#define SCK_ESCAPE 7
-#define SCK_BACK 8
-#define SCK_TAB 9
-#define SCK_RETURN 13
-#define SCK_ADD 310
-#define SCK_SUBTRACT 311
-#define SCK_DIVIDE 312
-#define KeyMod SCMOD_
-#define SCMOD_SHIFT 1
-#define SCMOD_CTRL 2
-#define SCMOD_ALT 4
-#define Lexer SCLEX_
-#define SCN_STYLENEEDED 2000
-#define SCN_CHARADDED 2001
-#define SCN_SAVEPOINTREACHED 2002
-#define SCN_SAVEPOINTLEFT 2003
-#define SCN_MODIFYATTEMPTRO 2004
-#define SCN_KEY 2005
-#define SCN_DOUBLECLICK 2006
-#define SCN_UPDATEUI 2007
-#define SCN_MODIFIED 2008
-#define SCN_MACRORECORD 2009
-#define SCN_MARGINCLICK 2010
-#define SCN_NEEDSHOWN 2011
-#define SCN_PAINTED 2013
-#define SCN_USERLISTSELECTION 2014
-#define SCN_URIDROPPED 2015
-#define SCN_DWELLSTART 2016
-#define SCN_DWELLEND 2017
-#define SCN_ZOOM 2018
-//--Autogenerated -- end of section automatically generated from Scintilla=
.iface
-
-// These structures are defined to be exactly the same shape as the Win32
-// CHARRANGE, TEXTRANGE, FINDTEXTEX, FORMATRANGE, and NMHDR structs.
-// So older code that treats Scintilla as a RichEdit will work.
-
-typedef struct _CharacterRange {
- long cpMin;
- long cpMax;
-}CharacterRange;
-
-typedef struct _TextRange {
- CharacterRange chrg;
- char *lpstrText;
-}TextRange;
-
-typedef struct _TextToFind {
- CharacterRange chrg;
- char *lpstrText;
- CharacterRange chrgText;
-}TextToFind;
-
-#ifdef PLATFORM_H
-
-// This structure is used in printing and requires some of the graphics ty=
pes
-// from Platform.h. Not needed by most client code.
-
-typedef struct _RangeToFormat {
- SurfaceID hdc;
- SurfaceID hdcTarget;
- PRectangle rc;
- PRectangle rcPage;
- CharacterRange chrg;
-}RangeToFormat;
-
-#endif
-
-typedef struct _NotifyHeader {
- // hwndFrom is really an environment specifc window handle or pointer
- // but most clients of Scintilla.h do not have this type visible.
- //WindowID hwndFrom;
- void *hwndFrom;
- unsigned int idFrom;
- unsigned int code;
-}NotifyHeader;
-
-typedef struct _SCNotification {
- struct _NotifyHeader nmhdr;
- int position; // SCN_STYLENEEDED, SCN_MODIFIED, SCN_DWELLSTART, SCN_DWELL=
END
- int ch; // SCN_CHARADDED, SCN_KEY
- int modifiers; // SCN_KEY
- int modificationType; // SCN_MODIFIED
- const char *text; // SCN_MODIFIED
- int length; // SCN_MODIFIED
- int linesAdded; // SCN_MODIFIED
- int message; // SCN_MACRORECORD
- uptr_t wParam; // SCN_MACRORECORD
- sptr_t lParam; // SCN_MACRORECORD
- int line; // SCN_MODIFIED
- int foldLevelNow; // SCN_MODIFIED
- int foldLevelPrev; // SCN_MODIFIED
- int margin; // SCN_MARGINCLICK
- int listType; // SCN_USERLISTSELECTION
- int x; // SCN_DWELLSTART, SCN_DWELLEND
- int y; // SCN_DWELLSTART, SCN_DWELLEND
-}SCNotification;
-
-// Deprecation section listing all API features that are deprecated and wi=
ll
-// will be removed completely in a future version.
-// To enable these features define INCLUDE_DEPRECATED_FEATURES
-
-#ifdef INCLUDE_DEPRECATED_FEATURES
-
-#define SCN_POSCHANGED 2012
-#define SCN_CHECKBRACE 2007
-
-#endif
-
-#endif
rmfile ./wxc/src/Scintilla.h
hunk ./wxc/src/eljscintilla.cpp 1
-#include "wrapper.h"=0D
-#include "eljscintilla.h"=0D
-=0D
-=0D
-IMPLEMENT_DYNAMIC_CLASS(wxScintilla, wxControl)=0D
-=0D
-#ifdef __WIN32__=0D
-bool wxScintilla::EnsureDll()=0D
-{=0D
- static bool done =3D FALSE;=0D
-=0D
- if (done) return TRUE;=0D
-=0D
- done =3D TRUE;=0D
- return (bool)LoadLibrary (wxT("SciLexer.dll"));=0D
-}=0D
-=0D
-bool wxScintilla::Create(wxWindow *parent,=0D
- wxWindowID id,=0D
- const wxPoint& pos,=0D
- const wxSize& size,=0D
- long style,=0D
- const wxValidator& validator,=0D
- const wxString& name)=0D
-{=0D
- sc_eiffel =3D NULL;=0D
- sc_object =3D NULL;=0D
- =0D
- if (!EnsureDll())=0D
- return FALSE;=0D
- =0D
- if ( !CreateBase(parent, id, pos, size, style, validator, name) )=0D
- return FALSE;=0D
-=0D
- parent->AddChild((wxButton *)this);=0D
-=0D
- long msStyle =3D WS_VISIBLE | WS_TABSTOP | WS_CHILD /* | WS_CLIPSIBLIN=
GS */ ;=0D
-=0D
- m_hWnd =3D (WXHWND)CreateWindowEx=0D
- (=0D
- m_windowStyle,=0D
- /* MakeExtendedStyle(m_windowStyle), */=0D
- wxT("Scintilla"),=0D
- wxT(""),=0D
- msStyle,=0D
- 0, 0, 0, 0,=0D
- GetWinHwnd(parent),=0D
- (HMENU)m_windowId,=0D
- wxGetInstance(),=0D
- NULL=0D
- );=0D
-=0D
- if (m_hWnd =3D=3D 0)=0D
- {=0D
- wxString msg;=0D
-#ifdef __WIN16__=0D
- msg.Printf(wxT("CreateWindowEx failed"));=0D
-#else=0D
- msg.Printf(wxT("CreateWindowEx failed with error number %ld"), (lo=
ng) GetLastError());=0D
-#endif=0D
- wxFAIL_MSG(msg);=0D
- }=0D
-=0D
- m_proc =3D (ScExec)SendMessage((HWND)m_hWnd, 2184, 0, 0);=0D
- m_obj =3D (void*) SendMessage((HWND)m_hWnd, 2185, 0, 0);=0D
-=0D
- // Subclass again for purposes of dialog editing mode=0D
- SubclassWin(m_hWnd);=0D
-=0D
- SetSize(pos.x, pos.y, size.x, size.y);=0D
-=0D
- return TRUE;=0D
-}=0D
-=0D
-wxSize wxScintilla::GetDefaultSize()=0D
-{=0D
- static wxSize s_sizeSci;=0D
-=0D
- if ( s_sizeSci.x =3D=3D 0 )=0D
- {=0D
- s_sizeSci.x =3D 200;=0D
- s_sizeSci.y =3D 200;=0D
- }=0D
- =0D
- return s_sizeSci;=0D
-=0D
-}=0D
-=0D
-bool wxScintilla::MSWOnNotify(int idCtrl,=0D
- WXLPARAM lParam,=0D
- WXLPARAM* result)=0D
-{=0D
- wxCommandEvent event(wxEVT_NULL, m_windowId);=0D
- wxEventType eventType =3D wxEVT_NULL;=0D
- NMHDR *hdr1 =3D (NMHDR*) lParam;=0D
- switch ( hdr1->code )=0D
- {=0D
- case NM_CLICK:=0D
- eventType =3D wxEVT_COMMAND_LEFT_CLICK;=0D
- break;=0D
-=0D
- case NM_DBLCLK:=0D
- eventType =3D wxEVT_COMMAND_LEFT_DCLICK;=0D
- break;=0D
-=0D
- case NM_RCLICK:=0D
- eventType =3D wxEVT_COMMAND_RIGHT_CLICK;=0D
- break;=0D
-=0D
- case NM_RDBLCLK:=0D
- eventType =3D wxEVT_COMMAND_RIGHT_DCLICK;=0D
- break;=0D
-=0D
- case NM_SETFOCUS:=0D
- eventType =3D wxEVT_COMMAND_SET_FOCUS;=0D
- break;=0D
-=0D
- case NM_KILLFOCUS:=0D
- eventType =3D wxEVT_COMMAND_KILL_FOCUS;=0D
- break;=0D
-=0D
- case NM_RETURN:=0D
- eventType =3D wxEVT_COMMAND_ENTER;=0D
- break;=0D
-=0D
- default:=0D
- if (hdr1->hwndFrom =3D=3D (void*)m_hWnd)=0D
- if (sc_eiffel && sc_object)=0D
- return sc_eiffel(sc_object, (void*)lParam) !=3D 0;=0D
- else=0D
- break;=0D
- else=0D
- return wxWindow::MSWOnNotify(idCtrl, lParam, result);=0D
- }=0D
-=0D
- event.SetEventType(eventType);=0D
- event.SetEventObject(this);=0D
-=0D
- return GetEventHandler()->ProcessEvent(event);=0D
-}=0D
-#else=0D
-bool wxScintilla::EnsureDll()=0D
-{=0D
- return FALSE;=0D
-}=0D
-=0D
-bool wxScintilla::Create(wxWindow *parent,=0D
- wxWindowID id,=0D
- const wxPoint& pos,=0D
- const wxSize& size,=0D
- long style,=0D
- const wxValidator& validator,=0D
- const wxString& name)=0D
-{=0D
- sc_eiffel =3D NULL;=0D
- sc_object =3D NULL;=0D
-=0D
- m_needParent =3D TRUE;=0D
- m_acceptsFocus =3D TRUE;=0D
-=0D
- if (!PreCreation( parent, pos, size ) ||=0D
- !CreateBase( parent, id, pos, size, style, validator, name ))=0D
- {=0D
- wxFAIL_MSG( wxT("wxScintilla creation failed") );=0D
- return FALSE;=0D
- }=0D
-=0D
- m_widget =3D scintilla_new();=0D
- =0D
- if (m_widget)=0D
- {=0D
- scintilla_set_id (m_widget, id);=0D
-=0D
- m_proc =3D (ScExec)scintilla_send_message(m_widget, 2184, 0, 0);=0D
- m_obj =3D (void*) scintilla_send_message(m_widget, 2185, 0, 0);=0D
-=0D
- gtk_signal_connect( GTK_OBJECT(m_widget), SCINTILLA_NOTIFY,=0D
- GTK_SIGNAL_FUNC(wxScintilla::gtk_scintilla_notify_callback), (gpointer*=
)this );=0D
- =0D
- m_parent->DoAddChild( this );=0D
- =0D
- PostCreation();=0D
-=0D
- SetSize(pos.x, pos.y, size.x, size.y);=0D
- =0D
- Show (TRUE);=0D
- =0D
- return TRUE;=0D
- }=0D
- return FALSE;=0D
-}=0D
-=0D
-wxSize wxScintilla::GetDefaultSize()=0D
-{=0D
- static wxSize s_sizeSci;=0D
-=0D
- if ( s_sizeSci.x =3D=3D 0 )=0D
- {=0D
- s_sizeSci.x =3D 200;=0D
- s_sizeSci.y =3D 200;=0D
- }=0D
- =0D
- return s_sizeSci;=0D
-=0D
-}=0D
-=0D
-void wxScintilla::gtk_scintilla_notify_callback(GtkWidget*, gint /*wParam*=
/, gpointer lParam, wxScintilla* wxSci)=0D
-{=0D
- if (wxSci->sc_object && wxSci->sc_eiffel)=0D
- wxSci->sc_eiffel(wxSci->sc_object, (void*)lParam);=0D
-}=0D
-=0D
-#endif=0D
-=0D
-extern "C"=0D
-{=0D
-=0D
-EWXWEXPORT(void*, wxScintilla_Create) (void* obj, void* fnc, void* _prt, i=
nt _id, int _lft, int _top, int _wdt, int _hgt, int _stl)=0D
-{=0D
- wxScintilla* result =3D new wxScintilla ((wxWindow*)_prt, _id, wxPoint(_l=
ft, _top), wxSize(_wdt, _hgt), _stl, wxDefaultValidator);=0D
- result->SetEiffelCB(obj, fnc);=0D
-=0D
- return (void*)result;=0D
-}=0D
-=0D
-EWXWEXPORT(int, wxScintilla_Exec) (void* obj, int code, int param1, int pa=
ram2)=0D
-{=0D
- return ((wxScintilla*)obj)->m_proc(((wxScintilla*)obj)->m_obj, code, para=
m1, param2);=0D
-}=0D
-=0D
-EWXWEXPORT(void, wxScintilla_SetEiffelCB) (void* obj, void* eif, void* fnc=
)=0D
-{=0D
- ((wxScintilla*)obj)->SetEiffelCB(eif, fnc);=0D
-}=0D
-=0D
-}=0D
rmfile ./wxc/src/eljscintilla.cpp
hunk ./wxc/src/eljscintilla.h 1
-#ifndef __ELJSCINTILLA_H
-#define __ELJSCINTILLA_H
-
-#ifdef __WIN32__
-#include "wx/msw/private.h"
-#include <commctrl.h>
-#else
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-#if GTK_MAJOR_VERSION < 2
-#define SCINTILLA_NOTIFY "notify"
-#else
-#define SCINTILLA_NOTIFY "sci-notify"
-#endif
-extern "C"
-{
-typedef unsigned long uptr_t;
-typedef long sptr_t;
-
-GtkWidget* scintilla_new (void);
-void scintilla_set_id (GtkWidget*, int id);
-sptr_t scintilla_send_message (GtkWidget*, unsigned int iMessage, uptr_t w=
Param, sptr_t lParam);
-}
-#endif
-
-extern "C"
-{
-
-typedef int _cdecl (*ScNotify)(void*, void*);
-typedef int _cdecl (*ScExec) (void*, int, int, int);
-
-}
-
-class wxScintilla : public wxControl
-{
-DECLARE_DYNAMIC_CLASS(wxScintilla)
-
-public:
- wxScintilla() { }
- wxScintilla(wxWindow *parent, wxWindowID id,
- const wxPoint& pos =3D wxDefaultPosition,
- const wxSize& size =3D wxDefaultSize, long style =3D 0,
- const wxValidator& validator =3D wxDefaultValidator,
- const wxString& name =3D wxT("wxScintilla"))
- {
- Create(parent, id, pos, size, style, validator, name);
- }
-
- bool Create(wxWindow *parent, wxWindowID id,
- const wxPoint& pos =3D wxDefaultPosition,
- const wxSize& size =3D wxDefaultSize, long style =3D 0,
- const wxValidator& validator =3D wxDefaultValidator,
- const wxString& name =3D wxT("wxScintilla"));
-
- static wxSize GetDefaultSize();
-
-#ifdef __WIN32__
- bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM* result);
-#else
- static void gtk_scintilla_notify_callback(GtkWidget*, gint, gpointer lPar=
am, wxScintilla* scitew);
-#endif
-
- ScExec m_proc;
- void* m_obj;
-
- ScNotify sc_eiffel;
- void* sc_object;
- =
- void SetEiffelCB (void* _obj, void* _fnc) {sc_object =3D _obj; sc_eiffel =
=3D (ScNotify)_fnc;};
-
-protected:
- virtual wxSize DoGetBestSize() const
- {return GetDefaultSize();};
-
-private:
- bool EnsureDll();
-};
-
-#endif
rmfile ./wxc/src/eljscintilla.h
hunk ./wxc/wxc-2.4.dsp 526
-SOURCE=3D.\src\eljscintilla.cpp=0D
-# End Source File=0D
-# Begin Source File=0D
-=0D
hunk ./wxc/wxc-2.4.dsp 608
-# Begin Source File=0D
-=0D
-SOURCE=3D.\src\Scintilla.h=0D
-# End Source File=0D
hunk ./wxc/wxc-2.6.dsp 532
-SOURCE=3D.\src\eljscintilla.cpp=0D
-# End Source File=0D
-# Begin Source File=0D
-=0D
hunk ./wxc/wxc-2.6.dsp 614
-# Begin Source File=0D
-=0D
-SOURCE=3D.\src\Scintilla.h=0D
-# End Source File=0D
hunk ./wxc/wxc-2.8.dsp 536
-SOURCE=3D.\src\eljscintilla.cpp=0D
-# End Source File=0D
-# Begin Source File=0D
-=0D
hunk ./wxc/wxc-2.8.dsp 618
-# Begin Source File=0D
-=0D
-SOURCE=3D.\src\Scintilla.h=0D
-# End Source File=0D
hunk ./wxdirect/src/DeriveTypes.hs 323
- ,prefix "wxScintilla_" "scintilla"
}
[Clean up duplicate ewxw_def.h file.
shelarcy <she...@gm...>**20080628114449] {
hunk ./wxc/src/ewxw_def.h 1
-#ifndef __EWXW_DEF_H
-#define __EWXW_DEF_H
-
-#ifdef FOREIGN_RELIGION
-#include "../contrib/contrib.h"
-#endif
-
-#ifdef __WATCOMC__
- #include <windows.h>
- #define EWXWEXPORT(TYPE,FUNC_NAME) TYPE __export FUNC_NAME
-#else
- #ifdef __GNUWIN32__
- #define EWXWEXPORT(TYPE,FUNC_NAME) __declspec(dllexport) TYPE FUNC_NAM=
E
- #else
- #define EWXWEXPORT(TYPE,FUNC_NAME) TYPE FUNC_NAME
- #endif /* #ifdef __GNUWIN32__ */
- #ifndef _cdecl
- #define _cdecl
- #endif
-#endif /* #ifdef __WATCOMC__ */
-
-#endif /* #ifndef __EWXW_DEF_H */
rmfile ./wxc/src/ewxw_def.h
}
[Fix: hardcoded keycode doesn't work well when using wxWidgets 2.8.x.
shelarcy <she...@gm...>**20080630120118] {
hunk ./wx/src/Graphics/UI/WX/Events.hs 280
-pgupKey =3D key KeyPrior
-pgdownKey =3D key KeyNext
+pgupKey =3D key KeyPageUp
+pgdownKey =3D key KeyPageDown
hunk ./wxc/eiffel/wx_defs.e 343
- WXK_BACK : INTEGER is 8=0D
- WXK_TAB : INTEGER is 9=0D
- WXK_RETURN : INTEGER is 13=0D
- WXK_ESCAPE : INTEGER is 27=0D
- WXK_SPACE : INTEGER is 32=0D
- WXK_DELETE : INTEGER is 127=0D
- WXK_START : INTEGER is 300=0D
- WXK_LBUTTON : INTEGER is 301=0D
- WXK_RBUTTON : INTEGER is 302=0D
- WXK_CANCEL : INTEGER is 303=0D
- WXK_MBUTTON : INTEGER is 304=0D
- WXK_CLEAR : INTEGER is 305=0D
- WXK_SHIFT : INTEGER is 306=0D
- WXK_ALT : INTEGER is 307=0D
- WXK_CONTROL : INTEGER is 308=0D
- WXK_MENU : INTEGER is 309=0D
- WXK_PAUSE : INTEGER is 310=0D
- WXK_CAPITAL : INTEGER is 311=0D
- WXK_PRIOR : INTEGER is 312=0D
- WXK_NEXT : INTEGER is 313=0D
- WXK_END : INTEGER is 314=0D
- WXK_HOME : INTEGER is 315=0D
- WXK_LEFT : INTEGER is 316=0D
- WXK_UP : INTEGER is 317=0D
- WXK_RIGHT : INTEGER is 318=0D
- WXK_DOWN : INTEGER is 319=0D
- WXK_SELECT : INTEGER is 320=0D
- WXK_PRINT : INTEGER is 321=0D
- WXK_EXECUTE : INTEGER is 322=0D
- WXK_SNAPSHOT : INTEGER is 323=0D
- WXK_INSERT : INTEGER is 324=0D
- WXK_HELP : INTEGER is 325=0D
- WXK_NUMPAD0 : INTEGER is 326=0D
- WXK_NUMPAD1 : INTEGER is 327=0D
- WXK_NUMPAD2 : INTEGER is 328=0D
- WXK_NUMPAD3 : INTEGER is 329=0D
- WXK_NUMPAD4 : INTEGER is 330=0D
- WXK_NUMPAD5 : INTEGER is 331=0D
- WXK_NUMPAD6 : INTEGER is 332=0D
- WXK_NUMPAD7 : INTEGER is 333=0D
- WXK_NUMPAD8 : INTEGER is 334=0D
- WXK_NUMPAD9 : INTEGER is 335=0D
- WXK_MULTIPLY : INTEGER is 336=0D
- WXK_ADD : INTEGER is 337=0D
- WXK_SEPARATOR : INTEGER is 338=0D
- WXK_SUBTRACT : INTEGER is 339=0D
- WXK_DECIMAL : INTEGER is 340=0D
- WXK_DIVIDE : INTEGER is 341=0D
- WXK_F1 : INTEGER is 342=0D
- WXK_F2 : INTEGER is 343=0D
- WXK_F3 : INTEGER is 344=0D
- WXK_F4 : INTEGER is 345=0D
- WXK_F5 : INTEGER is 346=0D
- WXK_F6 : INTEGER is 347=0D
- WXK_F7 : INTEGER is 348=0D
- WXK_F8 : INTEGER is 349=0D
- WXK_F9 : INTEGER is 350=0D
- WXK_F10 : INTEGER is 351=0D
- WXK_F11 : INTEGER is 352=0D
- WXK_F12 : INTEGER is 353=0D
- WXK_F13 : INTEGER is 354=0D
- WXK_F14 : INTEGER is 355=0D
- WXK_F15 : INTEGER is 356=0D
- WXK_F16 : INTEGER is 357=0D
- WXK_F17 : INTEGER is 358=0D
- WXK_F18 : INTEGER is 359=0D
- WXK_F19 : INTEGER is 360=0D
- WXK_F20 : INTEGER is 361=0D
- WXK_F21 : INTEGER is 362=0D
- WXK_F22 : INTEGER is 363=0D
- WXK_F23 : INTEGER is 364=0D
- WXK_F24 : INTEGER is 365=0D
- WXK_NUMLOCK : INTEGER is 366=0D
- WXK_SCROLL : INTEGER is 367=0D
- WXK_PAGEUP : INTEGER is 368=0D
- WXK_PAGEDOWN : INTEGER is 369=0D
- WXK_NUMPAD_SPACE : INTEGER is 370=0D
- WXK_NUMPAD_TAB : INTEGER is 371=0D
- WXK_NUMPAD_ENTER : INTEGER is 372=0D
- WXK_NUMPAD_F1 : INTEGER is 373=0D
- WXK_NUMPAD_F2 : INTEGER is 374=0D
- WXK_NUMPAD_F3 : INTEGER is 375=0D
- WXK_NUMPAD_F4 : INTEGER is 376=0D
- WXK_NUMPAD_HOME : INTEGER is 377=0D
- WXK_NUMPAD_LEFT : INTEGER is 378=0D
- WXK_NUMPAD_UP : INTEGER is 379=0D
- WXK_NUMPAD_RIGHT : INTEGER is 380=0D
- WXK_NUMPAD_DOWN : INTEGER is 381=0D
- WXK_NUMPAD_PRIOR : INTEGER is 382=0D
- WXK_NUMPAD_PAGEUP : INTEGER is 383=0D
- WXK_NUMPAD_NEXT : INTEGER is 384=0D
- WXK_NUMPAD_PAGEDOWN : INTEGER is 385=0D
- WXK_NUMPAD_END : INTEGER is 386=0D
- WXK_NUMPAD_BEGIN : INTEGER is 387=0D
- WXK_NUMPAD_INSERT : INTEGER is 388=0D
- WXK_NUMPAD_DELETE : INTEGER is 389=0D
- WXK_NUMPAD_EQUAL : INTEGER is 390=0D
- WXK_NUMPAD_MULTIPLY : INTEGER is 391=0D
- WXK_NUMPAD_ADD : INTEGER is 392=0D
- WXK_NUMPAD_SEPARATOR : INTEGER is 393=0D
- WXK_NUMPAD_SUBTRACT : INTEGER is 394=0D
- WXK_NUMPAD_DECIMAL : INTEGER is 395=0D
- WXK_NUMPAD_DIVIDE : INTEGER is 396=0D
hunk ./wxc/include/wxc_glue.h 244
+=0D
+/* Keys */=0D
+int expK_BACK( );=0D
+int expK_TAB( );=0D
+int expK_RETURN( );=0D
+int expK_ESCAPE( );=0D
+int expK_SPACE( );=0D
+int expK_DELETE( );=0D
+int expK_START( );=0D
+int expK_LBUTTON( );=0D
+int expK_RBUTTON( );=0D
+int expK_CANCEL( );=0D
+int expK_MBUTTON( );=0D
+int expK_CLEAR( );=0D
+int expK_SHIFT( );=0D
+int expK_ALT( );=0D
+int expK_CONTROL( );=0D
+int expK_MENU( );=0D
+int expK_PAUSE( );=0D
+int expK_CAPITAL( );=0D
+int expK_END( );=0D
+int expK_HOME( );=0D
+int expK_LEFT( );=0D
+int expK_UP( );=0D
+int expK_RIGHT( );=0D
+int expK_DOWN( );=0D
+int expK_SELECT( );=0D
+int expK_PRINT( );=0D
+int expK_EXECUTE( );=0D
+int expK_SNAPSHOT( );=0D
+int expK_INSERT( );=0D
+int expK_HELP( );=0D
+int expK_NUMPAD0( );=0D
+int expK_NUMPAD1( );=0D
+int expK_NUMPAD2( );=0D
+int expK_NUMPAD3( );=0D
+int expK_NUMPAD4( );=0D
+int expK_NUMPAD5( );=0D
+int expK_NUMPAD6( );=0D
+int expK_NUMPAD7( );=0D
+int expK_NUMPAD8( );=0D
+int expK_NUMPAD9( );=0D
+int expK_MULTIPLY( );=0D
+int expK_ADD( );=0D
+int expK_SEPARATOR( );=0D
+int expK_SUBTRACT( );=0D
+int expK_DECIMAL( );=0D
+int expK_DIVIDE( );=0D
+int expK_F1( );=0D
+int expK_F2( );=0D
+int expK_F3( );=0D
+int expK_F4( );=0D
+int expK_F5( );=0D
+int expK_F6( );=0D
+int expK_F7( );=0D
+int expK_F8( );=0D
+int expK_F9( );=0D
+int expK_F10( );=0D
+int expK_F11( );=0D
+int expK_F12( );=0D
+int expK_F13( );=0D
+int expK_F14( );=0D
+int expK_F15( );=0D
+int expK_F16( );=0D
+int expK_F17( );=0D
+int expK_F18( );=0D
+int expK_F19( );=0D
+int expK_F20( );=0D
+int expK_F21( );=0D
+int expK_F22( );=0D
+int expK_F23( );=0D
+int expK_F24( );=0D
+int expK_NUMLOCK( );=0D
+int expK_SCROLL( );=0D
+int expK_PAGEUP( );=0D
+int expK_PAGEDOWN( );=0D
+int expK_NUMPAD_SPACE( );=0D
+int expK_NUMPAD_TAB( );=0D
+int expK_NUMPAD_ENTER( );=0D
+int expK_NUMPAD_F1( );=0D
+int expK_NUMPAD_F2( );=0D
+int expK_NUMPAD_F3( );=0D
+int expK_NUMPAD_F4( );=0D
+int expK_NUMPAD_HOME( );=0D
+int expK_NUMPAD_LEFT( );=0D
+int expK_NUMPAD_UP( );=0D
+int expK_NUMPAD_RIGHT( );=0D
+int expK_NUMPAD_DOWN( );=0D
+int expK_NUMPAD_PAGEUP( );=0D
+int expK_NUMPAD_PAGEDOWN( );=0D
+int expK_NUMPAD_END( );=0D
+int expK_NUMPAD_BEGIN( );=0D
+int expK_NUMPAD_INSERT( );=0D
+int expK_NUMPAD_DELETE( );=0D
+int expK_NUMPAD_EQUAL( );=0D
+int expK_NUMPAD_MULTIPLY( );=0D
+int expK_NUMPAD_ADD( );=0D
+int expK_NUMPAD_SEPARATOR( );=0D
+int expK_NUMPAD_SUBTRACT( );=0D
+int expK_NUMPAD_DECIMAL( );=0D
+int expK_NUMPAD_DIVIDE( );=0D
hunk ./wxc/src/eljevent.cpp 951
-#if wxVERSION_NUMBER >=3D 2400
hunk ./wxc/src/eljevent.cpp 2090
-#endif /* wxVERSION >=3D 2400 */
+EWXWEXPORT(int,expK_BACK)()
+{
+ return (int)WXK_BACK;
+}
+
+EWXWEXPORT(int,expK_TAB)()
+{
+ return (int)WXK_TAB;
+}
+
+EWXWEXPORT(int,expK_RETURN)()
+{
+ return (int)WXK_RETURN;
+}
+
+EWXWEXPORT(int,expK_ESCAPE)()
+{
+ return (int)WXK_ESCAPE;
+}
+
+EWXWEXPORT(int,expK_SPACE)()
+{
+ return (int)WXK_SPACE;
+}
+
+EWXWEXPORT(int,expK_DELETE)()
+{
+ return (int)WXK_DELETE;
+}
+
+EWXWEXPORT(int,expK_START)()
+{
+ return (int)WXK_START;
+}
+
+EWXWEXPORT(int,expK_LBUTTON)()
+{
+ return (int)WXK_LBUTTON;
+}
+
+EWXWEXPORT(int,expK_RBUTTON)()
+{
+ return (int)WXK_RBUTTON;
+}
+
+EWXWEXPORT(int,expK_CANCEL)()
+{
+ return (int)WXK_CANCEL;
+}
+
+EWXWEXPORT(int,expK_MBUTTON)()
+{
+ return (int)WXK_MBUTTON;
+}
+
+EWXWEXPORT(int,expK_CLEAR)()
+{
+ return (int)WXK_CLEAR;
+}
+
+EWXWEXPORT(int,expK_SHIFT)()
+{
+ return (int)WXK_SHIFT;
+}
+
+EWXWEXPORT(int,expK_ALT)()
+{
+ return (int)WXK_ALT;
+}
+
+EWXWEXPORT(int,expK_CONTROL)()
+{
+ return (int)WXK_CONTROL;
+}
+
+EWXWEXPORT(int,expK_MENU)()
+{
+ return (int)WXK_MENU;
+}
+
+EWXWEXPORT(int,expK_PAUSE)()
+{
+ return (int)WXK_PAUSE;
+}
+
+EWXWEXPORT(int,expK_CAPITAL)()
+{
+ return (int)WXK_CAPITAL;
+}
+
+EWXWEXPORT(int,expK_END)()
+{
+ return (int)WXK_END;
+}
+
+EWXWEXPORT(int,expK_HOME)()
+{
+ return (int)WXK_HOME;
+}
+
+EWXWEXPORT(int,expK_LEFT)()
+{
+ return (int)WXK_LEFT;
+}
+
+EWXWEXPORT(int,expK_UP)()
+{
+ return (int)WXK_UP;
+}
+
+EWXWEXPORT(int,expK_RIGHT)()
+{
+ return (int)WXK_RIGHT;
+}
+
+EWXWEXPORT(int,expK_DOWN)()
+{
+ return (int)WXK_DOWN;
+}
+
+EWXWEXPORT(int,expK_SELECT)()
+{
+ return (int)WXK_SELECT;
+}
+
+EWXWEXPORT(int,expK_PRINT)()
+{
+ return (int)WXK_PRINT;
+}
+
+EWXWEXPORT(int,expK_EXECUTE)()
+{
+ return (int)WXK_EXECUTE;
+}
+
+EWXWEXPORT(int,expK_SNAPSHOT)()
+{
+ return (int)WXK_SNAPSHOT;
+}
+
+EWXWEXPORT(int,expK_INSERT)()
+{
+ return (int)WXK_INSERT;
+}
+
+EWXWEXPORT(int,expK_HELP)()
+{
+ return (int)WXK_HELP;
+}
+
+EWXWEXPORT(int,expK_NUMPAD0)()
+{
+ return (int)WXK_NUMPAD0;
+}
+
+EWXWEXPORT(int,expK_NUMPAD1)()
+{
+ return (int)WXK_NUMPAD1;
+}
+
+EWXWEXPORT(int,expK_NUMPAD2)()
+{
+ return (int)WXK_NUMPAD2;
+}
+
+EWXWEXPORT(int,expK_NUMPAD3)()
+{
+ return (int)WXK_NUMPAD3;
+}
+
+EWXWEXPORT(int,expK_NUMPAD4)()
+{
+ return (int)WXK_NUMPAD4;
+}
+
+EWXWEXPORT(int,expK_NUMPAD5)()
+{
+ return (int)WXK_NUMPAD5;
+}
+
+EWXWEXPORT(int,expK_NUMPAD6)()
+{
+ return (int)WXK_NUMPAD6;
+}
+
+EWXWEXPORT(int,expK_NUMPAD7)()
+{
+ return (int)WXK_NUMPAD7;
+}
+
+EWXWEXPORT(int,expK_NUMPAD8)()
+{
+ return (int)WXK_NUMPAD8;
+}
+
+EWXWEXPORT(int,expK_NUMPAD9)()
+{
+ return (int)WXK_NUMPAD9;
+}
+
+EWXWEXPORT(int,expK_MULTIPLY)()
+{
+ return (int)WXK_MULTIPLY;
+}
+
+EWXWEXPORT(int,expK_ADD)()
+{
+ return (int)WXK_ADD;
+}
+
+EWXWEXPORT(int,expK_SEPARATOR)()
+{
+ return (int)WXK_SEPARATOR;
+}
+
+EWXWEXPORT(int,expK_SUBTRACT)()
+{
+ return (int)WXK_SUBTRACT;
+}
+
+EWXWEXPORT(int,expK_DECIMAL)()
+{
+ return (int)WXK_DECIMAL;
+}
+
+EWXWEXPORT(int,expK_DIVIDE)()
+{
+ return (int)WXK_DIVIDE;
+}
+
+EWXWEXPORT(int,expK_F1)()
+{
+ return (int)WXK_F1;
+}
+
+EWXWEXPORT(int,expK_F2)()
+{
+ return (int)WXK_F2;
+}
+
+EWXWEXPORT(int,expK_F3)()
+{
+ return (int)WXK_F3;
+}
+
+EWXWEXPORT(int,expK_F4)()
+{
+ return (int)WXK_F4;
+}
+
+EWXWEXPORT(int,expK_F5)()
+{
+ return (int)WXK_F5;
+}
+
+EWXWEXPORT(int,expK_F6)()
+{
+ return (int)WXK_F6;
+}
+
+EWXWEXPORT(int,expK_F7)()
+{
+ return (int)WXK_F7;
+}
+
+EWXWEXPORT(int,expK_F8)()
+{
+ return (int)WXK_F8;
+}
+
+EWXWEXPORT(int,expK_F9)()
+{
+ return (int)WXK_F9;
+}
+
+EWXWEXPORT(int,expK_F10)()
+{
+ return (int)WXK_F10;
+}
+
+EWXWEXPORT(int,expK_F11)()
+{
+ return (int)WXK_F11;
+}
+
+EWXWEXPORT(int,expK_F12)()
+{
+ return (int)WXK_F12;
+}
+
+EWXWEXPORT(int,expK_F13)()
+{
+ return (int)WXK_F13;
+}
+
+EWXWEXPORT(int,expK_F14)()
+{
+ return (int)WXK_F14;
+}
+
+EWXWEXPORT(int,expK_F15)()
+{
+ return (int)WXK_F15;
+}
+
+EWXWEXPORT(int,expK_F16)()
+{
+ return (int)WXK_F16;
+}
+
+EWXWEXPORT(int,expK_F17)()
+{
+ return (int)WXK_F17;
+}
+
+EWXWEXPORT(int,expK_F18)()
+{
+ return (int)WXK_F18;
+}
+
+EWXWEXPORT(int,expK_F19)()
+{
+ return (int)WXK_F19;
+}
+
+EWXWEXPORT(int,expK_F20)()
+{
+ return (int)WXK_F20;
+}
+
+EWXWEXPORT(int,expK_F21)()
+{
+ return (int)WXK_F21;
+}
+
+EWXWEXPORT(int,expK_F22)()
+{
+ return (int)WXK_F22;
+}
+
+EWXWEXPORT(int,expK_F23)()
+{
+ return (int)WXK_F23;
+}
+
+EWXWEXPORT(int,expK_F24)()
+{
+ return (int)WXK_F24;
+}
+
+EWXWEXPORT(int,expK_NUMLOCK)()
+{
+ return (int)WXK_NUMLOCK;
+}
+
+EWXWEXPORT(int,expK_SCROLL)()
+{
+ return (int)WXK_SCROLL;
+}
+
+EWXWEXPORT(int,expK_PAGEUP)()
+{
+ return (int)WXK_PAGEUP;
+}
+
+EWXWEXPORT(int,expK_PAGEDOWN)()
+{
+ return (int)WXK_PAGEDOWN;
+}
+
+EWXWEXPORT(int,expK_NUMPAD_SPACE)()
+{
+ return (int)WXK_NUMPAD_SPACE;
+}
+
+EWXWEXPORT(int,expK_NUMPAD_TAB)()
+{
+ return (int)WXK_NUMPAD_TAB;
+}
+
+EWXWEXPORT(int,expK_NUMPAD_ENTER)()
+{
+ return (int)WXK_NUMPAD_ENTER;
+}
+
+EWXWEXPORT(int,expK_NUMPAD_F1)()
+{
+ return (int)WXK_NUMPAD_F1;
+}
+
+EWXWEXPORT(int,expK_NUMPAD_F2)()
+{
+ return (int)WXK_NUMPAD_F2;
+}
+
+EWXWEXPORT(int,expK_NUMPAD_F3)()
+{
+ return (int)WXK_NUMPAD_F3;
+}
+
+EWXWEXPORT(int,expK_NUMPAD_F4)()
+{
+ return (int)WXK_NUMPAD_F4;
+}
+
+EWXWEXPORT(int,expK_NUMPAD_HOME)()
+{
+ return (int)WXK_NUMPAD_HOME;
+}
+
+EWXWEXPORT(int,expK_NUMPAD_LEFT)()
+{
+ return (int)WXK_NUMPAD_LEFT;
+}
+
+EWXWEXPORT(int,expK_NUMPAD_UP)()
+{
+ return (int)WXK_NUMPAD_UP;
+}
+
+EWXWEXPORT(int,expK_NUMPAD_RIGHT)()
+{
+ return (int)WXK_NUMPAD_RIGHT;
+}
+
+EWXWEXPORT(int,expK_NUMPAD_DOWN)()
+{
+ return (int)WXK_NUMPAD_DOWN;
+}
+
+EWXWEXPORT(int,expK_NUMPAD_PAGEUP)()
+{
+ return (int)WXK_NUMPAD_PAGEUP;
+}
+
+EWXWEXPORT(int,expK_NUMPAD_PAGEDOWN)()
+{
+ return (int)WXK_NUMPAD_PAGEDOWN;
+}
+
+EWXWEXPORT(int,expK_NUMPAD_END)()
+{
+ return (int)WXK_NUMPAD_END;
+}
+
+EWXWEXPORT(int,expK_NUMPAD_BEGIN)()
+{
+ return (int)WXK_NUMPAD_BEGIN;
+}
+
+EWXWEXPORT(int,expK_NUMPAD_INSERT)()
+{
+ return (int)WXK_NUMPAD_INSERT;
+}
+
+EWXWEXPORT(int,expK_NUMPAD_DELETE)()
+{
+ return (int)WXK_NUMPAD_DELETE;
+}
+
+EWXWEXPORT(int,expK_NUMPAD_EQUAL)()
+{
+ return (int)WXK_NUMPAD_EQUAL;
+}
+
+EWXWEXPORT(int,expK_NUMPAD_MULTIPLY)()
+{
+ return (int)WXK_NUMPAD_MULTIPLY;
+}
+
+EWXWEXPORT(int,expK_NUMPAD_ADD)()
+{
+ return (int)WXK_NUMPAD_ADD;
+}
+
+EWXWEXPORT(int,expK_NUMPAD_SEPARATOR)()
+{
+ return (int)WXK_NUMPAD_SEPARATOR;
+}
+
+EWXWEXPORT(int,expK_NUMPAD_SUBTRACT)()
+{
+ return (int)WXK_NUMPAD_SUBTRACT;
+}
+
+EWXWEXPORT(int,expK_NUMPAD_DECIMAL)()
+{
+ return (int)WXK_NUMPAD_DECIMAL;
+}
+
+EWXWEXPORT(int,expK_NUMPAD_DIVIDE)()
+{
+ return (int)WXK_NUMPAD_DIVIDE;
+}
+
+EWXWEXPORT(int,expK_WINDOWS_LEFT)()
+{
+ return (int)WXK_WINDOWS_LEFT;
+}
+
+EWXWEXPORT(int,expK_WINDOWS_RIGHT)()
+{
+ return (int)WXK_WINDOWS_RIGHT;
+}
+
+EWXWEXPORT(int,expK_WINDOWS_MENU)()
+{
+ return (int)WXK_WINDOWS_MENU;
+}
+
+EWXWEXPORT(int,expK_COMMAND)()
+{
+ return (int)WXK_COMMAND;
+}
+
+EWXWEXPORT(int,expK_SPECIAL1)()
+{
+ return (int)WXK_SPECIAL1;
+}
+
+EWXWEXPORT(int,expK_SPECIAL2)()
+{
+ return (int)WXK_SPECIAL2;
+}
+
+EWXWEXPORT(int,expK_SPECIAL3)()
+{
+ return (int)WXK_SPECIAL3;
+}
+
+EWXWEXPORT(int,expK_SPECIAL4)()
+{
+ return (int)WXK_SPECIAL4;
+}
+
+EWXWEXPORT(int,expK_WXK_SPECIAL5)()
+{
+ return (int)WXK_SPECIAL5;
+}
+
+EWXWEXPORT(int,expK_SPECIAL6)()
+{
+ return (int)WXK_SPECIAL6;
+}
+
+EWXWEXPORT(int,expK_SPECIAL7)()
+{
+ return (int)WXK_SPECIAL7;
+}
+
+EWXWEXPORT(int,expK_SPECIAL8)()
+{
+ return (int)WXK_SPECIAL8;
+}
+
+EWXWEXPORT(int,expK_SPECIAL9)()
+{
+ return (int)WXK_SPECIAL9;
+}
+
+EWXWEXPORT(int,expK_SPECIAL10)()
+{
+ return (int)WXK_SPECIAL10;
+}
+
+EWXWEXPORT(int,expK_SPECIAL11)()
+{
+ return (int)WXK_SPECIAL11;
+}
+
+EWXWEXPORT(int,expK_SPECIAL12)()
+{
+ return (int)WXK_SPECIAL12;
+}
+
+EWXWEXPORT(int,expK_SPECIAL13)()
+{
+ return (int)WXK_SPECIAL13;
+}
+
+EWXWEXPORT(int,expK_SPECIAL14)()
+{
+ return (int)WXK_SPECIAL14;
+}
+
+EWXWEXPORT(int,expK_SPECIAL15)()
+{
+ return (int)WXK_SPECIAL15;
+}
+
+EWXWEXPORT(int,expK_SPECIAL16)()
+{
+ return (int)WXK_SPECIAL16;
+}
+
+EWXWEXPORT(int,expK_SPECIAL17)()
+{
+ return (int)WXK_SPECIAL17;
+}
+
+EWXWEXPORT(int,expK_SPECIAL18)()
+{
+ return (int)WXK_SPECIAL18;
+}
+
+EWXWEXPORT(int,expK_SPECIAL19)()
+{
+ return (int)WXK_SPECIAL19;
+}
+
+EWXWEXPORT(int,expK_SPECIAL20)()
+{
+ return (int)WXK_SPECIAL20;
+}
hunk ./wxcore/src/Graphics/UI/WXCore/Events.hs 1495
- | KeyPrior -- ^ Page up.
- | KeyNext -- ^ Page down.
hunk ./wxcore/src/Graphics/UI/WXCore/Events.hs 1580
- | KeyNumPrior
hunk ./wxcore/src/Graphics/UI/WXCore/Events.hs 1581
- | KeyNumNext
hunk ./wxcore/src/Graphics/UI/WXCore/Events.hs 1608
- KeyPrior -> wxK_PRIOR
- KeyNext -> wxK_NEXT
hunk ./wxcore/src/Graphics/UI/WXCore/Events.hs 1699
- ,(wxK_PRIOR , KeyPrior)
- ,(wxK_NEXT , KeyNext)
hunk ./wxcore/src/Graphics/UI/WXCore/Events.hs 1779
- ,(wxK_NUMPAD_PRIOR , KeyPrior)
hunk ./wxcore/src/Graphics/UI/WXCore/Events.hs 1780
- ,(wxK_NUMPAD_NEXT , KeyNext)
hunk ./wxcore/src/Graphics/UI/WXCore/Events.hs 1819
- KeyPrior -> "PgUp"
- KeyNext -> "PgDn"
hunk ./wxdirect/src/CompileClasses.hs 349
+ Id -> "withIntResult $" ++ nl ++ call
hunk ./wxdirect/src/CompileClasses.hs 384
+ Id -> "unsafePerformIO $" ++ nl ++ body
hunk ./wxdirect/src/CompileClasses.hs 433
+ Id -> traceError "id as argument" decl $ name
hunk ./wxdirect/src/CompileClasses.hs 520
+ Id -> "{-# NOINLINE " ++ haskellDeclName (declName decl) ++ " #=
-}\n" ++ typedecl ++ " Int"
hunk ./wxdirect/src/CompileClasses.hs 618
+ Id -> "IO CInt"
hunk ./wxdirect/src/DeriveTypes.hs 441
- $ deriveEventId
+ $ deriveId
hunk ./wxdirect/src/DeriveTypes.hs 675
--- derive event ids: int expEVT_XXX();
-deriveEventId decl@Decl{ declRet =3D Int _, declArgs =3D [] }
+-- derive event ids: int expEVT_XXX() and expXXX_XXX();
+deriveId decl@Decl{ declRet =3D Int _, declArgs =3D [] }
hunk ./wxdirect/src/DeriveTypes.hs 679
-deriveEventId decl
+deriveId decl@Decl{ declRet =3D Int _, declArgs =3D [] }
+ | isPrefixOf "exp" (declName decl)
+ =3D decl{ declRet =3D Id }
+deriveId decl
hunk ./wxdirect/src/HaskellNames.hs 89
+ | isPrefixOf "exp" name =3D ("wx" ++ drop 3 name)
hunk ./wxdirect/src/Types.hs 90
+ | Id
}
[Fix Building without WXWIN_COMPATIBILITY_2_6 in eljrc.cpp.
shelarcy <she...@gm...>**20080630120326] {
hunk ./wxc/src/eljrc.cpp 56
- XRC_ADD_STYLE(wxTHICK_FRAME);=0D
hunk ./wxc/src/eljrc.cpp 58
- XRC_ADD_STYLE(wxRESIZE_BOX);=0D
hunk ./wxc/src/eljrc.cpp 65
- XRC_ADD_STYLE(wxNO_3D);=0D
hunk ./wxc/src/eljrc.cpp 109
- XRC_ADD_STYLE(wxTHICK_FRAME);=0D
hunk ./wxc/src/eljrc.cpp 111
- XRC_ADD_STYLE(wxRESIZE_BOX);=0D
hunk ./wxc/src/eljrc.cpp 118
- XRC_ADD_STYLE(wxNO_3D);=0D
hunk ./wxc/src/eljrc.cpp 164
- XRC_ADD_STYLE(wxSP_FULLSASH);=0D
- XRC_ADD_STYLE(wxSP_BORDER);=0D
hunk ./wxc/src/eljrc.cpp 168
- XRC_ADD_STYLE(wxNO_3D);=0D
hunk ./wxc/src/eljrc.cpp 217
- XRC_ADD_STYLE(wxNO_3D);=0D
hunk ./wxc/src/eljrc.cpp 248
- XRC_ADD_STYLE(wxNO_3D);=0D
}
[Add download link to two GHC 6.8.3's binary.
shelarcy <she...@gm...>**20080630144522] {
hunk ./homepage/download.html 91
-<dt><a href=3D"http://prdownloads.sourceforge.net/wxhaskell/wxhaskell-bin-=
msw2.6.4-ghc6.8.2-0.10.3-0.zip?download">wxhaskell-bin-msw2.6.4-ghc6.8.2-0.=
10.3-0.zip</a> Windows, ghc 6.8.2</a><br>
+<dt><a href=3D"http://prdownloads.sourceforge.net/wxhaskell/wxhaskell-bin-=
msw2.6.4-ghc6.8.3-0.10.3-0.zip?download">wxhaskell-bin-msw2.6.4-ghc6.8.3-0.=
10.3-0.zip</a> (Windows, ghc 6.8.3, updated)</a><br /></dt>
+<dt><a href=3D"http://prdownloads.sourceforge.net/wxhaskell/wxhaskell-bin-=
msw2.6.4-ghc6.8.2-0.10.3-0.zip?download">wxhaskell-bin-msw2.6.4-ghc6.8.2-0.=
10.3-0.zip</a> (Windows, ghc 6.8.2)</a><br>
hunk ./homepage/download.html 114
+ href=3D"http://downloads.sourceforge.net/wxhaskell/wxhaskell-bin-powerpc=
-mac2.8.7-ghc6.8.3-0.10.3-0.dmg?download">wxhaskell-bin-powerpc-mac2.8.7-gh=
c6.8.3-0.10.3-0.dmg</a>
+(MacOSX, PowerPC, ghc 6.8.3, updated)</a><br></dt>
+<dt><a
}
Context:
[Fix: eljdcsvg.cpp doesn't build other than Windows.
shelarcy <she...@gm...>**20080625095858] =
[Just reviving ELJ's wxXmlResource code.
shelarcy <she...@gm...>**20080625052046] =
[Use Int64 representing wxFileOffset type.
shelarcy <she...@gm...>**20080624152015] =
[Add dropped wxMedia's events to wxc.
shelarcy <she...@gm...>**20080624140139] =
[Add dropped wx*DCs.
shelarcy <she...@gm...>**20080624122641] =
[Update building information about --with-contrib option.
shelarcy <she...@gm...>**20080624113243] =
[Revive wxSVGFileDC code.
shelarcy <she...@gm...>**20080624113214] =
[Change --with-stc to --with-contrib for future contrib libraries support.
shelarcy <she...@gm...>**20080624032429] =
[Update information about builiding wxWidgets and wxc with Microsoft Visual=
C++ Express Edition.
shelarcy <she...@gm...>**20080624023628] =
[Fix #1400488: Win install problem when path with spaces, e.g. "Program Fil=
es".
shelarcy <she...@gm...>**20080624020657] =
[Partialy fix a bug in wxhaskell-register.bat.
shelarcy <she...@gm...>**20080623152256] =
[Add --enable-optimization opition for building library with optimization f=
lags.
shelarcy <she...@gm...>**20080531114050] =
[Use CDouble and realToFrac instead of marshaling Double type directly.
shelarcy <she...@gm...>**20080530024730] =
[Remove unused make before-dist.
shelarcy <she...@gm...>**20080529120234] =
[Fix a bug in haddock documentation structure of Rectangle.
shelarcy <she...@gm...>**20080529111415] =
[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:
d6bb15b96e759ea305afcb1d689787ae02e09cb6
--=_--
.
|
|
From: Eric Y. K. <eri...@gm...> - 2008-06-25 22:25:58
|
Pushed! Thanks! I keep meaning to move towards a code.haskell.org repository -- Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow> PGP Key ID: 08AC04F9 |
|
From: shelarcy <she...@gm...> - 2008-06-25 10:03:17
|
DarcsURL: C:/home/shelarcy/wxhaskell
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=_"
--=_
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
Wed Jun 25 14:20:46 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008 shelarcy <shelarc=
y...@gm...>
* Just reviving ELJ's wxXmlResource code.
Wed Jun 25 18:58:58 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008 shelarcy <shelarc=
y...@gm...>
* Fix: eljdcsvg.cpp doesn't build other than Windows.
--=_
Content-Type: text/x-darcs-patch; name="just-reviving-elj_s-wxxmlresource-code_.dpatch"
Content-Transfer-Encoding: quoted-printable
Content-Description: A darcs patch for your repository!
New patches:
[Just reviving ELJ's wxXmlResource code.
shelarcy <she...@gm...>**20080625052046] {
hunk ./makefile 160
- printdlg printing process radiobox radiobutton region \
+ printdlg printing process radiobox radiobutton rc region \
hunk ./wxc/include/wxc_glue.h 4831
-int wxXmlResource_AttachUnknownControl( TSelf(wxXmlResource) _obj, =
TStringVoid name, TClass(wxControl) control, TClass(wxWindow) parent );=0D
+int wxXmlResource_AttachUnknownControl( TSelf(wxXmlResource) _obj, =
TClass(wxString) name, TClass(wxControl) control, TClass(wxWindow) parent )=
;=0D
hunk ./wxc/include/wxc_glue.h 4834
-TClass(wxXmlResource) wxXmlResource_Create( void* _obj, int flags );=0D
-TClass(wxXmlResource) wxXmlResource_CreateFromFile( TSelf(wxXmlResource) _=
obj, void* filemask, int flags );=0D
+TClass(wxXmlResource) wxXmlResource_Create( int flags );=0D
+TClass(wxXmlResource) wxXmlResource_CreateFromFile( TClass(wxString) filem=
ask, int flags );=0D
hunk ./wxc/include/wxc_glue.h 4837
-void* wxXmlResource_Get( );=0D
+TClass(wxXmlResource) wxXmlResource_Get( );=0D
+TStringLen wxXmlResource_GetDomain( TSelf(wxXmlResource) _obj, TStringOut =
domain );=0D
hunk ./wxc/include/wxc_glue.h 4841
-int wxXmlResource_GetXRCID( TSelf(wxXmlResource) str_id );=0D
+int wxXmlResource_GetXRCID( TSelf(wxXmlResource) _obj, TSelf(wxXmlR=
esource) str_id );=0D
hunk ./wxc/include/wxc_glue.h 4843
-int wxXmlResource_InitializeObject( TSelf(wxXmlResource) _obj, void=
* _inst, TClass(wxWindow) parent, TStringVoid name, void* classname );=0D
+int wxXmlResource_InitializeObject( TSelf(wxXmlResource) _obj, TSel=
f(wxObject) _inst, TClass(wxWindow) parent, TClass(wxString) name, TClass(w=
xString) classname );=0D
hunk ./wxc/include/wxc_glue.h 4845
-int wxXmlResource_Load( TSelf(wxXmlResource) _obj, void* filemask )=
;=0D
-void wxXmlResource_LoadBitmap( TSelf(wxXmlResource) _obj, TStringVoi=
d name, TClassRef(wxBitmap) _ref );=0D
-void* wxXmlResource_LoadDialog( TSelf(wxXmlResource) _obj, TClass(wxW=
indow) parent, TStringVoid name );=0D
-void* wxXmlResource_LoadFrame( TSelf(wxXmlResource) _obj, TClass(wxWi=
ndow) parent, TStringVoid name );=0D
-void wxXmlResource_LoadIcon( TSelf(wxXmlResource) _obj, TStringVoid =
name, TClassRef(wxIcon) _ref );=0D
-void* wxXmlResource_LoadMenu( TSelf(wxXmlResource) _obj, TStringVoid =
name );=0D
-void* wxXmlResource_LoadMenuBar( TSelf(wxXmlResource) _obj, TClass(wx=
Window) parent, TStringVoid name );=0D
-void* wxXmlResource_LoadObject( TSelf(wxXmlResource) _obj, TClass(wxW=
indow) parent, TStringVoid name, void* classname );=0D
-void* wxXmlResource_LoadPanel( TSelf(wxXmlResource) _obj, TClass(wxWi=
ndow) parent, TStringVoid name );=0D
-void* wxXmlResource_LoadToolBar( TSelf(wxXmlResource) _obj, TClass(wx=
Window) parent, TStringVoid name );=0D
-void* wxXmlResource_Set( TSelf(wxXmlResource) res );=0D
+int wxXmlResource_Load( TSelf(wxXmlResource) _obj, TClass(wxString)=
filemask );=0D
+void wxXmlResource_LoadBitmap( TSelf(wxXmlResource) _obj, TClass(wxS=
tring) name, TClassRef(wxBitmap) _ref );=0D
+TClass(wxDialog) wxXmlResource_LoadDialog( TSelf(wxXmlResource) _obj, TCla=
ss(wxWindow) parent, TClass(wxString) name );=0D
+TClass(wxFrame) wxXmlResource_LoadFrame( TSelf(wxXmlResource) _obj, TClass=
(wxWindow) parent, TClass(wxString) name );=0D
+void wxXmlResource_LoadIcon( TSelf(wxXmlResource) _obj, TClass(wxStr=
ing) name, TClassRef(wxIcon) _ref );=0D
+TClass(wxMenu) wxXmlResource_LoadMenu( TSelf(wxXmlResource) _obj, TClass(w=
xString) name );=0D
+TClass(wxMenuBar) wxXmlResource_LoadMenuBar( TSelf(wxXmlResource) _obj, TC=
lass(wxWindow) parent, TClass(wxString) name );=0D
+TClass(wxObject) wxXmlResource_LoadObject( TSelf(wxXmlResource) _obj, TCla=
ss(wxWindow) parent, TClass(wxString) name, TClass(wxString) classname );=
=0D
+TClass(wxPanel) wxXmlResource_LoadPanel( TSelf(wxXmlResource) _obj, TClass=
(wxWindow) parent, TClass(wxString) name );=0D
+TClass(wxToolBar) wxXmlResource_LoadToolBar( TSelf(wxXmlResource) _obj, TC=
lass(wxWindow) parent, TClass(wxString) name );=0D
+TBool wxXmlResource_Unload( TSelf(wxXmlResource) _obj, TClass(wxStrin=
g) filemask );=0D
+TClass(wxXmlResource) wxXmlResource_Set( TSelf(wxXmlResource) _obj, TSelf(=
wxXmlResource) res );=0D
+void wxXmlResource_SetDomain( TSelf(wxXmlResource) _obj, TString dom=
ain );=0D
hunk ./wxc/src/eljrc.cpp 2
-#if wxVERSION_NUMBER >=3D 2400=0D
+#include <wx/xrc/xmlres.h>=0D
hunk ./wxc/src/eljrc.cpp 4
-#ifdef __WIN32__=0D
-#define LoadBitmap LoadBitmapA=0D
-#define LoadIcon LoadIconA=0D
+#ifdef wxUSE_STC=0D
+# include "wx/stc/stc.h"=0D
hunk ./wxc/src/eljrc.cpp 8
-#include "eljscintilla.h"=0D
-#include "wx/xrc/xmlres.h"=0D
-=0D
hunk ./wxc/src/eljrc.cpp 32
-class wxScintillaXmlHandler : public wxXmlResourceHandler=0D
+#ifdef wxUSE_STC=0D
+class wxStyledTextCtrlXmlHandler : public wxXmlResourceHandler=0D
hunk ./wxc/src/eljrc.cpp 36
- wxScintillaXmlHandler();=0D
+ wxStyledTextCtrlXmlHandler();=0D
hunk ./wxc/src/eljrc.cpp 40
+#endif=0D
hunk ./wxc/src/eljrc.cpp 223
-wxScintillaXmlHandler::wxScintillaXmlHandler() : wxXmlResourceHandler()=0D
+#ifdef wxUSE_STC=0D
+wxStyledTextCtrlXmlHandler::wxStyledTextCtrlXmlHandler() : wxXmlResourceHa=
ndler()=0D
hunk ./wxc/src/eljrc.cpp 230
-wxObject *wxScintillaXmlHandler::DoCreateResource()=0D
+wxObject *wxStyledTextCtrlXmlHandler::DoCreateResource()=0D
hunk ./wxc/src/eljrc.cpp 232
- XRC_MAKE_INSTANCE(frame, wxScintilla);=0D
+ XRC_MAKE_INSTANCE(frame, wxStyledTextCtrl);=0D
hunk ./wxc/src/eljrc.cpp 238
- wxDefaultValidator,=0D
hunk ./wxc/src/eljrc.cpp 250
-bool wxScintillaXmlHandler::CanHandle(wxXmlNode *node)=0D
+bool wxStyledTextCtrlXmlHandler::CanHandle(wxXmlNode *node)=0D
hunk ./wxc/src/eljrc.cpp 252
- return IsOfClass(node, wxT("wxScintilla"));=0D
+ return IsOfClass(node, wxT("wxStyledTextCtrl"));=0D
hunk ./wxc/src/eljrc.cpp 254
+#endif=0D
hunk ./wxc/src/eljrc.cpp 297
-EWXWEXPORT(void*,wxXmlResource_Create)(void* _obj, int flags)=0D
+EWXWEXPORT(wxXmlResource*,wxXmlResource_Create)(int flags)=0D
hunk ./wxc/src/eljrc.cpp 299
- return (void*)new wxXmlResource(flags);=0D
+ return new wxXmlResource(flags);=0D
hunk ./wxc/src/eljrc.cpp 302
-EWXWEXPORT(void*,wxXmlResource_CreateFromFile)(void* _obj, void* filemask,=
int flags)=0D
+EWXWEXPORT(wxXmlResource*,wxXmlResource_CreateFromFile)(wxString* filemask=
, int flags)=0D
hunk ./wxc/src/eljrc.cpp 304
- return (void*)new wxXmlResource((char*)filemask, flags);=0D
+ return new wxXmlResource(*filemask, flags);=0D
hunk ./wxc/src/eljrc.cpp 307
-EWXWEXPORT(void,wxXmlResource_Delete)(void* _obj)=0D
+EWXWEXPORT(void,wxXmlResource_Delete)(wxXmlResource* self)=0D
hunk ./wxc/src/eljrc.cpp 309
- delete (wxXmlResource*)_obj;=0D
+ delete self;=0D
hunk ./wxc/src/eljrc.cpp 312
-EWXWEXPORT(int,wxXmlResource_Load)(void* _obj, void* filemask)=0D
+EWXWEXPORT(bool,wxXmlResource_Load)(wxXmlResource* self, wxString* filemas=
k)=0D
hunk ./wxc/src/eljrc.cpp 315
- return (int)((wxXmlResource*)_obj)->Load((char*)filemask);=0D
+ return self->Load(*filemask);=0D
hunk ./wxc/src/eljrc.cpp 318
-EWXWEXPORT(void,wxXmlResource_InitAllHandlers)(void* _obj)=0D
+EWXWEXPORT(void,wxXmlResource_InitAllHandlers)(wxXmlResource* self)=0D
hunk ./wxc/src/eljrc.cpp 320
- ((wxXmlResource*)_obj)->InitAllHandlers();=0D
- ((wxXmlResource*)_obj)->AddHandler(new wxMDIParentFrameXmlHandler());=0D
- ((wxXmlResource*)_obj)->AddHandler(new wxMDIChildFrameXmlHandler());=0D
- ((wxXmlResource*)_obj)->AddHandler(new wxSplitterWindowXmlHandler());=0D
- ((wxXmlResource*)_obj)->AddHandler(new wxScintillaXmlHandler());=0D
- ((wxXmlResource*)_obj)->AddHandler(new wxGridXmlHandler());=0D
+ self->InitAllHandlers();=0D
+ self->AddHandler(new wxMDIParentFrameXmlHandler());=0D
+ self->AddHandler(new wxMDIChildFrameXmlHandler());=0D
+ self->AddHandler(new wxSplitterWindowXmlHandler());=0D
+#ifdef wxUSE_STC=0D
+ self->AddHandler(new wxStyledTextCtrlXmlHandler());=0D
+#endif=0D
+ self->AddHandler(new wxGridXmlHandler());=0D
hunk ./wxc/src/eljrc.cpp 330
-EWXWEXPORT(void,wxXmlResource_AddHandler)(void* _obj, void* handler)=0D
+EWXWEXPORT(void,wxXmlResource_AddHandler)(wxXmlResource* self, wxXmlResour=
ceHandler* handler)=0D
hunk ./wxc/src/eljrc.cpp 332
- ((wxXmlResource*)_obj)->AddHandler((wxXmlResourceHandler*)handler);=0D
+ self->AddHandler(handler);=0D
hunk ./wxc/src/eljrc.cpp 335
-EWXWEXPORT(void,wxXmlResource_InsertHandler)(void* _obj, void* handler)=0D
+EWXWEXPORT(void,wxXmlResource_InsertHandler)(wxXmlResource* self, wxXmlRes=
ourceHandler* handler)=0D
hunk ./wxc/src/eljrc.cpp 337
- ((wxXmlResource*)_obj)->InsertHandler((wxXmlResourceHandler*)handler);=0D
+ self->InsertHandler(handler);=0D
hunk ./wxc/src/eljrc.cpp 340
-EWXWEXPORT(void,wxXmlResource_ClearHandlers)(void* _obj)=0D
+EWXWEXPORT(void,wxXmlResource_ClearHandlers)(wxXmlResource* self)=0D
hunk ./wxc/src/eljrc.cpp 342
- ((wxXmlResource*)_obj)->ClearHandlers();=0D
+ self->ClearHandlers();=0D
hunk ./wxc/src/eljrc.cpp 345
-EWXWEXPORT(void,wxXmlResource_AddSubclassFactory)(void* _obj, void* factor=
y)=0D
+EWXWEXPORT(void,wxXmlResource_AddSubclassFactory)(wxXmlResource* self, wxX=
mlSubclassFactory* factory)=0D
hunk ./wxc/src/eljrc.cpp 347
- ((wxXmlResource*)_obj)->AddSubclassFactory((wxXmlSubclassFactory*)factory=
);=0D
+ self->AddSubclassFactory(factory);=0D
hunk ./wxc/src/eljrc.cpp 350
-EWXWEXPORT(void*,wxXmlResource_LoadMenu)(void* _obj, void* name)=0D
+EWXWEXPORT(wxMenu*,wxXmlResource_LoadMenu)(wxXmlResource* self, wxString* =
name)=0D
hunk ./wxc/src/eljrc.cpp 352
- return (void*)((wxXmlResource*)_obj)->LoadMenu((char*)name);=0D
+ return self->LoadMenu(*name);=0D
hunk ./wxc/src/eljrc.cpp 355
-EWXWEXPORT(void*,wxXmlResource_LoadMenuBar)(void* _obj, void* parent, void=
* name)=0D
+EWXWEXPORT(wxMenuBar*,wxXmlResource_LoadMenuBar)(wxXmlResource* self, wxWi=
ndow* parent, wxString* name)=0D
hunk ./wxc/src/eljrc.cpp 357
- return (void*)((wxXmlResource*)_obj)->LoadMenuBar((wxWindow*)parent, (cha=
r*)name);=0D
+ return self->LoadMenuBar(parent, *name);=0D
hunk ./wxc/src/eljrc.cpp 360
-EWXWEXPORT(void*,wxXmlResource_LoadToolBar)(void* _obj, void* parent, void=
* name)=0D
+EWXWEXPORT(wxToolBar*,wxXmlResource_LoadToolBar)(wxXmlResource* self, wxWi=
ndow* parent, wxString* name)=0D
hunk ./wxc/src/eljrc.cpp 362
- return (void*)((wxXmlResource*)_obj)->LoadToolBar((wxWindow*)parent, (cha=
r*)name);=0D
+ return self->LoadToolBar(parent, *name);=0D
hunk ./wxc/src/eljrc.cpp 365
-EWXWEXPORT(void*,wxXmlResource_LoadDialog)(void* _obj, void* parent, void*=
name)=0D
+EWXWEXPORT(wxDialog*,wxXmlResource_LoadDialog)(wxXmlResource* self, wxWind=
ow* parent, wxString* name)=0D
hunk ./wxc/src/eljrc.cpp 367
- return (void*)((wxXmlResource*)_obj)->LoadDialog((wxWindow*)parent, (char=
*)name);=0D
+ return self->LoadDialog(parent, *name);=0D
hunk ./wxc/src/eljrc.cpp 370
-EWXWEXPORT(void*,wxXmlResource_LoadPanel)(void* _obj, void* parent, void* =
name)=0D
+EWXWEXPORT(wxPanel*,wxXmlResource_LoadPanel)(wxXmlResource* self, wxWindow=
* parent, wxString* name)=0D
hunk ./wxc/src/eljrc.cpp 372
- return (void*)((wxXmlResource*)_obj)->LoadPanel((wxWindow*)parent, (char*=
)name);=0D
+ return self->LoadPanel(parent, *name);=0D
hunk ./wxc/src/eljrc.cpp 375
-EWXWEXPORT(void*,wxXmlResource_LoadFrame)(void* _obj, void* parent, void* =
name)=0D
+EWXWEXPORT(wxFrame*,wxXmlResource_LoadFrame)(wxXmlResource* self, wxWindow=
* parent, wxString* name)=0D
hunk ./wxc/src/eljrc.cpp 377
- return (void*)((wxXmlResource*)_obj)->LoadFrame((wxWindow*)parent, (char*=
)name);=0D
+ return self->LoadFrame(parent, *name);=0D
hunk ./wxc/src/eljrc.cpp 380
-EWXWEXPORT(void*,wxXmlResource_LoadObject)(void* _obj, void* parent, void*=
name, void* classname)=0D
+EWXWEXPORT(wxObject*,wxXmlResource_LoadObject)(wxXmlResource* self, wxWind=
ow* parent, wxString* name, wxString* classname)=0D
hunk ./wxc/src/eljrc.cpp 382
- return (void*)((wxXmlResource*)_obj)->LoadObject((wxWindow*)parent, (char=
*)name, (char*)classname);=0D
+ return self->LoadObject(parent, *name, *classname);=0D
hunk ./wxc/src/eljrc.cpp 385
-EWXWEXPORT(int,wxXmlResource_InitializeObject)(void* _obj, void* _inst, vo=
id* parent, void* name, void* classname)=0D
+EWXWEXPORT(bool,wxXmlResource_InitializeObject)( wxXmlResource* self, wxOb=
ject* _inst, wxWindow* parent,=0D
+ wxString* name, wxString*=
classname)=0D
hunk ./wxc/src/eljrc.cpp 388
- return (int)((wxXmlResource*)_obj)->LoadObject((wxObject*)_inst, (wxWindo=
w*)parent, (char*)name, (char*)classname);=0D
+ return self->LoadObject(_inst, (wxWindow*)parent, *name, *classname);=0D
hunk ./wxc/src/eljrc.cpp 391
-EWXWEXPORT(void,wxXmlResource_LoadBitmap)(void* _obj, void* name, void* _r=
ef)=0D
+EWXWEXPORT(void,wxXmlResource_LoadBitmap)(wxXmlResource* self, wxString* n=
ame, void* _ref)=0D
hunk ./wxc/src/eljrc.cpp 393
- *((wxBitmap*)_ref) =3D ((wxXmlResource*)_obj)->LoadBitmap((char*)name);=
=0D
+ *((wxBitmap*)_ref) =3D self->LoadBitmap(*name);=0D
hunk ./wxc/src/eljrc.cpp 396
-EWXWEXPORT(void,wxXmlResource_LoadIcon)(void* _obj, void* name, void* _ref=
)=0D
+EWXWEXPORT(void,wxXmlResource_LoadIcon)(wxXmlResource* self, wxString* nam=
e, void* _ref)=0D
hunk ./wxc/src/eljrc.cpp 398
- *((wxIcon*)_ref) =3D ((wxXmlResource*)_obj)->LoadIcon((char*)name);=0D
+ *((wxIcon*)_ref) =3D self->LoadIcon(*name);=0D
hunk ./wxc/src/eljrc.cpp 401
-EWXWEXPORT(int,wxXmlResource_AttachUnknownControl)(void* _obj, void* name,=
void* control, void* parent)=0D
+EWXWEXPORT(bool,wxXmlResource_Unload)(wxXmlResource* self, wxString* name)=
=0D
hunk ./wxc/src/eljrc.cpp 403
- return (int)((wxXmlResource*)_obj)->AttachUnknownControl((char*)name, (wx=
Window*)control, (wxWindow*)parent);=0D
+ return self->Unload(*name);=0D
hunk ./wxc/src/eljrc.cpp 406
-EWXWEXPORT(int,wxXmlResource_GetXRCID)(void* str_id)=0D
+EWXWEXPORT(bool,wxXmlResource_AttachUnknownControl)(wxXmlResource* self, w=
xString* name, wxWindow* control, wxWindow* parent)=0D
hunk ./wxc/src/eljrc.cpp 408
- return wxXmlResource::GetXRCID((wxChar*)str_id);=0D
+ return self->AttachUnknownControl(*name, control, parent);=0D
hunk ./wxc/src/eljrc.cpp 411
-EWXWEXPORT(int,wxXmlResource_GetVersion)(void* _obj)=0D
+EWXWEXPORT(int,wxXmlResource_GetXRCID)(wxXmlResource* self, wxChar* str_id=
)=0D
hunk ./wxc/src/eljrc.cpp 413
- return (int)((wxXmlResource*)_obj)->GetVersion();=0D
+ return self->GetXRCID(str_id);=0D
hunk ./wxc/src/eljrc.cpp 416
-EWXWEXPORT(int,wxXmlResource_CompareVersion)(void* _obj, int major, int mi=
nor, int release, int revision)=0D
+EWXWEXPORT(long,wxXmlResource_GetVersion)(wxXmlResource* self)=0D
hunk ./wxc/src/eljrc.cpp 418
- return ((wxXmlResource*)_obj)->CompareVersion(major, minor, release, revi=
sion);=0D
+ return self->GetVersion();=0D
hunk ./wxc/src/eljrc.cpp 421
-EWXWEXPORT(void*,wxXmlResource_Get)()=0D
+EWXWEXPORT(int,wxXmlResource_CompareVersion)(wxXmlResource* self, int majo=
r, int minor, int release, int revision)=0D
hunk ./wxc/src/eljrc.cpp 423
- return (void*)wxXmlResource::Get();=0D
+ return self->CompareVersion(major, minor, release, revision);=0D
hunk ./wxc/src/eljrc.cpp 426
-EWXWEXPORT(void*,wxXmlResource_Set)(void* res)=0D
+EWXWEXPORT(wxXmlResource*,wxXmlResource_Get)(wxXmlResource* self)=0D
hunk ./wxc/src/eljrc.cpp 428
- return (void*)wxXmlResource::Set((wxXmlResource*)res);=0D
+ return self->Get();=0D
hunk ./wxc/src/eljrc.cpp 431
-EWXWEXPORT(int,wxXmlResource_GetFlags)(void* _obj)=0D
+EWXWEXPORT(wxXmlResource*,wxXmlResource_Set)(wxXmlResource* self, wxXmlRes=
ource* res)=0D
+{=0D
+ return self->Set(res);=0D
+}=0D
+=0D
+EWXWEXPORT(int,wxXmlResource_GetDomain)(wxXmlResource* self, wxChar* buf)=
=0D
hunk ./wxc/src/eljrc.cpp 438
- return ((wxXmlResource*)_obj)->GetFlags();=0D
+ buf =3D self->GetDomain();=0D
+ return wxStrlen(buf);=0D
+}=0D
+=0D
+EWXWEXPORT(void,wxXmlResource_SetDomain)(wxXmlResource* self, wxChar* doma=
in)=0D
+{=0D
+ self->SetDomain(domain);=0D
+}=0D
+=0D
+EWXWEXPORT(int,wxXmlResource_GetFlags)(wxXmlResource* self)=0D
+{=0D
+ return self->GetFlags();=0D
hunk ./wxc/src/eljrc.cpp 452
-EWXWEXPORT(void,wxXmlResource_SetFlags)(void* _obj, int flags)=0D
+EWXWEXPORT(void,wxXmlResource_SetFlags)(wxXmlResource* self, int flags)=0D
hunk ./wxc/src/eljrc.cpp 454
- ((wxXmlResource*)_obj)->SetFlags(flags);=0D
+ self->SetFlags(flags);=0D
hunk ./wxc/src/eljrc.cpp 458
-#endif=0D
hunk ./wxc/wxc-2.6.dsp 57
-# ADD LINK32 wxzlib.lib wxregexu.lib wxpng.lib wxjpeg.lib wxtiff.lib wxexp=
at.lib wxbase26u.lib wxbase26u_net.lib wxbase26u_odbc.lib wxbase26u_xml.lib=
wxmsw26u_core.lib wxmsw26u_adv.lib wxmsw26u_dbgrid.lib wxmsw26u_gl.lib wxm=
sw26u_html.lib wxmsw26u_media.lib wxmsw26u_stc.lib wxmsw26u_svg.lib kernel3=
2.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.l=
ib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpc=
rt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /machine:I386 /node=
faultlib:"LIBCMT" /out:"..\dist\wxc\wxc-msw2.8.7-0.10.3.dll" /libpath:"..\.=
.\wxWidgets-2.6.4\lib\vc_lib"=0D
+# ADD LINK32 wxzlib.lib wxregexu.lib wxpng.lib wxjpeg.lib wxtiff.lib wxexp=
at.lib wxbase26u.lib wxbase26u_net.lib wxbase26u_odbc.lib wxbase26u_xml.lib=
wxmsw26u_core.lib wxmsw26u_adv.lib wxmsw26u_dbgrid.lib wxmsw26u_gl.lib wxm=
sw26u_html.lib wxmsw26u_media.lib wxmsw26u_stc.lib wxmsw26u_svg.lib wxmsw26=
u_xrc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advap=
i32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib=
comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /m=
achine:I386 /nodefaultlib:"LIBCMT" /out:"..\dist\wxc\wxc-msw2.8.7-0.10.3.dl=
l" /libpath:"..\..\wxWidgets-2.6.4\lib\vc_lib"=0D
hunk ./wxc/wxc-2.6.dsp 88
-# ADD LINK32 wxzlibd.lib wxregexud.lib wxpngd.lib wxjpegd.lib wxtiffd.lib =
wxexpatd.lib wxbase26ud.lib wxbase26ud_net.lib wxbase26ud_odbc.lib wxbase26=
ud_xml.lib wxmsw26ud_core.lib wxmsw26ud_adv.lib wxmsw26ud_dbgrid.lib wxmsw2=
6ud_gl.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_stc.lib wxmsw26=
ud_svg.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib adva=
pi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.li=
b comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /=
debug /machine:I386 /nodefaultlib:"LIBCMTD" /out:"..\dist\wxc\wxcd-msw2.8.7=
-0.10.3.dll" /pdbtype:sept /libpath:"..\..\wxWidgets-2.6.4\lib\vc_lib"=0D
+# ADD LINK32 wxzlibd.lib wxregexud.lib wxpngd.lib wxjpegd.lib wxtiffd.lib =
wxexpatd.lib wxbase26ud.lib wxbase26ud_net.lib wxbase26ud_odbc.lib wxbase26=
ud_xml.lib wxmsw26ud_core.lib wxmsw26ud_adv.lib wxmsw26ud_dbgrid.lib wxmsw2=
6ud_gl.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_stc.lib wxmsw26=
ud_svg.lib wxmsw26ud_xrc.lib kernel32.lib user32.lib gdi32.lib winspool.lib=
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc=
32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.=
lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBCMTD" /out:"..\dist=
\wxc\wxcd-msw2.8.7-0.10.3.dll" /pdbtype:sept /libpath:"..\..\wxWidgets-2.6.=
4\lib\vc_lib"=0D
hunk ./wxc/wxc-2.8.dsp 57
-# ADD LINK32 wxzlib.lib wxregexu.lib wxpng.lib wxjpeg.lib wxtiff.lib wxexp=
at.lib wxbase28u.lib wxbase28u_net.lib wxbase28u_odbc.lib wxbase28u_xml.lib=
wxmsw28u_core.lib wxmsw28u_adv.lib wxmsw28u_dbgrid.lib wxmsw28u_gl.lib wxm=
sw28u_html.lib wxmsw28u_media.lib wxmsw28u_stc.lib wxmsw28u_svg.lib kernel3=
2.lib user32.lib gdi32.lib gdiplus.lib winspool.lib comdlg32.lib advapi32.l=
ib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comc=
tl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /machin=
e:I386 /nodefaultlib:"LIBCMT" /out:"..\dist\wxc\wxc-msw2.8.7-0.10.3.dll" /l=
ibpath:"..\..\wxWidgets-2.8.7\lib\vc_lib"=0D
+# ADD LINK32 wxzlib.lib wxregexu.lib wxpng.lib wxjpeg.lib wxtiff.lib wxexp=
at.lib wxbase28u.lib wxbase28u_net.lib wxbase28u_odbc.lib wxbase28u_xml.lib=
wxmsw28u_core.lib wxmsw28u_adv.lib wxmsw28u_dbgrid.lib wxmsw28u_gl.lib wxm=
sw28u_html.lib wxmsw28u_media.lib wxmsw28u_stc.lib wxmsw28u_svg.lib wxmsw28=
u_xrc.lib kernel32.lib user32.lib gdi32.lib gdiplus.lib winspool.lib comdlg=
32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib =
odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /no=
logo /dll /machine:I386 /nodefaultlib:"LIBCMT" /out:"..\dist\wxc\wxc-msw2.8=
.7-0.10.3.dll" /libpath:"..\..\wxWidgets-2.8.7\lib\vc_lib"=0D
hunk ./wxc/wxc-2.8.dsp 88
-# ADD LINK32 wxzlibd.lib wxregexud.lib wxpngd.lib wxjpegd.lib wxtiffd.lib =
wxexpatd.lib wxbase28ud.lib wxbase28ud_net.lib wxbase28ud_odbc.lib wxbase28=
ud_xml.lib wxmsw28ud_core.lib wxmsw28ud_adv.lib wxmsw28ud_dbgrid.lib wxmsw2=
8ud_gl.lib wxmsw28ud_html.lib wxmsw28ud_media.lib wxmsw28ud_stc.lib wxmsw28=
ud_svg.lib kernel32.lib user32.lib gdi32.lib gdiplus.lib winspool.lib comdl=
g32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib=
odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /n=
ologo /dll /debug /machine:I386 /nodefaultlib:"LIBCMTD" /out:"..\dist\wxc\w=
xcd-msw2.8.7-0.10.3.dll" /pdbtype:sept /libpath:"..\..\wxWidgets-2.8.7\lib\=
vc_lib"=0D
+# ADD LINK32 wxzlibd.lib wxregexud.lib wxpngd.lib wxjpegd.lib wxtiffd.lib =
wxexpatd.lib wxbase28ud.lib wxbase28ud_net.lib wxbase28ud_odbc.lib wxbase28=
ud_xml.lib wxmsw28ud_core.lib wxmsw28ud_adv.lib wxmsw28ud_dbgrid.lib wxmsw2=
8ud_gl.lib wxmsw28ud_html.lib wxmsw28ud_media.lib wxmsw28ud_stc.lib wxmsw28=
ud_svg.lib wxmsw28ud_xrc.lib kernel32.lib user32.lib gdi32.lib gdiplus.lib =
winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib u=
uid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl3=
2.lib winmm.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBCMTD" /=
out:"..\dist\wxc\wxcd-msw2.8.7-0.10.3.dll" /pdbtype:sept /libpath:"..\..\wx=
Widgets-2.8.7\lib\vc_lib"=0D
hunk ./wxc/wxc-2.8.dsp 486
+# Begin Source File=0D
+=0D
+SOURCE=3D.\src\eljrc.cpp=0D
+# End Source File=0D
hunk ./wxdirect/src/DeriveTypes.hs 310
- -- xml resources
- ,prefix "wxXmlResource" "xml resource"
}
[Fix: eljdcsvg.cpp doesn't build other than Windows.
shelarcy <she...@gm...>**20080625095858] {
hunk ./makefile 155
- dataformat datetime dc dialog dirdlg dnd drawing \
+ dataformat datetime dc dcsvg dialog dirdlg dnd drawing \
}
Context:
[Use Int64 representing wxFileOffset type.
shelarcy <she...@gm...>**20080624152015] =
[Add dropped wxMedia's events to wxc.
shelarcy <she...@gm...>**20080624140139] =
[Add dropped wx*DCs.
shelarcy <she...@gm...>**20080624122641] =
[Update building information about --with-contrib option.
shelarcy <she...@gm...>**20080624113243] =
[Revive wxSVGFileDC code.
shelarcy <she...@gm...>**20080624113214] =
[Change --with-stc to --with-contrib for future contrib libraries support.
shelarcy <she...@gm...>**20080624032429] =
[Update information about builiding wxWidgets and wxc with Microsoft Visual=
C++ Express Edition.
shelarcy <she...@gm...>**20080624023628] =
[Fix #1400488: Win install problem when path with spaces, e.g. "Program Fil=
es".
shelarcy <she...@gm...>**20080624020657] =
[Partialy fix a bug in wxhaskell-register.bat.
shelarcy <she...@gm...>**20080623152256] =
[Add --enable-optimization opition for building library with optimization f=
lags.
shelarcy <she...@gm...>**20080531114050] =
[Use CDouble and realToFrac instead of marshaling Double type directly.
shelarcy <she...@gm...>**20080530024730] =
[Remove unused make before-dist.
shelarcy <she...@gm...>**20080529120234] =
[Fix a bug in haddock documentation structure of Rectangle.
shelarcy <she...@gm...>**20080529111415] =
[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:
1f087584a094a2cb9a17915a60a2c81236d904ac
--=_--
.
|
|
From: Eric Y. K. <eri...@gm...> - 2008-06-24 18:15:58
|
applied, thanks! -- Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow> PGP Key ID: 08AC04F9 |
|
From: shelarcy <she...@gm...> - 2008-06-24 15:39:28
|
Oops, I mistook to send incorrect version of below patch. I send again. So, please use later version. 2008/6/25, shelarcy <she...@gm...>: > Tue Jun 24 23:59:01 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008 shelarcy <shelarc=y...@gm...> > * Use Int64 representing wxFileOffset type. -- shelarcy <shelarcy hotmail.co.jp> http://page.freett.com/shelarcy/ |
|
From: shelarcy <she...@gm...> - 2008-06-24 15:28:51
|
DarcsURL: C:/home/shelarcy/wxhaskell
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=_"
--=_
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
Tue Jun 24 11:06:57 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008 shelarcy <shelarc=
y...@gm...>
* Fix #1400488: Win install problem when path with spaces, e.g. "Program =
Files".
Tue Jun 24 11:36:28 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008 shelarcy <shelarc=
y...@gm...>
* Update information about builiding wxWidgets and wxc with Microsoft Vis=
ual C++ Express Edition.
Tue Jun 24 12:24:29 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008 shelarcy <shelarc=
y...@gm...>
* Change --with-stc to --with-contrib for future contrib libraries suppor=
t.
Tue Jun 24 20:32:14 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008 shelarcy <shelarc=
y...@gm...>
* Revive wxSVGFileDC code.
Tue Jun 24 20:32:43 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008 shelarcy <shelarc=
y...@gm...>
* Update building information about --with-contrib option.
Tue Jun 24 21:26:41 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008 shelarcy <shelarc=
y...@gm...>
* Add dropped wx*DCs.
Tue Jun 24 23:01:39 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008 shelarcy <shelarc=
y...@gm...>
* Add dropped wxMedia's events to wxc.
Wed Jun 25 00:20:15 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008 shelarcy <shelarc=
y...@gm...>
* Use Int64 representing wxFileOffset type.
--=_
Content-Type: text/x-darcs-patch; name="fix-_1400488_-win-install-problem-when-path-with-spaces_-e_g_-_program-files__.dpatch"
Content-Transfer-Encoding: quoted-printable
Content-Description: A darcs patch for your repository!
New patches:
[Fix #1400488: Win install problem when path with spaces, e.g. "Program Fil=
es".
shelarcy <she...@gm...>**20080624020657] {
hunk ./bin/wxhaskell-register-template.bat 20
-SET installdir=3D%CURDIR: =3D^ %=0D
+SET installdirhelper=3D%CURDIR: =3D^ %=0D
+SET installdir=3D%installdirhelper:\=3D\\%=0D
hunk ./bin/wxhaskell-register-template.bat 31
-ECHO import-dirs:%installdir%\lib\imports >> "%installdir%\bin\wx.pkg"=0D
-ECHO library-dirs:%installdir%\lib >> "%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
hunk ./bin/wxhaskell-register-template.bat 34
-ECHO import-dirs:%installdir%\lib\imports >> "%installdir%\bin\wxcore.pkg"=
=0D
-ECHO library-dirs:%installdir%\lib >> "%installdir%\bin\wxcore.pkg"=
=0D
+ECHO import-dirs:"%installdir%\\lib\\imports" >> "%installdir%\bin\wxcore.=
pkg"=0D
+ECHO library-dirs:"%installdir%\\lib" >> "%installdir%\bin\wxcore.p=
kg"=0D
}
[Update information about builiding wxWidgets and wxc with Microsoft Visual=
C++ Express Edition.
shelarcy <she...@gm...>**20080624023628] {
hunk ./homepage/building-msc.html 61
-<p>If you want to use Visual C++ Express Edition, <a href=3D"http://msdn2.=
microsoft.com/express/aa700755.aspx">you must install Microsoft Platform SD=
K</a> before building wxWidgets or wxHaskell.</p>
+<p>If you want to use Visual C++ Express Edition, you must use Visual C++ =
2008 Express Editions or higher. Because previous version requires <a href=
=3D"http://msdn2.microsoft.com/express/aa700755.aspx">installing Microsoft =
Platform SDK</a> before building wxWidgets or wxHaskell.</p>
}
[Change --with-stc to --with-contrib for future contrib libraries support.
shelarcy <she...@gm...>**20080624032429] {
hunk ./configure 66
-withstc=3D"no"
-wxcstc=3D""
+withcontrib=3D"no"
+wxccontrib=3D""
hunk ./configure 308
- echo " --with-stc enable stc support [$withstc]"
+ echo " --with-contrib enable contrib libraries support [=
$withcontrib]"
hunk ./configure 384
- -with-stc|--with-stc)
- withstc=3D"yes";;
+ -with-contrib|--with-contrib)
+ withcontrib=3D"yes";;
hunk ./configure 504
- if test "$withstc" =3D "yes"; then
+ if test "$withcontrib" =3D "yes"; then
hunk ./configure 506
- wxcstc=3D"-DwxUSE_STC=3D1"
+ wxccontrib=3D"-DwxUSE_STC=3D1"
hunk ./configure 913
-# STC
-WXC-STC=3D$wxcstc
+# Contrib libraries
+WXC-CONTRIB=3D$wxccontrib
hunk ./configure 1180
-echo " stc: $withstc"
+echo " contrib: $withcontrib"
hunk ./makefile 822
-WXC-CXXFLAGS =3D$(WXWIN-CXXFLAGS) $(WXC-STC) -fPIC -I$(WXC-INCDIR)
+WXC-CXXFLAGS =3D$(WXWIN-CXXFLAGS) $(WXC-CONTRIB) -fPIC -I$(WXC-INCDIR)
}
[Revive wxSVGFileDC code.
shelarcy <she...@gm...>**20080624113214] {
hunk ./configure 505
- wxlibswanted=3D"$wxlibswanted stc"
- wxccontrib=3D"-DwxUSE_STC=3D1"
+ wxlibswanted=3D"$wxlibswanted stc svg"
+ wxccontrib=3D"-DwxUSE_STC=3D1 -DwxUSE_SVG=3D1"
hunk ./configure 971
+license:LGPL
hunk ./configure 974
+maintainer:wxh...@li...
hunk ./configure 1013
+license:LGPL
hunk ./configure 1016
+maintainer:wxh...@li...
hunk ./wxc/include/wxc_glue.h 1317
+void wxDC_ComputeScaleAndOrigin( TSelf(wxDC) obj );=0D
hunk ./wxc/include/wxc_glue.h 3810
-void* wxSVGFileDC_ComputeScaleAndOrigin( TSelf(wxSVGFileDC) obj );=0D
-TClass(wxSVGFileDC) wxSVGFileDC_Create( void* f );=0D
-void* wxSVGFileDC_CreateWithSize( TSelf(wxSVGFileDC) f, int a_width, =
int a_height );=0D
-void* wxSVGFileDC_CreateWithSizeAndResolution( TSelf(wxSVGFileDC) f, =
int a_width, int a_height, float a_dpi );=0D
-void* wxSVGFileDC_Delete( TSelf(wxSVGFileDC) obj );=0D
+TClass(wxSVGFileDC) wxSVGFileDC_Create( TString fileName );=0D
+TClass(wxSVGFileDC) wxSVGFileDC_CreateWithSize( TString fileName, TSize(w,=
h) );=0D
+TClass(wxSVGFileDC) wxSVGFileDC_CreateWithSizeAndResolution( TString fileN=
ame, TSize(w,h), float a_dpi );=0D
+void wxSVGFileDC_Delete( TSelf(wxSVGFileDC) obj );=0D
hunk ./wxc/src/eljdc.cpp 141
+ =0D
+EWXWEXPORT(void, wxDC_ComputeScaleAndOrigin) (wxDC* dc)=0D
+{=0D
+ dc->ComputeScaleAndOrigin();=0D
+}=0D
hunk ./wxc/src/eljdcsvg.cpp 2
-#include "wx/svg/dcsvg.h"=0D
+=0D
+#ifdef wxUSE_SVG=0D
+# include "wx/svg/dcsvg.h"=0D
+#endif=0D
hunk ./wxc/src/eljdcsvg.cpp 10
-EWXWEXPORT(void*, wxSVGFileDC_Create)(void* a_filename)=0D
+EWXWEXPORT(void*, wxSVGFileDC_Create)(wxChar* a_filename)=0D
hunk ./wxc/src/eljdcsvg.cpp 12
- return (void*) new wxSVGFileDC((char*)a_filename);=0D
+#ifdef wxUSE_SVG=0D
+ return (void*) new wxSVGFileDC(wxString(a_filename));=0D
+#else=0D
+ return NULL;=0D
+#endif=0D
hunk ./wxc/src/eljdcsvg.cpp 19
-EWXWEXPORT(void*, wxSVGFileDC_CreateWithSize)(void* a_filename, int a_widt=
h, int a_height)=0D
+EWXWEXPORT(void*, wxSVGFileDC_CreateWithSize)(wxChar* a_filename, int a_wi=
dth, int a_height)=0D
hunk ./wxc/src/eljdcsvg.cpp 21
- return (void*) new wxSVGFileDC((char*)a_filename, a_width, a_height);=0D
+#ifdef wxUSE_SVG=0D
+ return (void*) new wxSVGFileDC(wxString(a_filename), a_width, a_height);=
=0D
+#else=0D
+ return NULL;=0D
+#endif=0D
hunk ./wxc/src/eljdcsvg.cpp 28
-EWXWEXPORT(void*, wxSVGFileDC_CreateWithSizeAndResolution)(void* a_filenam=
e, int a_width, int a_height, float a_dpi)=0D
+EWXWEXPORT(void*, wxSVGFileDC_CreateWithSizeAndResolution)(wxChar* a_filen=
ame, int a_width, int a_height, float a_dpi)=0D
hunk ./wxc/src/eljdcsvg.cpp 30
- return (void*) new wxSVGFileDC((char*)a_filename, a_width, a_height, a_dp=
i);=0D
+#ifdef wxUSE_SVG=0D
+ return (void*) new wxSVGFileDC(wxString(a_filename), a_width, a_height, a=
_dpi);=0D
+#else=0D
+ return NULL;=0D
+#endif=0D
hunk ./wxc/src/eljdcsvg.cpp 39
+#ifdef wxUSE_SVG=0D
hunk ./wxc/src/eljdcsvg.cpp 41
-}=0D
-=0D
-EWXWEXPORT(void, wxSVGFileDC_ComputeScaleAndOrigin) (void* _obj)=0D
-{=0D
- ((wxSVGFileDC*)_obj)->ComputeScaleAndOrigin();=0D
+#endif=0D
hunk ./wxc/wxc-2.6.dsp 46
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\wxWidgets-2.6.4\lib\vc_lib\msw=
u" /I "..\..\wxWidgets-2.6.4\contrib\include" /I "include" /I "..\..\wxWidg=
ets-2.6.4\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USR=
DLL" /D "WXC_EXPORTS" /D WINVER=3D0x400 /D "_MT" /D wxUSE_GUI=3D1 /D wxUSE_=
UNICODE=3D1 /D wxUSE_STC=3D1 /D BUILD_WXC=3D1 /D "_DLL" /YX /FD /c=0D
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\wxWidgets-2.6.4\lib\vc_lib\msw=
u" /I "..\..\wxWidgets-2.6.4\contrib\include" /I "include" /I "..\..\wxWidg=
ets-2.6.4\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USR=
DLL" /D "WXC_EXPORTS" /D WINVER=3D0x400 /D "_MT" /D wxUSE_GUI=3D1 /D wxUSE_=
UNICODE=3D1 /D wxUSE_STC=3D1 /D wxUSE_SVG=3D1 /D BUILD_WXC=3D1 /D "_DLL" /Y=
X /FD /c=0D
hunk ./wxc/wxc-2.6.dsp 57
-# ADD LINK32 wxzlib.lib wxregexu.lib wxpng.lib wxjpeg.lib wxtiff.lib wxexp=
at.lib wxbase26u.lib wxbase26u_net.lib wxbase26u_odbc.lib wxbase26u_xml.lib=
wxmsw26u_core.lib wxmsw26u_adv.lib wxmsw26u_dbgrid.lib wxmsw26u_gl.lib wxm=
sw26u_html.lib wxmsw26u_media.lib wxmsw26u_stc.lib kernel32.lib user32.lib =
gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib olea=
ut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.l=
ib opengl32.lib winmm.lib /nologo /dll /machine:I386 /nodefaultlib:"LIBCMT"=
/out:"..\dist\wxc\wxc-msw2.8.7-0.10.3.dll" /libpath:"..\..\wxWidgets-2.6.4=
\lib\vc_lib"=0D
+# ADD LINK32 wxzlib.lib wxregexu.lib wxpng.lib wxjpeg.lib wxtiff.lib wxexp=
at.lib wxbase26u.lib wxbase26u_net.lib wxbase26u_odbc.lib wxbase26u_xml.lib=
wxmsw26u_core.lib wxmsw26u_adv.lib wxmsw26u_dbgrid.lib wxmsw26u_gl.lib wxm=
sw26u_html.lib wxmsw26u_media.lib wxmsw26u_stc.lib wxmsw26u_svg.lib kernel3=
2.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.l=
ib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpc=
rt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /machine:I386 /node=
faultlib:"LIBCMT" /out:"..\dist\wxc\wxc-msw2.8.7-0.10.3.dll" /libpath:"..\.=
.\wxWidgets-2.6.4\lib\vc_lib"=0D
hunk ./wxc/wxc-2.6.dsp 77
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\wxWidgets-2.6.4\lib\v=
c_lib\mswud" /I "include" /I "..\..\wxWidgets-2.6.4\include" /I "..\..\wxWi=
dgets-2.6.4\contrib\include" /D "_DEBUG" /D "__WXDEBUG__" /D WXDEBUG=3D1 /D=
"WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /D WINVER=
=3D0x400 /D "_MT" /D wxUSE_GUI=3D1 /D wxUSE_UNICODE=3D1 /D wxUSE_STC=3D1 /D=
BUILD_WXC=3D1 /D "_DLL" /YX /FD /GZ /c=0D
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\wxWidgets-2.6.4\lib\v=
c_lib\mswud" /I "include" /I "..\..\wxWidgets-2.6.4\include" /I "..\..\wxWi=
dgets-2.6.4\contrib\include" /D "_DEBUG" /D "__WXDEBUG__" /D WXDEBUG=3D1 /D=
"WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /D WINVER=
=3D0x400 /D "_MT" /D wxUSE_GUI=3D1 /D wxUSE_UNICODE=3D1 /D wxUSE_STC=3D1 /D=
wxUSE_SVG=3D1 /D BUILD_WXC=3D1 /D "_DLL" /YX /FD /GZ /c=0D
hunk ./wxc/wxc-2.6.dsp 88
-# ADD LINK32 wxzlibd.lib wxregexud.lib wxpngd.lib wxjpegd.lib wxtiffd.lib =
wxexpatd.lib wxbase26ud.lib wxbase26ud_net.lib wxbase26ud_odbc.lib wxbase26=
ud_xml.lib wxmsw26ud_core.lib wxmsw26ud_adv.lib wxmsw26ud_dbgrid.lib wxmsw2=
6ud_gl.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_stc.lib kernel3=
2.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.l=
ib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpc=
rt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /debug /machine:I38=
6 /nodefaultlib:"LIBCMTD" /out:"..\dist\wxc\wxcd-msw2.8.7-0.10.3.dll" /pdbt=
ype:sept /libpath:"..\..\wxWidgets-2.6.4\lib\vc_lib"=0D
+# ADD LINK32 wxzlibd.lib wxregexud.lib wxpngd.lib wxjpegd.lib wxtiffd.lib =
wxexpatd.lib wxbase26ud.lib wxbase26ud_net.lib wxbase26ud_odbc.lib wxbase26=
ud_xml.lib wxmsw26ud_core.lib wxmsw26ud_adv.lib wxmsw26ud_dbgrid.lib wxmsw2=
6ud_gl.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_stc.lib wxmsw26=
ud_svg.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib adva=
pi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.li=
b comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /=
debug /machine:I386 /nodefaultlib:"LIBCMTD" /out:"..\dist\wxc\wxcd-msw2.8.7=
-0.10.3.dll" /pdbtype:sept /libpath:"..\..\wxWidgets-2.6.4\lib\vc_lib"=0D
hunk ./wxc/wxc-2.6.dsp 354
+# Begin Source File=0D
+=0D
+SOURCE=3D.\src\eljdcsvg.cpp=0D
+# End Source File=0D
hunk ./wxc/wxc-2.6.dsw 31
+##########################################################################=
#####=0D
+=0D
+Project: "svg"=3D"..\..\wxWidgets-2.6.4\contrib\build\stc\svg.dsp" - Packa=
ge Owner=3D<4>=0D
+=0D
+Package=3D<5>=0D
+{{{=0D
+}}}=0D
+=0D
+Package=3D<4>=0D
+{{{=0D
+}}}=0D
hunk ./wxc/wxc-2.8.dsp 46
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\wxWidgets-2.8.7\lib\vc_lib\msw=
u" /I "..\..\wxWidgets-2.8.7\contrib\include" /I "include" /I "..\..\wxWidg=
ets-2.8.7\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USR=
DLL" /D "WXC_EXPORTS" /D WINVER=3D0x400 /D "_MT" /D wxUSE_GUI=3D1 /D wxUSE_=
UNICODE=3D1 /D wxUSE_STC=3D1 /D BUILD_WXC=3D1 /D "_DLL" /YX /FD /c=0D
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\wxWidgets-2.8.7\lib\vc_lib\msw=
u" /I "..\..\wxWidgets-2.8.7\contrib\include" /I "include" /I "..\..\wxWidg=
ets-2.8.7\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USR=
DLL" /D "WXC_EXPORTS" /D WINVER=3D0x400 /D "_MT" /D wxUSE_GUI=3D1 /D wxUSE_=
UNICODE=3D1 /D wxUSE_STC=3D1 /D wxUSE_SVG=3D1 /D BUILD_WXC=3D1 /D "_DLL" /Y=
X /FD /c=0D
hunk ./wxc/wxc-2.8.dsp 57
-# ADD LINK32 wxzlib.lib wxregexu.lib wxpng.lib wxjpeg.lib wxtiff.lib wxexp=
at.lib wxbase28u.lib wxbase28u_net.lib wxbase28u_odbc.lib wxbase28u_xml.lib=
wxmsw28u_core.lib wxmsw28u_adv.lib wxmsw28u_dbgrid.lib wxmsw28u_gl.lib wxm=
sw28u_html.lib wxmsw28u_media.lib wxmsw28u_stc.lib kernel32.lib user32.lib =
gdi32.lib gdiplus.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ol=
e32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.l=
ib wsock32.lib opengl32.lib winmm.lib /nologo /dll /machine:I386 /nodefault=
lib:"LIBCMT" /out:"..\dist\wxc\wxc-msw2.8.7-0.10.3.dll" /libpath:"..\..\wxW=
idgets-2.8.7\lib\vc_lib"=0D
+# ADD LINK32 wxzlib.lib wxregexu.lib wxpng.lib wxjpeg.lib wxtiff.lib wxexp=
at.lib wxbase28u.lib wxbase28u_net.lib wxbase28u_odbc.lib wxbase28u_xml.lib=
wxmsw28u_core.lib wxmsw28u_adv.lib wxmsw28u_dbgrid.lib wxmsw28u_gl.lib wxm=
sw28u_html.lib wxmsw28u_media.lib wxmsw28u_stc.lib wxmsw28u_svg.lib kernel3=
2.lib user32.lib gdi32.lib gdiplus.lib winspool.lib comdlg32.lib advapi32.l=
ib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comc=
tl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /machin=
e:I386 /nodefaultlib:"LIBCMT" /out:"..\dist\wxc\wxc-msw2.8.7-0.10.3.dll" /l=
ibpath:"..\..\wxWidgets-2.8.7\lib\vc_lib"=0D
hunk ./wxc/wxc-2.8.dsp 77
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\wxWidgets-2.8.7\lib\v=
c_lib\mswud" /I "include" /I "..\..\wxWidgets-2.8.7\include" /I "..\..\wxWi=
dgets-2.8.7\contrib\include" /D "_DEBUG" /D "__WXDEBUG__" /D WXDEBUG=3D1 /D=
"WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /D WINVER=
=3D0x400 /D "_MT" /D wxUSE_GUI=3D1 /D wxUSE_UNICODE=3D1 /D wxUSE_STC=3D1 /D=
BUILD_WXC=3D1 /D "_DLL" /YX /FD /GZ /c=0D
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\wxWidgets-2.8.7\lib\v=
c_lib\mswud" /I "include" /I "..\..\wxWidgets-2.8.7\include" /I "..\..\wxWi=
dgets-2.8.7\contrib\include" /D "_DEBUG" /D "__WXDEBUG__" /D WXDEBUG=3D1 /D=
"WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /D WINVER=
=3D0x400 /D "_MT" /D wxUSE_GUI=3D1 /D wxUSE_UNICODE=3D1 /D wxUSE_STC=3D1 /D=
wxUSE_SVG=3D1 /D BUILD_WXC=3D1 /D "_DLL" /YX /FD /GZ /c=0D
hunk ./wxc/wxc-2.8.dsp 88
-# ADD LINK32 wxzlibd.lib wxregexud.lib wxpngd.lib wxjpegd.lib wxtiffd.lib =
wxexpatd.lib wxbase28ud.lib wxbase28ud_net.lib wxbase28ud_odbc.lib wxbase28=
ud_xml.lib wxmsw28ud_core.lib wxmsw28ud_adv.lib wxmsw28ud_dbgrid.lib wxmsw2=
8ud_gl.lib wxmsw28ud_html.lib wxmsw28ud_media.lib wxmsw28ud_stc.lib kernel3=
2.lib user32.lib gdi32.lib gdiplus.lib winspool.lib comdlg32.lib advapi32.l=
ib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comc=
tl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /debug =
/machine:I386 /nodefaultlib:"LIBCMTD" /out:"..\dist\wxc\wxcd-msw2.8.7-0.10.=
3.dll" /pdbtype:sept /libpath:"..\..\wxWidgets-2.8.7\lib\vc_lib"=0D
+# ADD LINK32 wxzlibd.lib wxregexud.lib wxpngd.lib wxjpegd.lib wxtiffd.lib =
wxexpatd.lib wxbase28ud.lib wxbase28ud_net.lib wxbase28ud_odbc.lib wxbase28=
ud_xml.lib wxmsw28ud_core.lib wxmsw28ud_adv.lib wxmsw28ud_dbgrid.lib wxmsw2=
8ud_gl.lib wxmsw28ud_html.lib wxmsw28ud_media.lib wxmsw28ud_stc.lib wxmsw28=
ud_svg.lib kernel32.lib user32.lib gdi32.lib gdiplus.lib winspool.lib comdl=
g32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib=
odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /n=
ologo /dll /debug /machine:I386 /nodefaultlib:"LIBCMTD" /out:"..\dist\wxc\w=
xcd-msw2.8.7-0.10.3.dll" /pdbtype:sept /libpath:"..\..\wxWidgets-2.8.7\lib\=
vc_lib"=0D
hunk ./wxc/wxc-2.8.dsp 354
+# Begin Source File=0D
+=0D
+SOURCE=3D.\src\eljdcsvg.cpp=0D
+# End Source File=0D
hunk ./wxc/wxc-2.8.dsw 16
+ Project_Dep_Name svg=0D
hunk ./wxc/wxc-2.8.dsw 32
+##########################################################################=
#####=0D
+=0D
+Project: "svg"=3D"..\..\wxWidgets-2.8.7\contrib\build\svg\svg.dsp" - Packa=
ge Owner=3D<4>=0D
+=0D
+Package=3D<5>=0D
+{{{=0D
+}}}=0D
+=0D
+Package=3D<4>=0D
+{{{=0D
+}}}=0D
hunk ./wxcore/src/Graphics/UI/WXCore/Draw.hs 20
+ , withSVGFileDC, withSVGFileDCWithSize, withSVGFileDCWithSizeAndRe=
solution
hunk ./wxcore/src/Graphics/UI/WXCore/Draw.hs 84
+-- | Use a 'SVGFileDC'.
+withSVGFileDC :: FilePath -> (SVGFileDC () -> IO b) -> IO b
+withSVGFileDC fname draw
+ =3D bracket (sVGFileDCCreate fname) (sVGFileDCDelete) (\dc -> dcDraw dc =
(draw dc))
+
+withSVGFileDCWithSize :: FilePath -> Size -> (SVGFileDC () -> IO b) -> IO =
b
+withSVGFileDCWithSize fname size draw
+ =3D bracket (sVGFileDCCreateWithSize fname size) (sVGFileDCDelete) (\dc =
-> dcDraw dc (draw dc))
+
+withSVGFileDCWithSizeAndResolution :: FilePath -> Size -> Float -> (SVGFil=
eDC () -> IO b) -> IO b
+withSVGFileDCWithSizeAndResolution fname size dpi draw
+ =3D bracket (sVGFileDCCreateWithSizeAndResolution fname size dpi) (sVGFi=
leDCDelete) (\dc -> dcDraw dc (draw dc))
+
hunk ./wxdirect/src/DeriveTypes.hs 312
- -- svg files
- ,prefix "wxSVGFileDC" "svg file dc"
}
[Update building information about --with-contrib option.
shelarcy <she...@gm...>**20080624113243] {
hunk ./homepage/building.html 218
-<li>You should pass the <code>--with-stc</code> option to <code>configure<=
/code> if you also installed contrib's stc library after building
+<li>You should pass the <code>--with-contrib</code> option to <code>config=
ure</code> if you also installed contrib libraries after building
}
[Add dropped wx*DCs.
shelarcy <she...@gm...>**20080624122641] {
hunk ./wxc/include/wxc_glue.h 845
+/* wxAutoBufferedPaintDC */=0D
+TClassDefExtend(wxAutoBufferedPaintDC,wxDC)=0D
+TClass(wxAutoBufferedPaintDC) wxAutoBufferedPaintDC_Create( TClass(wxWindo=
w) window );=0D
+void wxAutoBufferedPaintDC_Delete( TSelf(wxAutoBufferedPaintDC) self=
);=0D
+=0D
hunk ./wxc/include/wxc_glue.h 936
+/* wxBufferedDC */=0D
+TClassDefExtend(wxBufferedDC,wxDC)=0D
+TClass(wxBufferedDC) wxBufferedDC_CreateByDCAndSize( TClass(wxDC) dc, TSiz=
e(width, hight), int style );=0D
+TClass(wxBufferedDC) wxBufferedDC_CreateByDCAndBitmap( TClass(wxDC) dc, TC=
lass(wxBitmap) bitmap, int style );=0D
+void wxBufferedDC_Delete( TSelf(wxBufferedDC) self );=0D
+=0D
+/* wxBufferedPaintDC */=0D
+TClassDefExtend(wxBufferedPaintDC,wxDC)=0D
+TClass(wxBufferedPaintDC) wxBufferedPaintDC_Create( TClass(wxWindow) windo=
w, int style );=0D
+TClass(wxBufferedPaintDC) wxBufferedPaintDC_CreateWithBitmap( TClass(wxWin=
dow) window, TClass(wxBitmap) bitmap, int style );=0D
+void wxBufferedPaintDC_Delete( TSelf(wxBufferedPaintDC) self );=0D
+=0D
hunk ./wxc/include/wxc_glue.h 1383
-void wxDC_GetTextExtent( TSelf(wxDC) _obj, TStringVoid string, void*=
x, void* y, void* descent, void* externalLeading, TClass(wxFont) theFont )=
;=0D
+void wxDC_GetTextExtent( TSelf(wxDC) self, TStringVoid string, void*=
w, void* h, void* descent, void* externalLeading, TClass(wxFont) theFont )=
;=0D
+void wxDC_GetMultiLineTextExtent( TSelf(wxDC) self, TStringVoid stri=
ng, void* w, void* h, void* heightLine, TClass(wxFont) theFont );=0D
hunk ./wxc/include/wxc_glue.h 3030
+TClass(wxMemoryDC) wxMemoryDC_CreateWithBitmap( TClass(wxBitmap) bitmap );=
=0D
hunk ./wxc/include/wxc_glue.h 3180
+/* wxMirrorDC */=0D
+TClassDefExtend(wxMirrorDC,wxDC)=0D
+TClass(wxMirrorDC) wxMirrorDC_Create( TClass(wxDC) dc );=0D
+void wxMirrorDC_Delete( TSelf(wxMemoryDC) _obj );=0D
+=0D
hunk ./wxc/include/wxc_glue.h 3539
+TClass(wxPostScriptDC) wxPostScriptDC_Create( TClass(wxPrintData) data );=
=0D
+void wxPostScriptDC_Delete( TSelf(wxPostScriptDC) self );=0D
+void wxPostScriptDC_SetResolution( TSelf(wxPostScriptDC) self, int p=
pi );=0D
+int wxPostScriptDC_GetResolution( TSelf(wxPostScriptDC) self );=0D
hunk ./wxc/include/wxc_glue.h 3690
+TClass(wxPrinterDC) wxPrinterDC_Create( TClass(wxPrintData) data );=0D
+void wxPrinterDC_Delete( TSelf(wxPrinterDC) self );=0D
+void wxPrinterDC_GetPaperRect( TSelf(wxPrinterDC) self, TRectOut(_x,=
_y,_w,_h) );=0D
hunk ./wxc/include/wxc_glue.h 3901
-int wxScreenDC_EndDrawingOnTop( TSelf(wxScreenDC) _obj );=0D
-int wxScreenDC_StartDrawingOnTop( TSelf(wxScreenDC) _obj, int l, in=
t t, TSize(w,h) );=0D
-int wxScreenDC_StartDrawingOnTopOfWin( TSelf(wxScreenDC) _obj, TCla=
ss(wxWindow) win );=0D
+TBool wxScreenDC_EndDrawingOnTop( TSelf(wxScreenDC) _obj );=0D
+TBool wxScreenDC_StartDrawingOnTop( TSelf(wxScreenDC) _obj, TRect(x,y=
,w,h) );=0D
+TBool wxScreenDC_StartDrawingOnTopOfWin( TSelf(wxScreenDC) _obj, TCla=
ss(wxWindow) win );=0D
hunk ./wxc/src/eljdc.cpp 2
-#include "wx/metafile.h"=0D
+#include <wx/metafile.h>=0D
+#include <wx/dcmirror.h>=0D
+#include <wx/dcbuffer.h>=0D
hunk ./wxc/src/eljdc.cpp 229
-EWXWEXPORT(void, wxDC_GetTextExtent)(void* _obj, void* string, void* x, vo=
id* y, void* descent, void* externalLeading, void* theFont)=0D
+EWXWEXPORT(void, wxDC_GetTextExtent)(wxDC* self, wxChar* string, void* w, =
void* h, void* descent, void* externalLeading, void* theFont)=0D
hunk ./wxc/src/eljdc.cpp 231
- ((wxDC*)_obj)->GetTextExtent((wxChar*)string, (wxCoord*)x, (wxCoord*)y, (=
wxCoord*)descent, (wxCoord*)externalLeading, (wxFont*)theFont);=0D
+ self->GetTextExtent(string, (wxCoord*)w, (wxCoord*)h, (wxCoord*)descent, =
(wxCoord*)externalLeading, (wxFont*)theFont);=0D
hunk ./wxc/src/eljdc.cpp 234
+EWXWEXPORT(void, wxDC_GetMultiLineTextExtent)(wxDC* self, wxChar* string, =
void* w, void* h, void* heightLine, void* theFont)=0D
+{=0D
+ self->GetMultiLineTextExtent(string, (wxCoord*)w, (wxCoord*)h, (wxCoord*)=
heightLine, (wxFont*)theFont);=0D
+}=0D
+=0D
hunk ./wxc/src/eljdc.cpp 496
+EWXWEXPORT(wxMemoryDC*, wxMemoryDC_CreateWithBitmap) (wxBitmap* bitmap)=0D
+{=0D
+ return new wxMemoryDC(*bitmap);=0D
+}=0D
+=0D
hunk ./wxc/src/eljdc.cpp 510
- =0D
+=0D
+EWXWEXPORT(wxMirrorDC*, wxMirrorDC_Create) (wxDC* dc, bool mirror)=0D
+{=0D
+ return new wxMirrorDC(*dc, mirror);=0D
+}=0D
+=0D
+EWXWEXPORT(void, wxMirrorDC_Delete) (wxMirrorDC* self)=0D
+{=0D
+ if (self) delete self;=0D
+}=0D
+=0D
hunk ./wxc/src/eljdc.cpp 546
- =0D
+=0D
+EWXWEXPORT(wxBufferedDC*, wxBufferedDC_CreateByDCAndSize) ( wxDC *dc, int =
width, int hight, int style )=0D
+{=0D
+ return new wxBufferedDC(dc, wxSize(width, hight), style);=0D
+}=0D
+=0D
+EWXWEXPORT(wxBufferedDC*, wxBufferedDC_CreateByDCAndBitmap) ( wxDC *dc, wx=
Bitmap* buffer, int style )=0D
+{=0D
+ return new wxBufferedDC(dc, *buffer, style);=0D
+}=0D
+=0D
+EWXWEXPORT(void, wxBufferedDC_Delete) (wxBufferedDC* self)=0D
+{=0D
+ if (self) delete self;=0D
+}=0D
+=0D
+EWXWEXPORT(wxBufferedPaintDC*, wxBufferedPaintDC_Create) ( wxWindow *windo=
w, int style )=0D
+{=0D
+ return new wxBufferedPaintDC(window, style);=0D
+}=0D
+=0D
+EWXWEXPORT(wxBufferedPaintDC*, wxBufferedPaintDC_CreateWithBitmap) ( wxWin=
dow *window, wxBitmap* buffer, int style )=0D
+{=0D
+ return new wxBufferedPaintDC(window, *buffer, style);=0D
+}=0D
+=0D
+EWXWEXPORT(void, wxBufferedPaintDC_Delete) (wxBufferedPaintDC* self)=0D
+{=0D
+ if (self) delete self;=0D
+}=0D
+=0D
+EWXWEXPORT(wxAutoBufferedPaintDC*, wxAutoBufferedPaintDC_Create) ( wxWindo=
w *window )=0D
+{=0D
+ return new wxAutoBufferedPaintDC(window);=0D
+}=0D
+=0D
+EWXWEXPORT(void, wxAutoBufferedPaintDC_Delete) (wxAutoBufferedPaintDC* sel=
f)=0D
+{=0D
+ if (self) delete self;=0D
+}=0D
+=0D
hunk ./wxc/src/eljprinting.cpp 3
+#if !defined(__WXGTK__)=0D
+# include <wx/dcprint.h>=0D
+#endif=0D
+=0D
hunk ./wxc/src/eljprinting.cpp 12
-#include "wx/generic/prntdlgg.h"=0D
+# include <wx/dcps.h>=0D
+# include "wx/generic/prntdlgg.h"=0D
+#endif=0D
+=0D
+#ifndef wxUSE_POSTSCRIPT=0D
+# define wxPostScriptDC void=0D
hunk ./wxc/src/eljprinting.cpp 829
+EWXWEXPORT(wxPostScriptDC*, wxPostScriptDC_Create) (const wxPrintData* pri=
ntData)=0D
+{=0D
+#ifdef wxUSE_POSTSCRIPT=0D
+ return new wxPostScriptDC(*printData);=0D
+#else=0D
+ return NULL;=0D
+#endif=0D
+}=0D
+=0D
+EWXWEXPORT(void, wxPostScriptDC_Delete) (wxPostScriptDC* self)=0D
+{=0D
+#ifdef wxUSE_POSTSCRIPT=0D
+ if (self) delete self;=0D
+#endif=0D
+}=0D
+=0D
+EWXWEXPORT(void, wxPostScriptDC_SetResolution)(wxPostScriptDC* self, int p=
pi )=0D
+{=0D
+#ifdef wxUSE_POSTSCRIPT=0D
+ self->SetResolution(ppi);=0D
+#endif=0D
+}=0D
+=0D
+EWXWEXPORT(int, wxPostScriptDC_GetResolution)(wxPostScriptDC* self, int pp=
i )=0D
+{=0D
+#ifdef wxUSE_POSTSCRIPT=0D
+ return self->GetResolution();=0D
+#else=0D
+ return 0;=0D
+#endif=0D
+}=0D
+=0D
+EWXWEXPORT(void*,wxPrinterDC_Create)(const wxPrintData* printData)=0D
+{=0D
+#if defined(__WXGTK__) =0D
+ return NULL;=0D
+#else=0D
+ return new wxPrinterDC(*printData);=0D
+#endif=0D
+}=0D
+=0D
+EWXWEXPORT(void, wxPrinterDC_Delete) (void* _obj)=0D
+{=0D
+#if !defined(__WXGTK__)=0D
+ delete (wxPrinterDC*)_obj;=0D
+#endif=0D
+}=0D
+=0D
+EWXWEXPORT(void, wxPrinterDC_GetPaperRect) (void* _obj, int* x, int* y, in=
t* w, int* h)=0D
+{=0D
+#if !defined(__WXGTK__)=0D
+ wxRect rct =3D ((wxPrinterDC*)_obj)->GetPaperRect();=0D
+ *x =3D rct.x;=0D
+ *y =3D rct.y;=0D
+ *w =3D rct.width;=0D
+ *h =3D rct.height;=0D
+#endif=0D
+}=0D
+=0D
}
[Add dropped wxMedia's events to wxc.
shelarcy <she...@gm...>**20080624140139] {
hunk ./wxc/include/mediactrl.h 24
+=0D
+TClassDefExtend(wxMediaEvent,wxNotifyEvent);=0D
+=0D
+/* The wxMediaEvent's events */=0D
+int expEVT_MEDIA_LOADED();=0D
+int expEVT_MEDIA_STOP();=0D
+int expEVT_MEDIA_FINISHED();=0D
+int expEVT_MEDIA_STATECHANGED();=0D
+int expEVT_MEDIA_PLAY();=0D
+int expEVT_MEDIA_PAUSE(); =0D
hunk ./wxc/src/mediactrl.cpp 216
+
+
+/*------------------------------------------------------------------------=
-----
+ MediaEvent
+--------------------------------------------------------------------------=
---*/
+EWXWEXPORT(int,expEVT_MEDIA_LOADED)()
+{
+ return (int)wxEVT_MEDIA_LOADED;
+}
+
+EWXWEXPORT(int,expEVT_MEDIA_STOP)()
+{
+ return (int)wxEVT_MEDIA_STOP;
+}
+
+EWXWEXPORT(int,expEVT_MEDIA_FINISHED)()
+{
+ return (int)wxEVT_MEDIA_FINISHED;
+}
+
+EWXWEXPORT(int,expEVT_MEDIA_STATECHANGED)()
+{
+ return (int)wxEVT_MEDIA_STATECHANGED;
+}
+
+EWXWEXPORT(int,expEVT_MEDIA_PLAY)()
+{
+ return (int)wxEVT_MEDIA_PLAY;
+}
+
+EWXWEXPORT(int,expEVT_MEDIA_PAUSE)()
+{
+ return (int)wxEVT_MEDIA_PAUSE;
+}
}
[Use Int64 representing wxFileOffset type.
shelarcy <she...@gm...>**20080624152015] {
hunk ./wxc/include/mediactrl.h 12
-long wxMediaCtrl_Length(TSelf(wxMediaCtrl) self);=0D
+TInt64 wxMediaCtrl_Length(TSelf(wxMediaCtrl) self);=0D
hunk ./wxc/include/mediactrl.h 18
-long wxMediaCtrl_Seek(TSelf(wxMediaCtrl) self, long offsetWhere, int mode=
);=0D
+TInt64 wxMediaCtrl_Seek(TSelf(wxMediaCtrl) self, TInt64 offsetWhere, int m=
ode );=0D
hunk ./wxc/include/mediactrl.h 23
-long wxMediaCtrl_Tell(TSelf(wxMediaCtrl) self);=0D
+TInt64 wxMediaCtrl_Tell(TSelf(wxMediaCtrl) self);=0D
hunk ./wxc/include/wxc_types.h 16
+#undef TInt64=0D
hunk ./wxc/include/wxc_types.h 75
+/* 64 bit integer */=0D
+#define TInt64 int64_t=0D
+=0D
hunk ./wxcore/src/Graphics/UI/WXCore/WxcTypes.hs 98
+ -- *** 64 bit Integer
+ , Int64
hunk ./wxcore/src/Graphics/UI/WXCore/WxcTypes.hs 130
+import Data.Int
hunk ./wxdirect/src/CompileClasses.hs 538
+ Int64 -> "Int64"
hunk ./wxdirect/src/CompileClasses.hs 623
+ Int64 -> "Int64"
hunk ./wxdirect/src/ParseC.hs 137
+ <|> do reserved "TInt64"; return Int64
hunk ./wxdirect/src/Types.hs 82
+ | Int64
}
Context:
[Partialy fix a bug in wxhaskell-register.bat.
shelarcy <she...@gm...>**20080623152256] =
[Add --enable-optimization opition for building library with optimization f=
lags.
shelarcy <she...@gm...>**20080531114050] =
[Use CDouble and realToFrac instead of marshaling Double type directly.
shelarcy <she...@gm...>**20080530024730] =
[Remove unused make before-dist.
shelarcy <she...@gm...>**20080529120234] =
[Fix a bug in haddock documentation structure of Rectangle.
shelarcy <she...@gm...>**20080529111415] =
[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:
a67a8cdd4a0bffc25ba83682fc3bb2813e93183f
--=_--
.
|
|
From: shelarcy <she...@gm...> - 2008-06-24 15:07:09
|
DarcsURL: C:/home/shelarcy/wxhaskell
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=_"
--=_
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
Tue Jun 24 11:06:57 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008 shelarcy <shelarc=
y...@gm...>
* Fix #1400488: Win install problem when path with spaces, e.g. "Program =
Files".
Tue Jun 24 11:36:28 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008 shelarcy <shelarc=
y...@gm...>
* Update information about builiding wxWidgets and wxc with Microsoft Vis=
ual C++ Express Edition.
Tue Jun 24 12:24:29 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008 shelarcy <shelarc=
y...@gm...>
* Change --with-stc to --with-contrib for future contrib libraries suppor=
t.
Tue Jun 24 20:32:14 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008 shelarcy <shelarc=
y...@gm...>
* Revive wxSVGFileDC code.
Tue Jun 24 20:32:43 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008 shelarcy <shelarc=
y...@gm...>
* Update building information about --with-contrib option.
Tue Jun 24 21:26:41 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008 shelarcy <shelarc=
y...@gm...>
* Add dropped wx*DCs.
Tue Jun 24 23:01:39 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008 shelarcy <shelarc=
y...@gm...>
* Add dropped wxMedia's events to wxc.
Tue Jun 24 23:59:01 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008 shelarcy <shelarc=
y...@gm...>
* Use Int64 representing wxFileOffset type.
--=_
Content-Type: text/x-darcs-patch; name="fix-_1400488_-win-install-problem-when-path-with-spaces_-e_g_-_program-files__.dpatch"
Content-Transfer-Encoding: quoted-printable
Content-Description: A darcs patch for your repository!
New patches:
[Fix #1400488: Win install problem when path with spaces, e.g. "Program Fil=
es".
shelarcy <she...@gm...>**20080624020657] {
hunk ./bin/wxhaskell-register-template.bat 20
-SET installdir=3D%CURDIR: =3D^ %=0D
+SET installdirhelper=3D%CURDIR: =3D^ %=0D
+SET installdir=3D%installdirhelper:\=3D\\%=0D
hunk ./bin/wxhaskell-register-template.bat 31
-ECHO import-dirs:%installdir%\lib\imports >> "%installdir%\bin\wx.pkg"=0D
-ECHO library-dirs:%installdir%\lib >> "%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
hunk ./bin/wxhaskell-register-template.bat 34
-ECHO import-dirs:%installdir%\lib\imports >> "%installdir%\bin\wxcore.pkg"=
=0D
-ECHO library-dirs:%installdir%\lib >> "%installdir%\bin\wxcore.pkg"=
=0D
+ECHO import-dirs:"%installdir%\\lib\\imports" >> "%installdir%\bin\wxcore.=
pkg"=0D
+ECHO library-dirs:"%installdir%\\lib" >> "%installdir%\bin\wxcore.p=
kg"=0D
}
[Update information about builiding wxWidgets and wxc with Microsoft Visual=
C++ Express Edition.
shelarcy <she...@gm...>**20080624023628] {
hunk ./homepage/building-msc.html 61
-<p>If you want to use Visual C++ Express Edition, <a href=3D"http://msdn2.=
microsoft.com/express/aa700755.aspx">you must install Microsoft Platform SD=
K</a> before building wxWidgets or wxHaskell.</p>
+<p>If you want to use Visual C++ Express Edition, you must use Visual C++ =
2008 Express Editions or higher. Because previous version requires <a href=
=3D"http://msdn2.microsoft.com/express/aa700755.aspx">installing Microsoft =
Platform SDK</a> before building wxWidgets or wxHaskell.</p>
}
[Change --with-stc to --with-contrib for future contrib libraries support.
shelarcy <she...@gm...>**20080624032429] {
hunk ./configure 66
-withstc=3D"no"
-wxcstc=3D""
+withcontrib=3D"no"
+wxccontrib=3D""
hunk ./configure 308
- echo " --with-stc enable stc support [$withstc]"
+ echo " --with-contrib enable contrib libraries support [=
$withcontrib]"
hunk ./configure 384
- -with-stc|--with-stc)
- withstc=3D"yes";;
+ -with-contrib|--with-contrib)
+ withcontrib=3D"yes";;
hunk ./configure 504
- if test "$withstc" =3D "yes"; then
+ if test "$withcontrib" =3D "yes"; then
hunk ./configure 506
- wxcstc=3D"-DwxUSE_STC=3D1"
+ wxccontrib=3D"-DwxUSE_STC=3D1"
hunk ./configure 913
-# STC
-WXC-STC=3D$wxcstc
+# Contrib libraries
+WXC-CONTRIB=3D$wxccontrib
hunk ./configure 1180
-echo " stc: $withstc"
+echo " contrib: $withcontrib"
hunk ./makefile 822
-WXC-CXXFLAGS =3D$(WXWIN-CXXFLAGS) $(WXC-STC) -fPIC -I$(WXC-INCDIR)
+WXC-CXXFLAGS =3D$(WXWIN-CXXFLAGS) $(WXC-CONTRIB) -fPIC -I$(WXC-INCDIR)
}
[Revive wxSVGFileDC code.
shelarcy <she...@gm...>**20080624113214] {
hunk ./configure 505
- wxlibswanted=3D"$wxlibswanted stc"
- wxccontrib=3D"-DwxUSE_STC=3D1"
+ wxlibswanted=3D"$wxlibswanted stc svg"
+ wxccontrib=3D"-DwxUSE_STC=3D1 -DwxUSE_SVG=3D1"
hunk ./configure 971
+license:LGPL
hunk ./configure 974
+maintainer:wxh...@li...
hunk ./configure 1013
+license:LGPL
hunk ./configure 1016
+maintainer:wxh...@li...
hunk ./wxc/include/wxc_glue.h 1317
+void wxDC_ComputeScaleAndOrigin( TSelf(wxDC) obj );=0D
hunk ./wxc/include/wxc_glue.h 3810
-void* wxSVGFileDC_ComputeScaleAndOrigin( TSelf(wxSVGFileDC) obj );=0D
-TClass(wxSVGFileDC) wxSVGFileDC_Create( void* f );=0D
-void* wxSVGFileDC_CreateWithSize( TSelf(wxSVGFileDC) f, int a_width, =
int a_height );=0D
-void* wxSVGFileDC_CreateWithSizeAndResolution( TSelf(wxSVGFileDC) f, =
int a_width, int a_height, float a_dpi );=0D
-void* wxSVGFileDC_Delete( TSelf(wxSVGFileDC) obj );=0D
+TClass(wxSVGFileDC) wxSVGFileDC_Create( TString fileName );=0D
+TClass(wxSVGFileDC) wxSVGFileDC_CreateWithSize( TString fileName, TSize(w,=
h) );=0D
+TClass(wxSVGFileDC) wxSVGFileDC_CreateWithSizeAndResolution( TString fileN=
ame, TSize(w,h), float a_dpi );=0D
+void wxSVGFileDC_Delete( TSelf(wxSVGFileDC) obj );=0D
hunk ./wxc/src/eljdc.cpp 141
+ =0D
+EWXWEXPORT(void, wxDC_ComputeScaleAndOrigin) (wxDC* dc)=0D
+{=0D
+ dc->ComputeScaleAndOrigin();=0D
+}=0D
hunk ./wxc/src/eljdcsvg.cpp 2
-#include "wx/svg/dcsvg.h"=0D
+=0D
+#ifdef wxUSE_SVG=0D
+# include "wx/svg/dcsvg.h"=0D
+#endif=0D
hunk ./wxc/src/eljdcsvg.cpp 10
-EWXWEXPORT(void*, wxSVGFileDC_Create)(void* a_filename)=0D
+EWXWEXPORT(void*, wxSVGFileDC_Create)(wxChar* a_filename)=0D
hunk ./wxc/src/eljdcsvg.cpp 12
- return (void*) new wxSVGFileDC((char*)a_filename);=0D
+#ifdef wxUSE_SVG=0D
+ return (void*) new wxSVGFileDC(wxString(a_filename));=0D
+#else=0D
+ return NULL;=0D
+#endif=0D
hunk ./wxc/src/eljdcsvg.cpp 19
-EWXWEXPORT(void*, wxSVGFileDC_CreateWithSize)(void* a_filename, int a_widt=
h, int a_height)=0D
+EWXWEXPORT(void*, wxSVGFileDC_CreateWithSize)(wxChar* a_filename, int a_wi=
dth, int a_height)=0D
hunk ./wxc/src/eljdcsvg.cpp 21
- return (void*) new wxSVGFileDC((char*)a_filename, a_width, a_height);=0D
+#ifdef wxUSE_SVG=0D
+ return (void*) new wxSVGFileDC(wxString(a_filename), a_width, a_height);=
=0D
+#else=0D
+ return NULL;=0D
+#endif=0D
hunk ./wxc/src/eljdcsvg.cpp 28
-EWXWEXPORT(void*, wxSVGFileDC_CreateWithSizeAndResolution)(void* a_filenam=
e, int a_width, int a_height, float a_dpi)=0D
+EWXWEXPORT(void*, wxSVGFileDC_CreateWithSizeAndResolution)(wxChar* a_filen=
ame, int a_width, int a_height, float a_dpi)=0D
hunk ./wxc/src/eljdcsvg.cpp 30
- return (void*) new wxSVGFileDC((char*)a_filename, a_width, a_height, a_dp=
i);=0D
+#ifdef wxUSE_SVG=0D
+ return (void*) new wxSVGFileDC(wxString(a_filename), a_width, a_height, a=
_dpi);=0D
+#else=0D
+ return NULL;=0D
+#endif=0D
hunk ./wxc/src/eljdcsvg.cpp 39
+#ifdef wxUSE_SVG=0D
hunk ./wxc/src/eljdcsvg.cpp 41
-}=0D
-=0D
-EWXWEXPORT(void, wxSVGFileDC_ComputeScaleAndOrigin) (void* _obj)=0D
-{=0D
- ((wxSVGFileDC*)_obj)->ComputeScaleAndOrigin();=0D
+#endif=0D
hunk ./wxc/wxc-2.6.dsp 46
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\wxWidgets-2.6.4\lib\vc_lib\msw=
u" /I "..\..\wxWidgets-2.6.4\contrib\include" /I "include" /I "..\..\wxWidg=
ets-2.6.4\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USR=
DLL" /D "WXC_EXPORTS" /D WINVER=3D0x400 /D "_MT" /D wxUSE_GUI=3D1 /D wxUSE_=
UNICODE=3D1 /D wxUSE_STC=3D1 /D BUILD_WXC=3D1 /D "_DLL" /YX /FD /c=0D
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\wxWidgets-2.6.4\lib\vc_lib\msw=
u" /I "..\..\wxWidgets-2.6.4\contrib\include" /I "include" /I "..\..\wxWidg=
ets-2.6.4\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USR=
DLL" /D "WXC_EXPORTS" /D WINVER=3D0x400 /D "_MT" /D wxUSE_GUI=3D1 /D wxUSE_=
UNICODE=3D1 /D wxUSE_STC=3D1 /D wxUSE_SVG=3D1 /D BUILD_WXC=3D1 /D "_DLL" /Y=
X /FD /c=0D
hunk ./wxc/wxc-2.6.dsp 57
-# ADD LINK32 wxzlib.lib wxregexu.lib wxpng.lib wxjpeg.lib wxtiff.lib wxexp=
at.lib wxbase26u.lib wxbase26u_net.lib wxbase26u_odbc.lib wxbase26u_xml.lib=
wxmsw26u_core.lib wxmsw26u_adv.lib wxmsw26u_dbgrid.lib wxmsw26u_gl.lib wxm=
sw26u_html.lib wxmsw26u_media.lib wxmsw26u_stc.lib kernel32.lib user32.lib =
gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib olea=
ut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.l=
ib opengl32.lib winmm.lib /nologo /dll /machine:I386 /nodefaultlib:"LIBCMT"=
/out:"..\dist\wxc\wxc-msw2.8.7-0.10.3.dll" /libpath:"..\..\wxWidgets-2.6.4=
\lib\vc_lib"=0D
+# ADD LINK32 wxzlib.lib wxregexu.lib wxpng.lib wxjpeg.lib wxtiff.lib wxexp=
at.lib wxbase26u.lib wxbase26u_net.lib wxbase26u_odbc.lib wxbase26u_xml.lib=
wxmsw26u_core.lib wxmsw26u_adv.lib wxmsw26u_dbgrid.lib wxmsw26u_gl.lib wxm=
sw26u_html.lib wxmsw26u_media.lib wxmsw26u_stc.lib wxmsw26u_svg.lib kernel3=
2.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.l=
ib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpc=
rt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /machine:I386 /node=
faultlib:"LIBCMT" /out:"..\dist\wxc\wxc-msw2.8.7-0.10.3.dll" /libpath:"..\.=
.\wxWidgets-2.6.4\lib\vc_lib"=0D
hunk ./wxc/wxc-2.6.dsp 77
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\wxWidgets-2.6.4\lib\v=
c_lib\mswud" /I "include" /I "..\..\wxWidgets-2.6.4\include" /I "..\..\wxWi=
dgets-2.6.4\contrib\include" /D "_DEBUG" /D "__WXDEBUG__" /D WXDEBUG=3D1 /D=
"WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /D WINVER=
=3D0x400 /D "_MT" /D wxUSE_GUI=3D1 /D wxUSE_UNICODE=3D1 /D wxUSE_STC=3D1 /D=
BUILD_WXC=3D1 /D "_DLL" /YX /FD /GZ /c=0D
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\wxWidgets-2.6.4\lib\v=
c_lib\mswud" /I "include" /I "..\..\wxWidgets-2.6.4\include" /I "..\..\wxWi=
dgets-2.6.4\contrib\include" /D "_DEBUG" /D "__WXDEBUG__" /D WXDEBUG=3D1 /D=
"WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /D WINVER=
=3D0x400 /D "_MT" /D wxUSE_GUI=3D1 /D wxUSE_UNICODE=3D1 /D wxUSE_STC=3D1 /D=
wxUSE_SVG=3D1 /D BUILD_WXC=3D1 /D "_DLL" /YX /FD /GZ /c=0D
hunk ./wxc/wxc-2.6.dsp 88
-# ADD LINK32 wxzlibd.lib wxregexud.lib wxpngd.lib wxjpegd.lib wxtiffd.lib =
wxexpatd.lib wxbase26ud.lib wxbase26ud_net.lib wxbase26ud_odbc.lib wxbase26=
ud_xml.lib wxmsw26ud_core.lib wxmsw26ud_adv.lib wxmsw26ud_dbgrid.lib wxmsw2=
6ud_gl.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_stc.lib kernel3=
2.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.l=
ib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpc=
rt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /debug /machine:I38=
6 /nodefaultlib:"LIBCMTD" /out:"..\dist\wxc\wxcd-msw2.8.7-0.10.3.dll" /pdbt=
ype:sept /libpath:"..\..\wxWidgets-2.6.4\lib\vc_lib"=0D
+# ADD LINK32 wxzlibd.lib wxregexud.lib wxpngd.lib wxjpegd.lib wxtiffd.lib =
wxexpatd.lib wxbase26ud.lib wxbase26ud_net.lib wxbase26ud_odbc.lib wxbase26=
ud_xml.lib wxmsw26ud_core.lib wxmsw26ud_adv.lib wxmsw26ud_dbgrid.lib wxmsw2=
6ud_gl.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_stc.lib wxmsw26=
ud_svg.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib adva=
pi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.li=
b comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /=
debug /machine:I386 /nodefaultlib:"LIBCMTD" /out:"..\dist\wxc\wxcd-msw2.8.7=
-0.10.3.dll" /pdbtype:sept /libpath:"..\..\wxWidgets-2.6.4\lib\vc_lib"=0D
hunk ./wxc/wxc-2.6.dsp 354
+# Begin Source File=0D
+=0D
+SOURCE=3D.\src\eljdcsvg.cpp=0D
+# End Source File=0D
hunk ./wxc/wxc-2.6.dsw 31
+##########################################################################=
#####=0D
+=0D
+Project: "svg"=3D"..\..\wxWidgets-2.6.4\contrib\build\stc\svg.dsp" - Packa=
ge Owner=3D<4>=0D
+=0D
+Package=3D<5>=0D
+{{{=0D
+}}}=0D
+=0D
+Package=3D<4>=0D
+{{{=0D
+}}}=0D
hunk ./wxc/wxc-2.8.dsp 46
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\wxWidgets-2.8.7\lib\vc_lib\msw=
u" /I "..\..\wxWidgets-2.8.7\contrib\include" /I "include" /I "..\..\wxWidg=
ets-2.8.7\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USR=
DLL" /D "WXC_EXPORTS" /D WINVER=3D0x400 /D "_MT" /D wxUSE_GUI=3D1 /D wxUSE_=
UNICODE=3D1 /D wxUSE_STC=3D1 /D BUILD_WXC=3D1 /D "_DLL" /YX /FD /c=0D
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\wxWidgets-2.8.7\lib\vc_lib\msw=
u" /I "..\..\wxWidgets-2.8.7\contrib\include" /I "include" /I "..\..\wxWidg=
ets-2.8.7\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USR=
DLL" /D "WXC_EXPORTS" /D WINVER=3D0x400 /D "_MT" /D wxUSE_GUI=3D1 /D wxUSE_=
UNICODE=3D1 /D wxUSE_STC=3D1 /D wxUSE_SVG=3D1 /D BUILD_WXC=3D1 /D "_DLL" /Y=
X /FD /c=0D
hunk ./wxc/wxc-2.8.dsp 57
-# ADD LINK32 wxzlib.lib wxregexu.lib wxpng.lib wxjpeg.lib wxtiff.lib wxexp=
at.lib wxbase28u.lib wxbase28u_net.lib wxbase28u_odbc.lib wxbase28u_xml.lib=
wxmsw28u_core.lib wxmsw28u_adv.lib wxmsw28u_dbgrid.lib wxmsw28u_gl.lib wxm=
sw28u_html.lib wxmsw28u_media.lib wxmsw28u_stc.lib kernel32.lib user32.lib =
gdi32.lib gdiplus.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ol=
e32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.l=
ib wsock32.lib opengl32.lib winmm.lib /nologo /dll /machine:I386 /nodefault=
lib:"LIBCMT" /out:"..\dist\wxc\wxc-msw2.8.7-0.10.3.dll" /libpath:"..\..\wxW=
idgets-2.8.7\lib\vc_lib"=0D
+# ADD LINK32 wxzlib.lib wxregexu.lib wxpng.lib wxjpeg.lib wxtiff.lib wxexp=
at.lib wxbase28u.lib wxbase28u_net.lib wxbase28u_odbc.lib wxbase28u_xml.lib=
wxmsw28u_core.lib wxmsw28u_adv.lib wxmsw28u_dbgrid.lib wxmsw28u_gl.lib wxm=
sw28u_html.lib wxmsw28u_media.lib wxmsw28u_stc.lib wxmsw28u_svg.lib kernel3=
2.lib user32.lib gdi32.lib gdiplus.lib winspool.lib comdlg32.lib advapi32.l=
ib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comc=
tl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /machin=
e:I386 /nodefaultlib:"LIBCMT" /out:"..\dist\wxc\wxc-msw2.8.7-0.10.3.dll" /l=
ibpath:"..\..\wxWidgets-2.8.7\lib\vc_lib"=0D
hunk ./wxc/wxc-2.8.dsp 77
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\wxWidgets-2.8.7\lib\v=
c_lib\mswud" /I "include" /I "..\..\wxWidgets-2.8.7\include" /I "..\..\wxWi=
dgets-2.8.7\contrib\include" /D "_DEBUG" /D "__WXDEBUG__" /D WXDEBUG=3D1 /D=
"WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /D WINVER=
=3D0x400 /D "_MT" /D wxUSE_GUI=3D1 /D wxUSE_UNICODE=3D1 /D wxUSE_STC=3D1 /D=
BUILD_WXC=3D1 /D "_DLL" /YX /FD /GZ /c=0D
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\wxWidgets-2.8.7\lib\v=
c_lib\mswud" /I "include" /I "..\..\wxWidgets-2.8.7\include" /I "..\..\wxWi=
dgets-2.8.7\contrib\include" /D "_DEBUG" /D "__WXDEBUG__" /D WXDEBUG=3D1 /D=
"WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /D WINVER=
=3D0x400 /D "_MT" /D wxUSE_GUI=3D1 /D wxUSE_UNICODE=3D1 /D wxUSE_STC=3D1 /D=
wxUSE_SVG=3D1 /D BUILD_WXC=3D1 /D "_DLL" /YX /FD /GZ /c=0D
hunk ./wxc/wxc-2.8.dsp 88
-# ADD LINK32 wxzlibd.lib wxregexud.lib wxpngd.lib wxjpegd.lib wxtiffd.lib =
wxexpatd.lib wxbase28ud.lib wxbase28ud_net.lib wxbase28ud_odbc.lib wxbase28=
ud_xml.lib wxmsw28ud_core.lib wxmsw28ud_adv.lib wxmsw28ud_dbgrid.lib wxmsw2=
8ud_gl.lib wxmsw28ud_html.lib wxmsw28ud_media.lib wxmsw28ud_stc.lib kernel3=
2.lib user32.lib gdi32.lib gdiplus.lib winspool.lib comdlg32.lib advapi32.l=
ib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comc=
tl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /debug =
/machine:I386 /nodefaultlib:"LIBCMTD" /out:"..\dist\wxc\wxcd-msw2.8.7-0.10.=
3.dll" /pdbtype:sept /libpath:"..\..\wxWidgets-2.8.7\lib\vc_lib"=0D
+# ADD LINK32 wxzlibd.lib wxregexud.lib wxpngd.lib wxjpegd.lib wxtiffd.lib =
wxexpatd.lib wxbase28ud.lib wxbase28ud_net.lib wxbase28ud_odbc.lib wxbase28=
ud_xml.lib wxmsw28ud_core.lib wxmsw28ud_adv.lib wxmsw28ud_dbgrid.lib wxmsw2=
8ud_gl.lib wxmsw28ud_html.lib wxmsw28ud_media.lib wxmsw28ud_stc.lib wxmsw28=
ud_svg.lib kernel32.lib user32.lib gdi32.lib gdiplus.lib winspool.lib comdl=
g32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib=
odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /n=
ologo /dll /debug /machine:I386 /nodefaultlib:"LIBCMTD" /out:"..\dist\wxc\w=
xcd-msw2.8.7-0.10.3.dll" /pdbtype:sept /libpath:"..\..\wxWidgets-2.8.7\lib\=
vc_lib"=0D
hunk ./wxc/wxc-2.8.dsp 354
+# Begin Source File=0D
+=0D
+SOURCE=3D.\src\eljdcsvg.cpp=0D
+# End Source File=0D
hunk ./wxc/wxc-2.8.dsw 16
+ Project_Dep_Name svg=0D
hunk ./wxc/wxc-2.8.dsw 32
+##########################################################################=
#####=0D
+=0D
+Project: "svg"=3D"..\..\wxWidgets-2.8.7\contrib\build\svg\svg.dsp" - Packa=
ge Owner=3D<4>=0D
+=0D
+Package=3D<5>=0D
+{{{=0D
+}}}=0D
+=0D
+Package=3D<4>=0D
+{{{=0D
+}}}=0D
hunk ./wxcore/src/Graphics/UI/WXCore/Draw.hs 20
+ , withSVGFileDC, withSVGFileDCWithSize, withSVGFileDCWithSizeAndRe=
solution
hunk ./wxcore/src/Graphics/UI/WXCore/Draw.hs 84
+-- | Use a 'SVGFileDC'.
+withSVGFileDC :: FilePath -> (SVGFileDC () -> IO b) -> IO b
+withSVGFileDC fname draw
+ =3D bracket (sVGFileDCCreate fname) (sVGFileDCDelete) (\dc -> dcDraw dc =
(draw dc))
+
+withSVGFileDCWithSize :: FilePath -> Size -> (SVGFileDC () -> IO b) -> IO =
b
+withSVGFileDCWithSize fname size draw
+ =3D bracket (sVGFileDCCreateWithSize fname size) (sVGFileDCDelete) (\dc =
-> dcDraw dc (draw dc))
+
+withSVGFileDCWithSizeAndResolution :: FilePath -> Size -> Float -> (SVGFil=
eDC () -> IO b) -> IO b
+withSVGFileDCWithSizeAndResolution fname size dpi draw
+ =3D bracket (sVGFileDCCreateWithSizeAndResolution fname size dpi) (sVGFi=
leDCDelete) (\dc -> dcDraw dc (draw dc))
+
hunk ./wxdirect/src/DeriveTypes.hs 312
- -- svg files
- ,prefix "wxSVGFileDC" "svg file dc"
}
[Update building information about --with-contrib option.
shelarcy <she...@gm...>**20080624113243] {
hunk ./homepage/building.html 218
-<li>You should pass the <code>--with-stc</code> option to <code>configure<=
/code> if you also installed contrib's stc library after building
+<li>You should pass the <code>--with-contrib</code> option to <code>config=
ure</code> if you also installed contrib libraries after building
}
[Add dropped wx*DCs.
shelarcy <she...@gm...>**20080624122641] {
hunk ./wxc/include/wxc_glue.h 845
+/* wxAutoBufferedPaintDC */=0D
+TClassDefExtend(wxAutoBufferedPaintDC,wxDC)=0D
+TClass(wxAutoBufferedPaintDC) wxAutoBufferedPaintDC_Create( TClass(wxWindo=
w) window );=0D
+void wxAutoBufferedPaintDC_Delete( TSelf(wxAutoBufferedPaintDC) self=
);=0D
+=0D
hunk ./wxc/include/wxc_glue.h 936
+/* wxBufferedDC */=0D
+TClassDefExtend(wxBufferedDC,wxDC)=0D
+TClass(wxBufferedDC) wxBufferedDC_CreateByDCAndSize( TClass(wxDC) dc, TSiz=
e(width, hight), int style );=0D
+TClass(wxBufferedDC) wxBufferedDC_CreateByDCAndBitmap( TClass(wxDC) dc, TC=
lass(wxBitmap) bitmap, int style );=0D
+void wxBufferedDC_Delete( TSelf(wxBufferedDC) self );=0D
+=0D
+/* wxBufferedPaintDC */=0D
+TClassDefExtend(wxBufferedPaintDC,wxDC)=0D
+TClass(wxBufferedPaintDC) wxBufferedPaintDC_Create( TClass(wxWindow) windo=
w, int style );=0D
+TClass(wxBufferedPaintDC) wxBufferedPaintDC_CreateWithBitmap( TClass(wxWin=
dow) window, TClass(wxBitmap) bitmap, int style );=0D
+void wxBufferedPaintDC_Delete( TSelf(wxBufferedPaintDC) self );=0D
+=0D
hunk ./wxc/include/wxc_glue.h 1383
-void wxDC_GetTextExtent( TSelf(wxDC) _obj, TStringVoid string, void*=
x, void* y, void* descent, void* externalLeading, TClass(wxFont) theFont )=
;=0D
+void wxDC_GetTextExtent( TSelf(wxDC) self, TStringVoid string, void*=
w, void* h, void* descent, void* externalLeading, TClass(wxFont) theFont )=
;=0D
+void wxDC_GetMultiLineTextExtent( TSelf(wxDC) self, TStringVoid stri=
ng, void* w, void* h, void* heightLine, TClass(wxFont) theFont );=0D
hunk ./wxc/include/wxc_glue.h 3030
+TClass(wxMemoryDC) wxMemoryDC_CreateWithBitmap( TClass(wxBitmap) bitmap );=
=0D
hunk ./wxc/include/wxc_glue.h 3180
+/* wxMirrorDC */=0D
+TClassDefExtend(wxMirrorDC,wxDC)=0D
+TClass(wxMirrorDC) wxMirrorDC_Create( TClass(wxDC) dc );=0D
+void wxMirrorDC_Delete( TSelf(wxMemoryDC) _obj );=0D
+=0D
hunk ./wxc/include/wxc_glue.h 3539
+TClass(wxPostScriptDC) wxPostScriptDC_Create( TClass(wxPrintData) data );=
=0D
+void wxPostScriptDC_Delete( TSelf(wxPostScriptDC) self );=0D
+void wxPostScriptDC_SetResolution( TSelf(wxPostScriptDC) self, int p=
pi );=0D
+int wxPostScriptDC_GetResolution( TSelf(wxPostScriptDC) self );=0D
hunk ./wxc/include/wxc_glue.h 3690
+TClass(wxPrinterDC) wxPrinterDC_Create( TClass(wxPrintData) data );=0D
+void wxPrinterDC_Delete( TSelf(wxPrinterDC) self );=0D
+void wxPrinterDC_GetPaperRect( TSelf(wxPrinterDC) self, TRectOut(_x,=
_y,_w,_h) );=0D
hunk ./wxc/include/wxc_glue.h 3901
-int wxScreenDC_EndDrawingOnTop( TSelf(wxScreenDC) _obj );=0D
-int wxScreenDC_StartDrawingOnTop( TSelf(wxScreenDC) _obj, int l, in=
t t, TSize(w,h) );=0D
-int wxScreenDC_StartDrawingOnTopOfWin( TSelf(wxScreenDC) _obj, TCla=
ss(wxWindow) win );=0D
+TBool wxScreenDC_EndDrawingOnTop( TSelf(wxScreenDC) _obj );=0D
+TBool wxScreenDC_StartDrawingOnTop( TSelf(wxScreenDC) _obj, TRect(x,y=
,w,h) );=0D
+TBool wxScreenDC_StartDrawingOnTopOfWin( TSelf(wxScreenDC) _obj, TCla=
ss(wxWindow) win );=0D
hunk ./wxc/src/eljdc.cpp 2
-#include "wx/metafile.h"=0D
+#include <wx/metafile.h>=0D
+#include <wx/dcmirror.h>=0D
+#include <wx/dcbuffer.h>=0D
hunk ./wxc/src/eljdc.cpp 229
-EWXWEXPORT(void, wxDC_GetTextExtent)(void* _obj, void* string, void* x, vo=
id* y, void* descent, void* externalLeading, void* theFont)=0D
+EWXWEXPORT(void, wxDC_GetTextExtent)(wxDC* self, wxChar* string, void* w, =
void* h, void* descent, void* externalLeading, void* theFont)=0D
hunk ./wxc/src/eljdc.cpp 231
- ((wxDC*)_obj)->GetTextExtent((wxChar*)string, (wxCoord*)x, (wxCoord*)y, (=
wxCoord*)descent, (wxCoord*)externalLeading, (wxFont*)theFont);=0D
+ self->GetTextExtent(string, (wxCoord*)w, (wxCoord*)h, (wxCoord*)descent, =
(wxCoord*)externalLeading, (wxFont*)theFont);=0D
hunk ./wxc/src/eljdc.cpp 234
+EWXWEXPORT(void, wxDC_GetMultiLineTextExtent)(wxDC* self, wxChar* string, =
void* w, void* h, void* heightLine, void* theFont)=0D
+{=0D
+ self->GetMultiLineTextExtent(string, (wxCoord*)w, (wxCoord*)h, (wxCoord*)=
heightLine, (wxFont*)theFont);=0D
+}=0D
+=0D
hunk ./wxc/src/eljdc.cpp 496
+EWXWEXPORT(wxMemoryDC*, wxMemoryDC_CreateWithBitmap) (wxBitmap* bitmap)=0D
+{=0D
+ return new wxMemoryDC(*bitmap);=0D
+}=0D
+=0D
hunk ./wxc/src/eljdc.cpp 510
- =0D
+=0D
+EWXWEXPORT(wxMirrorDC*, wxMirrorDC_Create) (wxDC* dc, bool mirror)=0D
+{=0D
+ return new wxMirrorDC(*dc, mirror);=0D
+}=0D
+=0D
+EWXWEXPORT(void, wxMirrorDC_Delete) (wxMirrorDC* self)=0D
+{=0D
+ if (self) delete self;=0D
+}=0D
+=0D
hunk ./wxc/src/eljdc.cpp 546
- =0D
+=0D
+EWXWEXPORT(wxBufferedDC*, wxBufferedDC_CreateByDCAndSize) ( wxDC *dc, int =
width, int hight, int style )=0D
+{=0D
+ return new wxBufferedDC(dc, wxSize(width, hight), style);=0D
+}=0D
+=0D
+EWXWEXPORT(wxBufferedDC*, wxBufferedDC_CreateByDCAndBitmap) ( wxDC *dc, wx=
Bitmap* buffer, int style )=0D
+{=0D
+ return new wxBufferedDC(dc, *buffer, style);=0D
+}=0D
+=0D
+EWXWEXPORT(void, wxBufferedDC_Delete) (wxBufferedDC* self)=0D
+{=0D
+ if (self) delete self;=0D
+}=0D
+=0D
+EWXWEXPORT(wxBufferedPaintDC*, wxBufferedPaintDC_Create) ( wxWindow *windo=
w, int style )=0D
+{=0D
+ return new wxBufferedPaintDC(window, style);=0D
+}=0D
+=0D
+EWXWEXPORT(wxBufferedPaintDC*, wxBufferedPaintDC_CreateWithBitmap) ( wxWin=
dow *window, wxBitmap* buffer, int style )=0D
+{=0D
+ return new wxBufferedPaintDC(window, *buffer, style);=0D
+}=0D
+=0D
+EWXWEXPORT(void, wxBufferedPaintDC_Delete) (wxBufferedPaintDC* self)=0D
+{=0D
+ if (self) delete self;=0D
+}=0D
+=0D
+EWXWEXPORT(wxAutoBufferedPaintDC*, wxAutoBufferedPaintDC_Create) ( wxWindo=
w *window )=0D
+{=0D
+ return new wxAutoBufferedPaintDC(window);=0D
+}=0D
+=0D
+EWXWEXPORT(void, wxAutoBufferedPaintDC_Delete) (wxAutoBufferedPaintDC* sel=
f)=0D
+{=0D
+ if (self) delete self;=0D
+}=0D
+=0D
hunk ./wxc/src/eljprinting.cpp 3
+#if !defined(__WXGTK__)=0D
+# include <wx/dcprint.h>=0D
+#endif=0D
+=0D
hunk ./wxc/src/eljprinting.cpp 12
-#include "wx/generic/prntdlgg.h"=0D
+# include <wx/dcps.h>=0D
+# include "wx/generic/prntdlgg.h"=0D
+#endif=0D
+=0D
+#ifndef wxUSE_POSTSCRIPT=0D
+# define wxPostScriptDC void=0D
hunk ./wxc/src/eljprinting.cpp 829
+EWXWEXPORT(wxPostScriptDC*, wxPostScriptDC_Create) (const wxPrintData* pri=
ntData)=0D
+{=0D
+#ifdef wxUSE_POSTSCRIPT=0D
+ return new wxPostScriptDC(*printData);=0D
+#else=0D
+ return NULL;=0D
+#endif=0D
+}=0D
+=0D
+EWXWEXPORT(void, wxPostScriptDC_Delete) (wxPostScriptDC* self)=0D
+{=0D
+#ifdef wxUSE_POSTSCRIPT=0D
+ if (self) delete self;=0D
+#endif=0D
+}=0D
+=0D
+EWXWEXPORT(void, wxPostScriptDC_SetResolution)(wxPostScriptDC* self, int p=
pi )=0D
+{=0D
+#ifdef wxUSE_POSTSCRIPT=0D
+ self->SetResolution(ppi);=0D
+#endif=0D
+}=0D
+=0D
+EWXWEXPORT(int, wxPostScriptDC_GetResolution)(wxPostScriptDC* self, int pp=
i )=0D
+{=0D
+#ifdef wxUSE_POSTSCRIPT=0D
+ return self->GetResolution();=0D
+#else=0D
+ return 0;=0D
+#endif=0D
+}=0D
+=0D
+EWXWEXPORT(void*,wxPrinterDC_Create)(const wxPrintData* printData)=0D
+{=0D
+#if defined(__WXGTK__) =0D
+ return NULL;=0D
+#else=0D
+ return new wxPrinterDC(*printData);=0D
+#endif=0D
+}=0D
+=0D
+EWXWEXPORT(void, wxPrinterDC_Delete) (void* _obj)=0D
+{=0D
+#if !defined(__WXGTK__)=0D
+ delete (wxPrinterDC*)_obj;=0D
+#endif=0D
+}=0D
+=0D
+EWXWEXPORT(void, wxPrinterDC_GetPaperRect) (void* _obj, int* x, int* y, in=
t* w, int* h)=0D
+{=0D
+#if !defined(__WXGTK__)=0D
+ wxRect rct =3D ((wxPrinterDC*)_obj)->GetPaperRect();=0D
+ *x =3D rct.x;=0D
+ *y =3D rct.y;=0D
+ *w =3D rct.width;=0D
+ *h =3D rct.height;=0D
+#endif=0D
+}=0D
+=0D
}
[Add dropped wxMedia's events to wxc.
shelarcy <she...@gm...>**20080624140139] {
hunk ./wxc/include/mediactrl.h 24
+=0D
+TClassDefExtend(wxMediaEvent,wxNotifyEvent);=0D
+=0D
+/* The wxMediaEvent's events */=0D
+int expEVT_MEDIA_LOADED();=0D
+int expEVT_MEDIA_STOP();=0D
+int expEVT_MEDIA_FINISHED();=0D
+int expEVT_MEDIA_STATECHANGED();=0D
+int expEVT_MEDIA_PLAY();=0D
+int expEVT_MEDIA_PAUSE(); =0D
hunk ./wxc/src/mediactrl.cpp 216
+
+
+/*------------------------------------------------------------------------=
-----
+ MediaEvent
+--------------------------------------------------------------------------=
---*/
+EWXWEXPORT(int,expEVT_MEDIA_LOADED)()
+{
+ return (int)wxEVT_MEDIA_LOADED;
+}
+
+EWXWEXPORT(int,expEVT_MEDIA_STOP)()
+{
+ return (int)wxEVT_MEDIA_STOP;
+}
+
+EWXWEXPORT(int,expEVT_MEDIA_FINISHED)()
+{
+ return (int)wxEVT_MEDIA_FINISHED;
+}
+
+EWXWEXPORT(int,expEVT_MEDIA_STATECHANGED)()
+{
+ return (int)wxEVT_MEDIA_STATECHANGED;
+}
+
+EWXWEXPORT(int,expEVT_MEDIA_PLAY)()
+{
+ return (int)wxEVT_MEDIA_PLAY;
+}
+
+EWXWEXPORT(int,expEVT_MEDIA_PAUSE)()
+{
+ return (int)wxEVT_MEDIA_PAUSE;
+}
}
[Use Int64 representing wxFileOffset type.
shelarcy <she...@gm...>**20080624145901] {
hunk ./wxc/include/mediactrl.h 12
-long wxMediaCtrl_Length(TSelf(wxMediaCtrl) self);=0D
+TInt64 wxMediaCtrl_Length(TSelf(wxMediaCtrl) self);=0D
hunk ./wxc/include/mediactrl.h 18
-long wxMediaCtrl_Seek(TSelf(wxMediaCtrl) self, long offsetWhere, int mode=
);=0D
+TInt64 wxMediaCtrl_Seek(TSelf(wxMediaCtrl) self, TInt64 offsetWhere, int m=
ode );=0D
hunk ./wxc/include/wxc_types.h 16
+#undef TInt64=0D
hunk ./wxc/include/wxc_types.h 75
+/* 64 bit integer */=0D
+#define TInt64 int64_t=0D
+=0D
hunk ./wxcore/src/Graphics/UI/WXCore/WxcTypes.hs 98
+ -- *** 64 bit Integer
+ , Int64
hunk ./wxcore/src/Graphics/UI/WXCore/WxcTypes.hs 130
+import Data.Int
hunk ./wxdirect/src/CompileClasses.hs 538
+ Int64 -> "Int64"
hunk ./wxdirect/src/CompileClasses.hs 623
+ Int64 -> "Int64"
hunk ./wxdirect/src/ParseC.hs 137
+ <|> do reserved "TInt64"; return Int64
hunk ./wxdirect/src/Types.hs 82
+ | Int64
}
Context:
[Partialy fix a bug in wxhaskell-register.bat.
shelarcy <she...@gm...>**20080623152256] =
[Add --enable-optimization opition for building library with optimization f=
lags.
shelarcy <she...@gm...>**20080531114050] =
[Use CDouble and realToFrac instead of marshaling Double type directly.
shelarcy <she...@gm...>**20080530024730] =
[Remove unused make before-dist.
shelarcy <she...@gm...>**20080529120234] =
[Fix a bug in haddock documentation structure of Rectangle.
shelarcy <she...@gm...>**20080529111415] =
[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:
3e3fdd30e1d50e721ddea114df0f75fc36b27ce1
--=_--
.
|
|
From: Eric Y. K. <eri...@gm...> - 2008-06-23 21:05:29
|
Pushed! Thanks. -- Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow> PGP Key ID: 08AC04F9 |
|
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
--=_--
.
|
|
From: Jeremy O'D. <je...@o-...> - 2008-06-10 08:50:55
|
Mads Lindstrøm wrote: > Hi, > > Eric Y. Kow wrote: > >> On Tue, Apr 22, 2008 at 09:05:09 +0100, Simon Peyton-Jones wrote: >> >>> Call for Talks and Tutorials >>> ACM SIGPLAN 2008 Developer Tracks on Functional Programming >>> http://www.deinprogramm.de/defun-2008/ >>> Victoria, BC, Canada, 25, 27 September, 2008 >>> The workshop will be held in conjunction with ICFP 2008. >>> http://www.icfpconference.org/icfp2008/ >>> >>> How-to talks: 45-minute "how-to" talks that provide specific >>> information on how to solve specific problems using functional >>> programming. These talks focus on concrete examples, but provide >>> useful information for developers working on different projects or in >>> different contexts. >>> >> Will anyone be able to give this a talk in September? It would be >> really great for wxHaskell. >> >> If one of us is available to go (for example, will be at ICFP), we >> can help you prepare... >> >> Jeremy, perhaps? Anyone else? Mads? >> > > I am unable to attend. > I'm not in academia, and I don't think I could ever persuade my employer to pay up for this sort of thing, so I can't go either. Sorry. Jeremy |
|
From: Mads L. <mad...@ya...> - 2008-06-09 16:03:32
|
Hi, Eric Y. Kow wrote: > On Tue, Apr 22, 2008 at 09:05:09 +0100, Simon Peyton-Jones wrote: > > Call for Talks and Tutorials > > ACM SIGPLAN 2008 Developer Tracks on Functional Programming > > http://www.deinprogramm.de/defun-2008/ > > Victoria, BC, Canada, 25, 27 September, 2008 > > The workshop will be held in conjunction with ICFP 2008. > > http://www.icfpconference.org/icfp2008/ > > > How-to talks: 45-minute "how-to" talks that provide specific > > information on how to solve specific problems using functional > > programming. These talks focus on concrete examples, but provide > > useful information for developers working on different projects or in > > different contexts. > > Will anyone be able to give this a talk in September? It would be > really great for wxHaskell. > > If one of us is available to go (for example, will be at ICFP), we > can help you prepare... > > Jeremy, perhaps? Anyone else? Mads? Maybe we should ask a little wider. Maybe the users list? Greetings, Mads > > ------------------------------------------------------------------------- > This SF.net email is sponsored by: Microsoft > Defy all challenges. Microsoft(R) Visual Studio 2008. > http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ > _______________________________________________ wxhaskell-devel mailing list wxh...@li... https://lists.sourceforge.net/lists/listinfo/wxhaskell-devel |
|
From: Mads L. <mad...@ya...> - 2008-06-02 15:52:52
|
Hi, Eric Y. Kow wrote: > On Tue, Apr 22, 2008 at 09:05:09 +0100, Simon Peyton-Jones wrote: > > Call for Talks and Tutorials > > ACM SIGPLAN 2008 Developer Tracks on Functional Programming > > http://www.deinprogramm.de/defun-2008/ > > Victoria, BC, Canada, 25, 27 September, 2008 > > The workshop will be held in conjunction with ICFP 2008. > > http://www.icfpconference.org/icfp2008/ > > > How-to talks: 45-minute "how-to" talks that provide specific > > information on how to solve specific problems using functional > > programming. These talks focus on concrete examples, but provide > > useful information for developers working on different projects or in > > different contexts. > > Will anyone be able to give this a talk in September? It would be > really great for wxHaskell. > > If one of us is available to go (for example, will be at ICFP), we > can help you prepare... > > Jeremy, perhaps? Anyone else? Mads? I am unable to attend. Greetigns, Mads |
|
From: Eric Y. K. <eri...@gm...> - 2008-06-01 22:01:44
|
On Tue, Apr 22, 2008 at 09:05:09 +0100, Simon Peyton-Jones wrote: > Call for Talks and Tutorials > ACM SIGPLAN 2008 Developer Tracks on Functional Programming > http://www.deinprogramm.de/defun-2008/ > Victoria, BC, Canada, 25, 27 September, 2008 > The workshop will be held in conjunction with ICFP 2008. > http://www.icfpconference.org/icfp2008/ > How-to talks: 45-minute "how-to" talks that provide specific > information on how to solve specific problems using functional > programming. These talks focus on concrete examples, but provide > useful information for developers working on different projects or in > different contexts. Will anyone be able to give this a talk in September? It would be really great for wxHaskell. If one of us is available to go (for example, will be at ICFP), we can help you prepare... Jeremy, perhaps? Anyone else? Mads? -- Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow> PGP Key ID: 08AC04F9 |
|
From: Eric Y. K. <eri...@gm...> - 2008-05-29 10:50:26
|
Pushed! Sorry for the delay. I was away. Maybe we should consider a transition to code.haskell.org so that we can spread the push rights. -- Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow> PGP Key ID: 08AC04F9 |
|
From: shelarcy <she...@gm...> - 2008-05-27 00:40:48
|
Hi Mads, On Tue, 27 May 2008 04:00:31 +0900, Mads Lindstrøm <mad...@ya...> wrote: > Have you actually observed that this is problem in the specific case > with processExecAsyncTimed? > > I am asking because if you have observed it at windows, then what I > thought was a Linux-only issue is also a Windows issue. After all, the > putStrLn only happens in case of an error (negative unicode). I can't reproduce that error in my environment with command (I don't use Graphics.UI.WXCore.Process usually. So, I don't know which command reproduces error). But I think this is not only Linux problem but also all platform that use before wxWidgets 2.8.x. Because wxWidgets Change Log writes following: - wxInputStream::GetC() now returns an int in the range 0 - 255 on success instead of a char the range -128 - 127. You can see this message in wxWidgets-*.*.*/docs/changes.txt. Or below URL http://slackblogs.blogspot.com/2006/12/wxwidgets-280.html Best Regards, > shelarcy wrote: >> Hi, >> I'm sorry about my reply is late. >> >> On Thu, 15 May 2008 17:15:54 +0900, Eric Y. Kow <eri...@gm...> wrote: >> > Shelarcy: any ideas? >> >> I found Mad's previous patch left an problem for Windows platform. >> >> http://article.gmane.org/gmane.comp.lang.haskell.wxhaskell.general/423 >> >> Windows' stdout, stdin and stdout requires console. But we can build >> wxHaskell GUI program without console by -optl-mwindows option. So, >> withCharResult's "hPutStrLn stderr" causes problem. I fixed this problem >> by using Debug.Trace.putTraceMsg instedad of hPutStrLn stderr. -- shelarcy <shelarcy hotmail.co.jp> http://page.freett.com/shelarcy/ |
|
From: Mads L. <mad...@ya...> - 2008-05-26 19:04:59
|
Hi, shelarcy wrote: > Hi, > I'm sorry about my reply is late. > > On Thu, 15 May 2008 17:15:54 +0900, Eric Y. Kow <eri...@gm...> wrote: > > Shelarcy: any ideas? > > I found Mad's previous patch left an problem for Windows platform. > > http://article.gmane.org/gmane.comp.lang.haskell.wxhaskell.general/423 > > Windows' stdout, stdin and stdout requires console. But we can build > wxHaskell GUI program without console by -optl-mwindows option. So, > withCharResult's "hPutStrLn stderr" causes problem. I fixed this problem > by using Debug.Trace.putTraceMsg instedad of hPutStrLn stderr. Have you actually observed that this is problem in the specific case with processExecAsyncTimed? I am asking because if you have observed it at windows, then what I thought was a Linux-only issue is also a Windows issue. After all, the putStrLn only happens in case of an error (negative unicode). Just to be clear, I am not arguing against the patch, I just want to know if the processExecAsyncTimed problem also occurs on windows. Greetings, Mads |
|
From: shelarcy <she...@gm...> - 2008-05-26 08:55:14
|
Hi, I'm sorry about my reply is late. On Thu, 15 May 2008 17:15:54 +0900, Eric Y. Kow <eri...@gm...> wrote: > Shelarcy: any ideas? I found Mad's previous patch left an problem for Windows platform. http://article.gmane.org/gmane.comp.lang.haskell.wxhaskell.general/423 Windows' stdout, stdin and stdout requires console. But we can build wxHaskell GUI program without console by -optl-mwindows option. So, withCharResult's "hPutStrLn stderr" causes problem. I fixed this problem by using Debug.Trace.putTraceMsg instedad of hPutStrLn stderr. http://www.haskell.org/ghc/docs/6.8.2/html/users_guide/terminal-interaction.html http://www.haskell.org/ghc/docs/6.8.2/html/libraries/base/Debug-Trace.html#v%3AputTraceMsg I will send patch soonly (with a few extention). But I don't know this problem is a Brend's problem. Best Regards, > On Thu, May 08, 2008 at 13:10:12 +0200, Bernd Holzmüller wrote: >> I use wxHaskell 0.10.3 on Windows (XP) for writing a GUI to manage and >> execute test cases. Sadly, when using processExecAsyncTimed, the whole >> application sometimes hangs because process termination seems not to be >> recognized reliably. This happens about every 4th or so try. I used >> processExecAsync before which works but is deprecated and slow (because >> we have a byte-wise stdout stream). Any idea whether this is a wxWidgets >> problem or is wxHaskell specific? -- shelarcy <shelarcy hotmail.co.jp> http://page.freett.com/shelarcy/ |
15 messages has been excluded from this view by a project administrator.
