wxcore 0.11.1.0 → 0.11.1.1
raw patch · 7 files changed
+43/−16 lines, 7 files
Files
- configure +1/−1
- wx/wx.cabal +1/−1
- wxc/src/eljdc.cpp +8/−8
- wxc/wxc-2.8.dsp +4/−4
- wxcore.cabal +1/−1
- wxdirect/wxdirect.cabal +1/−1
- wxdirect/wxdirect.cabal.1~ +27/−0
configure view
@@ -12,7 +12,7 @@ #-------------------------------------------------------------------- # Versioning #---------------------------------------------------------------------version="0.11.1.0"+version="0.11.1.1" release="0" #--------------------------------------------------------------------
wx/wx.cabal view
@@ -1,5 +1,5 @@ Name: wx-Version: 0.11.1.0+Version: 0.11.1.1 License: LGPL License-file: license.txt Homepage: http://haskell.org/haskellwiki/WxHaskell
wxc/src/eljdc.cpp view
@@ -626,37 +626,37 @@ #endif } -EWXWEXPORT(bool,wxMetafile_SetClipboard)(wxMetafile* self,int width,int height) +EWXWEXPORT(bool,wxMetafile_SetClipboard)(void* self,int width,int height) { #if defined(__WXGTK__) return false; #else - return self->SetClipboard(width, height); + return ((wxMetafile*)self)->SetClipboard(width, height); #endif } -EWXWEXPORT(bool,wxMetafile_Play)(wxMetafile* self,wxDC* _dc) +EWXWEXPORT(bool,wxMetafile_Play)(void* self,wxDC* _dc) { #if defined(__WXGTK__) return false; #else - return self->Play(_dc); + return ((wxMetafile*)self)->Play(_dc); #endif } -EWXWEXPORT(bool,wxMetafile_IsOk)(wxMetafile* self) +EWXWEXPORT(bool,wxMetafile_IsOk)(void* self) { #if defined(__WXGTK__) return false; #else - return self->IsOk(); + return ((wxMetafile*)self)->IsOk(); #endif } -EWXWEXPORT(void,wxMetafile_Delete)(wxMetafile* self) +EWXWEXPORT(void,wxMetafile_Delete)(void* self) { #if !defined(__WXGTK__) - delete self; + delete (wxMetafileDC*)self; #endif }
wxc/wxc-2.8.dsp view
@@ -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.11.1.0.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.11.1.1.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.11.1.0.lib move libwxc-msw2.8.9-0.11.1.0.a ..\dist\wxc move wxc-msw2.8.9-0.11.1.0.def ..\dist\wxc echo Done. +PostBuild_Cmds=echo Generating mingw32 import library ... ..\bin\reimp ..\dist\wxc\wxc-msw2.8.9-0.11.1.1.lib move libwxc-msw2.8.9-0.11.1.1.a ..\dist\wxc move wxc-msw2.8.9-0.11.1.1.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.11.1.0.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.11.1.1.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.11.1.0.lib move libwxcd-msw2.8.9-0.11.1.0.a ..\dist\wxc move wxcd-msw2.8.9-0.11.1.0.def ..\dist\wxc echo Done. +PostBuild_Cmds=echo Generating mingw32 import library ... ..\bin\reimp ..\dist\wxc\wxcd-msw2.8.9-0.11.1.1.lib move libwxcd-msw2.8.9-0.11.1.1.a ..\dist\wxc move wxcd-msw2.8.9-0.11.1.1.def ..\dist\wxc echo Done. # End Special Build Tool !ENDIF
wxcore.cabal view
@@ -1,5 +1,5 @@ Name: wxcore-Version: 0.11.1.0+Version: 0.11.1.1 License: LGPL License-file: license.txt Homepage: http://haskell.org/haskellwiki/WxHaskell
wxdirect/wxdirect.cabal view
@@ -1,5 +1,5 @@ Name: wxdirect-Version: 0.11.1.0+Version: 0.11.1.1 License: BSD3 Homepage: http://haskell.org/haskellwiki/WxHaskell Author: Daan Leijen
+ wxdirect/wxdirect.cabal.1~ view
@@ -0,0 +1,27 @@+Name: wxdirect+Version: 0.11.1.0+License: BSD3+Homepage: http://haskell.org/haskellwiki/WxHaskell+Author: Daan Leijen+Build-Type: Simple+Description: wxHaskell is a portable and native GUI library for Haskell. It is built on top of wxWidgets - a comprehensive C++ library that is portable across all major GUI platforms; including GTK, Windows, X11, and MacOS X. This version works with wxWidgets 2.8 only.+Maintainer: wxhaskell-devel@lists.sourceforge.net+Cabal-Version: >= 1.2+Category: GUI, User interfaces+Synopsis: helper tool for building wxHaskell++Flag splitBase+ Description: Choose the new smaller, split-up base package.++Executable wxdirect+ if flag(splitBase)+ build-depends: base >= 3 && < 5,+ containers >= 0.1 && < 0.3,+ time >= 1.0 && < 1.2,+ parsec >= 2.1.0 && < 4+ else+ build-depends: base < 3,+ time >= 1.0.0 && < 1.1,+ parsec >= 2.1 && < 4+ Main-is: Main.hs+ Hs-Source-Dirs: src