Menu
▾
▴
[wxhaskell-devel] darcs patch: Fix: previous Refactor to use C++ bool d... (and 1 more)
|
From: shelarcy <she...@gm...> - 2009-03-05 14:04:43
|
DarcsURL: http://code.haskell.org/wxhaskell MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=_" --=_ Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Thu Mar 5 21:53:06 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2009 shelarcy <shelarc= y...@gm...> * Fix: previous Refactor to use C++ bool directly patch causes build erro= r on Linux. Thu Mar 5 23:02:42 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2009 shelarcy <shelarc= y...@gm...> * Bump version number to 0.11.1.2. --=_ Content-Type: text/x-darcs-patch; name="fix_-previous-refactor-to-use-c__-bool-directly-patch-causes-build-error-on-linux_.dpatch" Content-Transfer-Encoding: quoted-printable Content-Description: A darcs patch for your repository! New patches: [Fix: previous Refactor to use C++ bool directly patch causes build error o= n Linux. shelarcy <she...@gm...>**20090305125306 Ignore-this: 7059932f64f20392ceee48d255d31045 ] { hunk ./wxc/src/eljdc.cpp 629 #endif=0D }=0D =0D -EWXWEXPORT(bool,wxMetafile_SetClipboard)(wxMetafile* self,int width,int he= ight)=0D +EWXWEXPORT(bool,wxMetafile_SetClipboard)(void* self,int width,int height)= =0D {=0D #if defined(__WXGTK__)=0D return false;=0D hunk ./wxc/src/eljdc.cpp 634 #else=0D - return self->SetClipboard(width, height);=0D + return ((wxMetafile*)self)->SetClipboard(width, height);=0D #endif=0D }=0D =0D hunk ./wxc/src/eljdc.cpp 638 -EWXWEXPORT(bool,wxMetafile_Play)(wxMetafile* self,wxDC* _dc)=0D +EWXWEXPORT(bool,wxMetafile_Play)(void* self,wxDC* _dc)=0D {=0D #if defined(__WXGTK__)=0D return false;=0D hunk ./wxc/src/eljdc.cpp 643 #else=0D - return self->Play(_dc);=0D + return ((wxMetafile*)self)->Play(_dc);=0D #endif=0D }=0D =0D hunk ./wxc/src/eljdc.cpp 647 -EWXWEXPORT(bool,wxMetafile_IsOk)(wxMetafile* self)=0D +EWXWEXPORT(bool,wxMetafile_IsOk)(void* self)=0D {=0D #if defined(__WXGTK__)=0D return false;=0D hunk ./wxc/src/eljdc.cpp 652 #else=0D - return self->IsOk();=0D + return ((wxMetafile*)self)->IsOk();=0D #endif=0D }=0D =0D hunk ./wxc/src/eljdc.cpp 656 -EWXWEXPORT(void,wxMetafile_Delete)(wxMetafile* self)=0D +EWXWEXPORT(void,wxMetafile_Delete)(void* self)=0D {=0D #if !defined(__WXGTK__)=0D hunk ./wxc/src/eljdc.cpp 659 - delete self;=0D + delete (wxMetafile*)self;=0D #endif=0D }=0D =0D } [Bump version number to 0.11.1.2. shelarcy <she...@gm...>**20090305140242 Ignore-this: f13691126a6cf23247b66e55488065dd ] { hunk ./configure 15 #-------------------------------------------------------------------- # Versioning #-------------------------------------------------------------------- -version=3D"0.11.1.0" +version=3D"0.11.1.2" release=3D"0" = #-------------------------------------------------------------------- hunk ./wx/wx.cabal 2 Name: wx -Version: 0.11.1.0 +Version: 0.11.1.2 License: LGPL License-file: license.txt Homepage: http://haskell.org/haskellwiki/WxHaskell hunk ./wxc/wxc-2.8.dsp 57 LINK32=3Dlink.exe=0D # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.= lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odb= ccp32.lib /nologo /dll /machine:I386=0D =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= .9-0.11.1.0.dll" /libpath:"..\..\wxWidgets-2.8.9\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= .9-0.11.1.2.dll" /libpath:"..\..\wxWidgets-2.8.9\lib\vc_lib"=0D # Begin Special Build Tool=0D SOURCE=3D"$(InputPath)"=0D hunk ./wxc/wxc-2.8.dsp 60 -PostBuild_Cmds=3Decho Generating mingw32 import library ... ..\bin\reimp .= .\dist\wxc\wxc-msw2.8.9-0.11.1.0.lib move libwxc-msw2.8.9-0.11.1.0.a ..\dis= t\wxc move wxc-msw2.8.9-0.11.1.0.def ..\dist\wxc echo Done.=0D +PostBuild_Cmds=3Decho Generating mingw32 import library ... ..\bin\reimp .= .\dist\wxc\wxc-msw2.8.9-0.11.1.2.lib move libwxc-msw2.8.9-0.11.1.2.a ..\dis= t\wxc move wxc-msw2.8.9-0.11.1.2.def ..\dist\wxc echo Done.=0D # End Special Build Tool=0D =0D !ELSEIF "$(CFG)" =3D=3D "wxc - Win32 Debug"=0D hunk ./wxc/wxc-2.8.dsp 88 LINK32=3Dlink.exe=0D # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.= lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odb= ccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept=0D =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.9-0.11.1.0.dll" /pdbtype:sept /libpath:"..\..\= wxWidgets-2.8.9\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.9-0.11.1.2.dll" /pdbtype:sept /libpath:"..\..\= wxWidgets-2.8.9\lib\vc_lib"=0D # Begin Special Build Tool=0D SOURCE=3D"$(InputPath)"=0D hunk ./wxc/wxc-2.8.dsp 91 -PostBuild_Cmds=3Decho Generating mingw32 import library ... ..\bin\reimp .= .\dist\wxc\wxcd-msw2.8.9-0.11.1.0.lib move libwxcd-msw2.8.9-0.11.1.0.a ..\d= ist\wxc move wxcd-msw2.8.9-0.11.1.0.def ..\dist\wxc echo Done.=0D +PostBuild_Cmds=3Decho Generating mingw32 import library ... ..\bin\reimp .= .\dist\wxc\wxcd-msw2.8.9-0.11.1.2.lib move libwxcd-msw2.8.9-0.11.1.2.a ..\d= ist\wxc move wxcd-msw2.8.9-0.11.1.2.def ..\dist\wxc echo Done.=0D # End Special Build Tool=0D =0D !ENDIF =0D hunk ./wxcore.cabal 2 Name: wxcore -Version: 0.11.1.0 +Version: 0.11.1.2 License: LGPL License-file: license.txt Homepage: http://haskell.org/haskellwiki/WxHaskell hunk ./wxdirect/wxdirect.cabal 2 Name: wxdirect -Version: 0.11.1.0 +Version: 0.11.1.2 License: BSD3 Homepage: http://haskell.org/haskellwiki/WxHaskell Author: Daan Leijen } Context: [Fix: wxHaskell documents refer to old sourceforge's web page. shelarcy <she...@gm...>**20090301075411 Ignore-this: e2228b995afcf476bcd3e02195519ba8 ] = [Add to generate Readme.txt file for source distribution. shelarcy <she...@gm...>**20090301075126 Ignore-this: fc749fdadbd9e49b38682acbab85e6c ] = [Refactor to use C++ bool directoly, instead of casting to int type and con= verting to bool type. shelarcy <she...@gm...>**20090228023601 = We cast int type where wxWidgets' method returns bool type, and we convert int to bool where wxWidgets method's argument is bool. = But some new wxc code uses bool type directly. This causes problems. = So, we changed to use bool type directly everwhere in wxc code. We hope this change avoid to occur problem and fixes a few bugs. ] = [Change version number from 0.11.1 to 0.11.1.0. shelarcy <she...@gm...>**20090227150124 Ignore-this: c6772c8eac4bd552702e469b76a3101a ] = [Fix: managed.cpp causes problem on Linux (Debian and Ubuntu) platform. shelarcy <she...@gm...>**20090115080604 = MERGED: manage to run managed.cpp on ubuntu r21 | snmsts | 2009-01-10 05:49:49 +0900 (Sat, 10 1 2009) from Subversion repository at http://snmsts.dreamhosters.com/wxc = This change probably fixes #1924535. See http://snmsts.dreamhosters.com/diary/index.cgi?routine=3Done&name=3D20= 09-01-08-1756 (Note: This page isn't English page. This page is written in Japanese.) = ] = [Add int / C++ bool conversion function in wxc. shelarcy <she...@gm...>**20090113135754 Ignore-this: 83a08a3687437074e79f8c8da12c1626 ] = [Remove unused eljtreectrl.cpp. shelarcy <she...@gm...>**20090113104755 Ignore-this: a64b576e93152ebe3474c368fcfc03e9 ] = [Refactor to use wxString instead of calling WString (wxChar) directly. shelarcy <she...@gm...>**20090113094641 = This change will be easy to add encoding mode. wxWidget 2.9 and 3.0 will support to build UTF-8 mode. If we use wxChar directly, we must change many part to support this build mode. = http://www.wxwidgets.org/develop/roadmap.htm = And we think we get some advantages from this change. utf8-string package only support UTF-8, so we want to use full unicode support we must write UTF-8 <-> UTF-16 <-> UTF-32 conversion layer, or we must support new UTF-8 build mode. = (C++0x and C1x will support new string charactor set types, char16_t and char32_t. Haskell and wxWidgets will support these types if compiler (e.g. gcc, VC) support theirs. If we use abstract layer to use string, we can extend wxHaskell support soonly when compiler and library change.) = ] = [Use wxString_Length function instead of getting wxString twice. shelarcy <she...@gm...>**20090108142643 Ignore-this: 2160aa7a6c9e4b5ed07ea0f17be20332 ] = [Fix typos in previous color's alpha channel support. shelarcy <she...@gm...>**20090107021037 Ignore-this: 710e1ec9472142465ed050c97e49892d ] = [Add experimental alpha channel support to Color type. shelarcy <she...@gm...>**20090106182310 Ignore-this: 6c35ed5d80bed81134a6110cd9cfb60a ] = [Add Word support. shelarcy <she...@gm...>**20090106171139 Ignore-this: 81376472899f15f9724f724b656c251d ] = [Change Color's primitive type from CChar to Word8. shelarcy <she...@gm...>**20090106151818 Ignore-this: a63da969a83ee42f141db3797b824fc8 ] = [Add Word8 and Word32 support. shelarcy <she...@gm...>**20090106141358 Ignore-this: 704189efa0ea7576c4752df6d9a39faf ] = [Bump version number to 0.11.1 shelarcy <she...@gm...>**20090106132911 Ignore-this: d945970996e6812d312a0592c2ff2b6e ] = [Remove unused wxWidgets 2.4 and 2.6's Visual Studio project files. shelarcy <she...@gm...>**20090105012854 Ignore-this: 20cc431e49694e048d1d676170200ed6 ] = [TAG 0.11.0 shelarcy <she...@gm...>**20090102223052] = Patch bundle hash: e51ffa4a4248cddb3b16a4a3ebbb345c665c4cf2 --=_-- . |
