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: 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: 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/ |