diff --git a/configure b/configure --- a/configure +++ b/configure @@ -12,7 +12,7 @@ #-------------------------------------------------------------------- # Versioning #-------------------------------------------------------------------- -version="0.10.13" +version="0.10.13.0" release="0" #-------------------------------------------------------------------- diff --git a/wxc/src/eljartprov.cpp b/wxc/src/eljartprov.cpp --- a/wxc/src/eljartprov.cpp +++ b/wxc/src/eljartprov.cpp @@ -48,28 +48,28 @@ EWXWEXPORT(void,PushProvider)(void* provider) { -#if WXWIN_COMPATIBILITY_2_6 - wxArtProvider::PushProvider((wxArtProvider*)provider); -#else +#if wxCHECK_VERSION (2,8,0) wxArtProvider::Push((wxArtProvider*)provider); +#else + wxArtProvider::PushProvider((wxArtProvider*)provider); #endif } EWXWEXPORT(int,PopProvider)() { -#if WXWIN_COMPATIBILITY_2_6 - return (int)wxArtProvider::PopProvider(); -#else +#if wxCHECK_VERSION (2,8,0) return wxArtProvider::Pop(); +#else + return (int)wxArtProvider::PopProvider(); #endif } EWXWEXPORT(int,RemoveProvider)(void* provider) { -#if WXWIN_COMPATIBILITY_2_6 - return (int)wxArtProvider::RemoveProvider((wxArtProvider*)provider); -#else +#if wxCHECK_VERSION (2,8,0) return wxArtProvider::Remove((wxArtProvider*)provider); +#else + return (int)wxArtProvider::RemoveProvider((wxArtProvider*)provider); #endif } diff --git a/wxc/src/eljartprov.cpp.1~ b/wxc/src/eljartprov.cpp.1~ new file mode 100644 --- /dev/null +++ b/wxc/src/eljartprov.cpp.1~ @@ -0,0 +1,77 @@ +#include "wrapper.h" +#if wxVERSION_NUMBER >= 2400 +#include "wx/artprov.h" + +extern "C" +{ +typedef void* _cdecl (*TCreateBmp)(void* _obj, void* id, void* clt, int w, int h); +} + + +class ELJArtProv: public wxArtProvider +{ + private: + void* EiffelObject; + TCreateBmp cb; + protected: + virtual wxBitmap CreateBitmap(const wxArtID& id, const wxArtClient& client, const wxSize& size) + { + if (EiffelObject) + { + void* res = cb (EiffelObject, (void*)id.c_str(), (void*)client.c_str(), size.GetWidth(), size.GetHeight()); + + if (res) + return (*((wxBitmap*)res)); + else + return wxNullBitmap; + } + return wxNullBitmap; + } + public: + ELJArtProv (void* obj, void* clb){EiffelObject = obj; cb = (TCreateBmp)clb;}; + void Release(){EiffelObject = NULL; cb = NULL;}; +}; + +extern "C" +{ + +EWXWEXPORT(void*,ELJArtProv_Create)(void* _obj, void* _clb) +{ + return (void*)new ELJArtProv(_obj, _clb); +} + +EWXWEXPORT(void,ELJArtProv_Release)(void* _obj) +{ + ((ELJArtProv*)_obj)->Release(); + delete (ELJArtProv*)_obj; +} + +EWXWEXPORT(void,PushProvider)(void* provider) +{ +#if WXWIN_COMPATIBILITY_2_6 + wxArtProvider::PushProvider((wxArtProvider*)provider); +#else + wxArtProvider::Push((wxArtProvider*)provider); +#endif +} + +EWXWEXPORT(int,PopProvider)() +{ +#if WXWIN_COMPATIBILITY_2_6 + return (int)wxArtProvider::PopProvider(); +#else + return wxArtProvider::Pop(); +#endif +} + +EWXWEXPORT(int,RemoveProvider)(void* provider) +{ +#if WXWIN_COMPATIBILITY_2_6 + return (int)wxArtProvider::RemoveProvider((wxArtProvider*)provider); +#else + return wxArtProvider::Remove((wxArtProvider*)provider); +#endif +} + +} +#endif diff --git a/wxc/wxc-2.4.dsp b/wxc/wxc-2.4.dsp --- a/wxc/wxc-2.4.dsp +++ b/wxc/wxc-2.4.dsp @@ -53,10 +53,10 @@ # ADD BSC32 /nologo LINK32=link.exe # 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 odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 zlib.lib regex.lib png.lib jpeg.lib tiff.lib wxmswu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.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 /nologo /dll /machine:I386 /nodefaultlib:"LIBCMT" /out:"..\dist\wxc\wxc-msw2.8.9-0.10.13.dll" /libpath:"..\dist\wxc" /libpath:"..\..\wxWindows-2.4.2\lib" +# ADD LINK32 zlib.lib regex.lib png.lib jpeg.lib tiff.lib wxmswu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.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 /nologo /dll /machine:I386 /nodefaultlib:"LIBCMT" /out:"..\dist\wxc\wxc-msw2.8.9-0.10.13.0.dll" /libpath:"..\dist\wxc" /libpath:"..\..\wxWindows-2.4.2\lib" # Begin Special Build Tool SOURCE="$(InputPath)" -PostBuild_Cmds=echo Generating mingw32 import library ... ..\bin\reimp ..\dist\wxc\wxc-msw2.8.9-0.10.13.lib move libwxc-msw2.8.9-0.10.13.a ..\dist\wxc move wxc-msw2.8.9-0.10.13.def ..\dist\wxc echo Done. +PostBuild_Cmds=echo Generating mingw32 import library ... ..\bin\reimp ..\dist\wxc\wxc-msw2.8.9-0.10.13.0.lib move libwxc-msw2.8.9-0.10.13.0.a ..\dist\wxc move wxc-msw2.8.9-0.10.13.0.def ..\dist\wxc echo Done. # End Special Build Tool !ELSEIF "$(CFG)" == "wxc - Win32 Debug" @@ -83,10 +83,10 @@ # ADD BSC32 /nologo LINK32=link.exe # 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 odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 zlibd.lib regexd.lib pngd.lib jpegd.lib tiffd.lib wxmswud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.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 /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBCMTD" /out:"..\dist\wxc\wxcd-msw2.8.9-0.10.13.dll" /pdbtype:sept /libpath:"..\dist\wxc" /libpath:"..\..\wxWindows-2.4.2\lib" +# ADD LINK32 zlibd.lib regexd.lib pngd.lib jpegd.lib tiffd.lib wxmswud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.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 /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBCMTD" /out:"..\dist\wxc\wxcd-msw2.8.9-0.10.13.0.dll" /pdbtype:sept /libpath:"..\dist\wxc" /libpath:"..\..\wxWindows-2.4.2\lib" # Begin Special Build Tool SOURCE="$(InputPath)" -PostBuild_Cmds=echo Generating mingw32 import library ... ..\bin\reimp ..\dist\wxc\wxcd-msw2.8.9-0.10.13.lib move libwxcd-msw2.8.9-0.10.13.a ..\dist\wxc move wxcd-msw2.8.9-0.10.13.def ..\dist\wxc echo Done. +PostBuild_Cmds=echo Generating mingw32 import library ... ..\bin\reimp ..\dist\wxc\wxcd-msw2.8.9-0.10.13.0.lib move libwxcd-msw2.8.9-0.10.13.0.a ..\dist\wxc move wxcd-msw2.8.9-0.10.13.0.def ..\dist\wxc echo Done. # End Special Build Tool !ENDIF diff --git a/wxc/wxc-2.6.dsp b/wxc/wxc-2.6.dsp --- a/wxc/wxc-2.6.dsp +++ b/wxc/wxc-2.6.dsp @@ -54,10 +54,10 @@ LINK32=link.exe # 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 odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 wxzlib.lib wxregexu.lib wxpng.lib wxjpeg.lib wxtiff.lib wxexpat.lib wxbase26u.lib wxbase26u_net.lib wxbase26u_odbc.lib wxbase26u_xml.lib wxmsw26u_core.lib wxmsw26u_adv.lib wxmsw26u_dbgrid.lib wxmsw26u_gl.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_stc.lib wxmsw26u_svg.lib wxmsw26u_xrc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.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 /nologo /dll /machine:I386 /nodefaultlib:"LIBCMT" /out:"..\dist\wxc\wxc-msw2.8.9-0.10.13.dll" /libpath:"..\..\wxWidgets-2.6.4\lib\vc_lib" +# ADD LINK32 wxzlib.lib wxregexu.lib wxpng.lib wxjpeg.lib wxtiff.lib wxexpat.lib wxbase26u.lib wxbase26u_net.lib wxbase26u_odbc.lib wxbase26u_xml.lib wxmsw26u_core.lib wxmsw26u_adv.lib wxmsw26u_dbgrid.lib wxmsw26u_gl.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_stc.lib wxmsw26u_svg.lib wxmsw26u_xrc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.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 /nologo /dll /machine:I386 /nodefaultlib:"LIBCMT" /out:"..\dist\wxc\wxc-msw2.8.9-0.10.13.0.dll" /libpath:"..\..\wxWidgets-2.6.4\lib\vc_lib" # Begin Special Build Tool SOURCE="$(InputPath)" -PostBuild_Cmds=echo Generating mingw32 import library ... ..\bin\reimp ..\dist\wxc\wxc-msw2.8.9-0.10.13.lib move libwxc-msw2.8.9-0.10.13.a ..\dist\wxc move wxc-msw2.8.9-0.10.13.def ..\dist\wxc echo Done. +PostBuild_Cmds=echo Generating mingw32 import library ... ..\bin\reimp ..\dist\wxc\wxc-msw2.8.9-0.10.13.0.lib move libwxc-msw2.8.9-0.10.13.0.a ..\dist\wxc move wxc-msw2.8.9-0.10.13.0.def ..\dist\wxc echo Done. # End Special Build Tool !ELSEIF "$(CFG)" == "wxc - Win32 Debug" @@ -85,10 +85,10 @@ LINK32=link.exe # 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 odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 wxzlibd.lib wxregexud.lib wxpngd.lib wxjpegd.lib wxtiffd.lib wxexpatd.lib wxbase26ud.lib wxbase26ud_net.lib wxbase26ud_odbc.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxmsw26ud_adv.lib wxmsw26ud_dbgrid.lib wxmsw26ud_gl.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_stc.lib wxmsw26ud_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 odbc32.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.9-0.10.13.dll" /pdbtype:sept /libpath:"..\..\wxWidgets-2.6.4\lib\vc_lib" +# ADD LINK32 wxzlibd.lib wxregexud.lib wxpngd.lib wxjpegd.lib wxtiffd.lib wxexpatd.lib wxbase26ud.lib wxbase26ud_net.lib wxbase26ud_odbc.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxmsw26ud_adv.lib wxmsw26ud_dbgrid.lib wxmsw26ud_gl.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_stc.lib wxmsw26ud_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 odbc32.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.9-0.10.13.0.dll" /pdbtype:sept /libpath:"..\..\wxWidgets-2.6.4\lib\vc_lib" # Begin Special Build Tool SOURCE="$(InputPath)" -PostBuild_Cmds=echo Generating mingw32 import library ... ..\bin\reimp ..\dist\wxc\wxcd-msw2.8.9-0.10.13.lib move libwxcd-msw2.8.9-0.10.13.a ..\dist\wxc move wxcd-msw2.8.9-0.10.13.def ..\dist\wxc echo Done. +PostBuild_Cmds=echo Generating mingw32 import library ... ..\bin\reimp ..\dist\wxc\wxcd-msw2.8.9-0.10.13.0.lib move libwxcd-msw2.8.9-0.10.13.0.a ..\dist\wxc move wxcd-msw2.8.9-0.10.13.0.def ..\dist\wxc echo Done. # End Special Build Tool !ENDIF diff --git a/wxc/wxc-2.8.dsp b/wxc/wxc-2.8.dsp --- a/wxc/wxc-2.8.dsp +++ b/wxc/wxc-2.8.dsp @@ -54,10 +54,10 @@ LINK32=link.exe # 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 odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 wxzlib.lib wxregexu.lib wxpng.lib wxjpeg.lib wxtiff.lib wxexpat.lib wxbase28u.lib wxbase28u_net.lib wxbase28u_odbc.lib wxbase28u_xml.lib wxmsw28u_core.lib wxmsw28u_adv.lib wxmsw28u_dbgrid.lib wxmsw28u_gl.lib wxmsw28u_html.lib wxmsw28u_media.lib wxmsw28u_stc.lib wxmsw28u_svg.lib wxmsw28u_xrc.lib kernel32.lib user32.lib gdi32.lib gdiplus.lib winspool.lib comdlg32.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 /nologo /dll /machine:I386 /nodefaultlib:"LIBCMT" /out:"..\dist\wxc\wxc-msw2.8.9-0.10.13.dll" /libpath:"..\..\wxWidgets-2.8.9\lib\vc_lib" +# ADD LINK32 wxzlib.lib wxregexu.lib wxpng.lib wxjpeg.lib wxtiff.lib wxexpat.lib wxbase28u.lib wxbase28u_net.lib wxbase28u_odbc.lib wxbase28u_xml.lib wxmsw28u_core.lib wxmsw28u_adv.lib wxmsw28u_dbgrid.lib wxmsw28u_gl.lib wxmsw28u_html.lib wxmsw28u_media.lib wxmsw28u_stc.lib wxmsw28u_svg.lib wxmsw28u_xrc.lib kernel32.lib user32.lib gdi32.lib gdiplus.lib winspool.lib comdlg32.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 /nologo /dll /machine:I386 /nodefaultlib:"LIBCMT" /out:"..\dist\wxc\wxc-msw2.8.9-0.10.13.0.dll" /libpath:"..\..\wxWidgets-2.8.9\lib\vc_lib" # Begin Special Build Tool SOURCE="$(InputPath)" -PostBuild_Cmds=echo Generating mingw32 import library ... ..\bin\reimp ..\dist\wxc\wxc-msw2.8.9-0.10.13.lib move libwxc-msw2.8.9-0.10.13.a ..\dist\wxc move wxc-msw2.8.9-0.10.13.def ..\dist\wxc echo Done. +PostBuild_Cmds=echo Generating mingw32 import library ... ..\bin\reimp ..\dist\wxc\wxc-msw2.8.9-0.10.13.0.lib move libwxc-msw2.8.9-0.10.13.0.a ..\dist\wxc move wxc-msw2.8.9-0.10.13.0.def ..\dist\wxc echo Done. # End Special Build Tool !ELSEIF "$(CFG)" == "wxc - Win32 Debug" @@ -85,10 +85,10 @@ LINK32=link.exe # 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 odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 wxzlibd.lib wxregexud.lib wxpngd.lib wxjpegd.lib wxtiffd.lib wxexpatd.lib wxbase28ud.lib wxbase28ud_net.lib wxbase28ud_odbc.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxmsw28ud_adv.lib wxmsw28ud_dbgrid.lib wxmsw28ud_gl.lib wxmsw28ud_html.lib wxmsw28ud_media.lib wxmsw28ud_stc.lib wxmsw28ud_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 uuid.lib odbc32.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.9-0.10.13.dll" /pdbtype:sept /libpath:"..\..\wxWidgets-2.8.9\lib\vc_lib" +# ADD LINK32 wxzlibd.lib wxregexud.lib wxpngd.lib wxjpegd.lib wxtiffd.lib wxexpatd.lib wxbase28ud.lib wxbase28ud_net.lib wxbase28ud_odbc.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxmsw28ud_adv.lib wxmsw28ud_dbgrid.lib wxmsw28ud_gl.lib wxmsw28ud_html.lib wxmsw28ud_media.lib wxmsw28ud_stc.lib wxmsw28ud_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 uuid.lib odbc32.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.9-0.10.13.0.dll" /pdbtype:sept /libpath:"..\..\wxWidgets-2.8.9\lib\vc_lib" # Begin Special Build Tool SOURCE="$(InputPath)" -PostBuild_Cmds=echo Generating mingw32 import library ... ..\bin\reimp ..\dist\wxc\wxcd-msw2.8.9-0.10.13.lib move libwxcd-msw2.8.9-0.10.13.a ..\dist\wxc move wxcd-msw2.8.9-0.10.13.def ..\dist\wxc echo Done. +PostBuild_Cmds=echo Generating mingw32 import library ... ..\bin\reimp ..\dist\wxc\wxcd-msw2.8.9-0.10.13.0.lib move libwxcd-msw2.8.9-0.10.13.0.a ..\dist\wxc move wxcd-msw2.8.9-0.10.13.0.def ..\dist\wxc echo Done. # End Special Build Tool !ENDIF diff --git a/wxcore.cabal b/wxcore.cabal --- a/wxcore.cabal +++ b/wxcore.cabal @@ -1,5 +1,5 @@ Name: wxcore -Version: 0.10.13 +Version: 0.10.13.0 License: LGPL License-file: license.txt Homepage: http://haskell.org/haskellwiki/WxHaskell