diff --git a/changes.txt b/changes.txt --- a/changes.txt +++ b/changes.txt @@ -8,7 +8,7 @@ See license.txt for details. ---------------------------------------------------------------------- -Version 0.10.6 (0.11.0) +Version 0.11.0 -------------- Non backward compatible changes: - Added "--global" argument to configure script diff --git a/configure b/configure --- a/configure +++ b/configure @@ -12,7 +12,7 @@ #-------------------------------------------------------------------- # Versioning #-------------------------------------------------------------------- -version="0.10.6" +version="0.10.7" release="0" #-------------------------------------------------------------------- diff --git a/wx/wx.cabal b/wx/wx.cabal --- a/wx/wx.cabal +++ b/wx/wx.cabal @@ -1,7 +1,8 @@ Name: wx -Version: 0.10.6 +Version: 0.11.0 License: LGPL License-file: license.txt +Homepage: http://haskell.org/haskellwiki/WxHaskell Author: Daan Leijen Build-Type: Simple Category: GUI, User interfaces diff --git a/wxc/src/eljwindow.cpp b/wxc/src/eljwindow.cpp --- a/wxc/src/eljwindow.cpp +++ b/wxc/src/eljwindow.cpp @@ -235,7 +235,8 @@ if (_res && (unsigned int)_cnt == ((wxWindow*)_obj)->GetChildren().GetCount()) { unsigned int i = 0; - wxWindowListNode* node = ((wxWindow*)_obj)->GetChildren().GetFirst(); + wxWindowList::compatibility_iterator node = + ((wxWindow*)_obj)->GetChildren().GetFirst(); while (node) { 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.6.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.7.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.6.lib move libwxc-msw2.8.9-0.10.6.a ..\dist\wxc move wxc-msw2.8.9-0.10.6.def ..\dist\wxc echo Done. +PostBuild_Cmds=echo Generating mingw32 import library ... ..\bin\reimp ..\dist\wxc\wxc-msw2.8.9-0.10.7.lib move libwxc-msw2.8.9-0.10.7.a ..\dist\wxc move wxc-msw2.8.9-0.10.7.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.6.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.7.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.6.lib move libwxcd-msw2.8.9-0.10.6.a ..\dist\wxc move wxcd-msw2.8.9-0.10.6.def ..\dist\wxc echo Done. +PostBuild_Cmds=echo Generating mingw32 import library ... ..\bin\reimp ..\dist\wxc\wxcd-msw2.8.9-0.10.7.lib move libwxcd-msw2.8.9-0.10.7.a ..\dist\wxc move wxcd-msw2.8.9-0.10.7.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.6.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.7.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.6.lib move libwxc-msw2.8.9-0.10.6.a ..\dist\wxc move wxc-msw2.8.9-0.10.6.def ..\dist\wxc echo Done. +PostBuild_Cmds=echo Generating mingw32 import library ... ..\bin\reimp ..\dist\wxc\wxc-msw2.8.9-0.10.7.lib move libwxc-msw2.8.9-0.10.7.a ..\dist\wxc move wxc-msw2.8.9-0.10.7.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.6.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.7.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.6.lib move libwxcd-msw2.8.9-0.10.6.a ..\dist\wxc move wxcd-msw2.8.9-0.10.6.def ..\dist\wxc echo Done. +PostBuild_Cmds=echo Generating mingw32 import library ... ..\bin\reimp ..\dist\wxc\wxcd-msw2.8.9-0.10.7.lib move libwxcd-msw2.8.9-0.10.7.a ..\dist\wxc move wxcd-msw2.8.9-0.10.7.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.6.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.7.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.6.lib move libwxc-msw2.8.9-0.10.6.a ..\dist\wxc move wxc-msw2.8.9-0.10.6.def ..\dist\wxc echo Done. +PostBuild_Cmds=echo Generating mingw32 import library ... ..\bin\reimp ..\dist\wxc\wxc-msw2.8.9-0.10.7.lib move libwxc-msw2.8.9-0.10.7.a ..\dist\wxc move wxc-msw2.8.9-0.10.7.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.6.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.7.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.6.lib move libwxcd-msw2.8.9-0.10.6.a ..\dist\wxc move wxcd-msw2.8.9-0.10.6.def ..\dist\wxc echo Done. +PostBuild_Cmds=echo Generating mingw32 import library ... ..\bin\reimp ..\dist\wxc\wxcd-msw2.8.9-0.10.7.lib move libwxcd-msw2.8.9-0.10.7.a ..\dist\wxc move wxcd-msw2.8.9-0.10.7.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,7 +1,8 @@ Name: wxcore -Version: 0.10.6 +Version: 0.10.7 License: LGPL License-file: license.txt +Homepage: http://haskell.org/haskellwiki/WxHaskell Author: Daan Leijen Build-Type: Make 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. diff --git a/wxdirect/wxdirect.cabal b/wxdirect/wxdirect.cabal --- a/wxdirect/wxdirect.cabal +++ b/wxdirect/wxdirect.cabal @@ -1,6 +1,7 @@ Name: wxdirect -Version: 0.10.6 +Version: 0.11.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. diff --git a/wxdirect/wxdirect.cabal.1~ b/wxdirect/wxdirect.cabal.1~ new file mode 100644 --- /dev/null +++ b/wxdirect/wxdirect.cabal.1~ @@ -0,0 +1,26 @@ +Name: wxdirect +Version: 0.10.6 +License: BSD3 +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 diff --git a/wxdirect/wxdirect.cabal.2~ b/wxdirect/wxdirect.cabal.2~ new file mode 100644 --- /dev/null +++ b/wxdirect/wxdirect.cabal.2~ @@ -0,0 +1,27 @@ +Name: wxdirect +Version: 0.10.6 +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