You can subscribe to this list here.
2008 |
Jan
|
Feb
(53) |
Mar
(145) |
Apr
(22) |
May
(7) |
Jun
(14) |
Jul
(14) |
Aug
(9) |
Sep
(10) |
Oct
(48) |
Nov
(59) |
Dec
(45) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2009 |
Jan
(36) |
Feb
(5) |
Mar
(33) |
Apr
(28) |
May
(5) |
Jun
(6) |
Jul
(1) |
Aug
(7) |
Sep
(11) |
Oct
(3) |
Nov
(31) |
Dec
|
2010 |
Jan
(8) |
Feb
(3) |
Mar
|
Apr
(2) |
May
(9) |
Jun
(1) |
Jul
(2) |
Aug
|
Sep
(1) |
Oct
(1) |
Nov
|
Dec
|
2011 |
Jan
(1) |
Feb
(3) |
Mar
(4) |
Apr
(1) |
May
(2) |
Jun
(12) |
Jul
(36) |
Aug
(7) |
Sep
(40) |
Oct
(6) |
Nov
(40) |
Dec
(8) |
2012 |
Jan
(54) |
Feb
(8) |
Mar
(1) |
Apr
(16) |
May
(2) |
Jun
(12) |
Jul
(1) |
Aug
(1) |
Sep
(2) |
Oct
(2) |
Nov
|
Dec
(7) |
2013 |
Jan
(8) |
Feb
|
Mar
(13) |
Apr
(2) |
May
(13) |
Jun
(44) |
Jul
|
Aug
(13) |
Sep
(12) |
Oct
(11) |
Nov
(7) |
Dec
(6) |
2014 |
Jan
(3) |
Feb
(4) |
Mar
(9) |
Apr
(1) |
May
|
Jun
(3) |
Jul
(1) |
Aug
(1) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
2015 |
Jan
|
Feb
(2) |
Mar
|
Apr
|
May
(2) |
Jun
(3) |
Jul
|
Aug
(2) |
Sep
(5) |
Oct
(2) |
Nov
(1) |
Dec
(1) |
2017 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
2020 |
Jan
(1) |
Feb
|
Mar
|
Apr
(1) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: Kido T. <she...@co...> - 2009-03-02 03:58:30
|
Sun Mar 1 02:54:11 EST 2009 shelarcy <she...@gm...> * Fix: wxHaskell documents refer to old sourceforge's web page. Ignore-this: e2228b995afcf476bcd3e02195519ba8 M ./bin/prologue-template.txt -1 +1 M ./makefile -1 +1 View patch online: http://code.haskell.org/wxhaskell/_darcs/patches/20090301075411-c1071-b6fe17081143644c821c8e2a95e644dfa48f049e.gz |
From: Kido T. <she...@co...> - 2009-03-02 03:58:29
|
Sun Mar 1 02:51:26 EST 2009 shelarcy <she...@gm...> * Add to generate Readme.txt file for source distribution. Ignore-this: fc749fdadbd9e49b38682acbab85e6c M ./makefile +1 View patch online: http://code.haskell.org/wxhaskell/_darcs/patches/20090301075126-c1071-de5e590eb10be691ecce706f7cfcf37d095f41b2.gz |
From: shelarcy <she...@gm...> - 2009-03-01 08:03:09
|
DarcsURL: C:/home/shelarcy/wxhaskell MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=_" --=_ Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Sun Mar 1 16:51:26 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2009 shelarcy <shelarc= y...@gm...> * Add to generate Readme.txt file for source distribution. Sun Mar 1 16:54:11 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2009 shelarcy <shelarc= y...@gm...> * Fix: wxHaskell documents refer to old sourceforge's web page. --=_ Content-Type: text/x-darcs-patch; name="add-to-generate-readme_txt-file-for-source-distribution_.dpatch" Content-Transfer-Encoding: quoted-printable Content-Description: A darcs patch for your repository! New patches: [Add to generate Readme.txt file for source distribution. shelarcy <she...@gm...>**20090301075126 Ignore-this: fc749fdadbd9e49b38682acbab85e6c ] hunk ./makefile 349 srcdist: srcdist-clean dist-dirs wxc-dist wxd-dist wxcore-dist wx-dist @$(call cp-srcdist, $(WXHASKELL-SOURCES)) @$(call cp-srcdist, $(SAMPLE-SOURCES)) + @echo "See <http://haskell.org/haskellwiki/WxHaskell/Building> for instal= lation instructions." > $(SRCDIST-SRCDIR)/Readme.txt @echo zipping: $(DIST-SRC) @$(CD) $(SRCDIST-OUTDIR) && $(call zip-add-rec,$(DIST-SRC),$(WXHASKELLVER= )) @$(CD) $(SRCDIST-OUTDIR) && $(call tgz-add-rec,$(basename $(DIST-SRC)).ta= r.gz,$(WXHASKELLVER)) [Fix: wxHaskell documents refer to old sourceforge's web page. shelarcy <she...@gm...>**20090301075411 Ignore-this: e2228b995afcf476bcd3e02195519ba8 ] { hunk ./bin/prologue-template.txt 2 wxHaskell is a Haskell binding to the portable wxWidgets GUI library. -See <http://wxhaskell.sourceforge.net> for the latest information. +See <http://haskell.org/haskellwiki/WxHaskell> for the latest information. = The "Graphics.UI.WX" library is a /middle-level/ Haskell library for writi= ng graphical user interfaces. It is build on top the "Graphics.UI.WXCore" library, the = core interface hunk ./makefile 414 @$(call cp-echo,config/macosx-install.info,$(INFOFILE)) # license and readme @$(call cp-echo,license.txt,$(RESOURCEDIR)/License.txt) - @echo "See <http://wxhaskell.sourceforge.net> for more information." > $(= RESOURCEDIR)/Readme.txt + @echo "See <http://haskell.org/haskellwiki/WxHaskell> for more informatio= n." > $(RESOURCEDIR)/Readme.txt # create package chmod u+x bin/macosx-package bin/macosx-package $(BINDIST-OUTDIR)/$(WXHASKELLVER) $(INFOFILE) -d $(PAC= KAGEDIR) -r $(RESOURCEDIR) } Context: [Refactor to use C++ bool directoly, instead of casting to int type and con= verting to bool type. shelarcy <she...@gm...>**20090228023601 = We cast int type where wxWidgets' method returns bool type, and we convert int to bool where wxWidgets method's argument is bool. = But some new wxc code uses bool type directly. This causes problems. = So, we changed to use bool type directly everwhere in wxc code. We hope this change avoid to occur problem and fixes a few bugs. ] = [Change version number from 0.11.1 to 0.11.1.0. shelarcy <she...@gm...>**20090227150124 Ignore-this: c6772c8eac4bd552702e469b76a3101a ] = [Fix: managed.cpp causes problem on Linux (Debian and Ubuntu) platform. shelarcy <she...@gm...>**20090115080604 = MERGED: manage to run managed.cpp on ubuntu r21 | snmsts | 2009-01-10 05:49:49 +0900 (Sat, 10 1 2009) from Subversion repository at http://snmsts.dreamhosters.com/wxc = This change probably fixes #1924535. See http://snmsts.dreamhosters.com/diary/index.cgi?routine=3Done&name=3D20= 09-01-08-1756 (Note: This page isn't English page. This page is written in Japanese.) = ] = [Add int / C++ bool conversion function in wxc. shelarcy <she...@gm...>**20090113135754 Ignore-this: 83a08a3687437074e79f8c8da12c1626 ] = [Remove unused eljtreectrl.cpp. shelarcy <she...@gm...>**20090113104755 Ignore-this: a64b576e93152ebe3474c368fcfc03e9 ] = [Refactor to use wxString instead of calling WString (wxChar) directly. shelarcy <she...@gm...>**20090113094641 = This change will be easy to add encoding mode. wxWidget 2.9 and 3.0 will support to build UTF-8 mode. If we use wxChar directly, we must change many part to support this build mode. = http://www.wxwidgets.org/develop/roadmap.htm = And we think we get some advantages from this change. utf8-string package only support UTF-8, so we want to use full unicode support we must write UTF-8 <-> UTF-16 <-> UTF-32 conversion layer, or we must support new UTF-8 build mode. = (C++0x and C1x will support new string charactor set types, char16_t and char32_t. Haskell and wxWidgets will support these types if compiler (e.g. gcc, VC) support theirs. If we use abstract layer to use string, we can extend wxHaskell support soonly when compiler and library change.) = ] = [Use wxString_Length function instead of getting wxString twice. shelarcy <she...@gm...>**20090108142643 Ignore-this: 2160aa7a6c9e4b5ed07ea0f17be20332 ] = [Fix typos in previous color's alpha channel support. shelarcy <she...@gm...>**20090107021037 Ignore-this: 710e1ec9472142465ed050c97e49892d ] = [Add experimental alpha channel support to Color type. shelarcy <she...@gm...>**20090106182310 Ignore-this: 6c35ed5d80bed81134a6110cd9cfb60a ] = [Add Word support. shelarcy <she...@gm...>**20090106171139 Ignore-this: 81376472899f15f9724f724b656c251d ] = [Change Color's primitive type from CChar to Word8. shelarcy <she...@gm...>**20090106151818 Ignore-this: a63da969a83ee42f141db3797b824fc8 ] = [Add Word8 and Word32 support. shelarcy <she...@gm...>**20090106141358 Ignore-this: 704189efa0ea7576c4752df6d9a39faf ] = [Bump version number to 0.11.1 shelarcy <she...@gm...>**20090106132911 Ignore-this: d945970996e6812d312a0592c2ff2b6e ] = [Remove unused wxWidgets 2.4 and 2.6's Visual Studio project files. shelarcy <she...@gm...>**20090105012854 Ignore-this: 20cc431e49694e048d1d676170200ed6 ] = [TAG 0.11.0 shelarcy <she...@gm...>**20090102223052] = Patch bundle hash: c9a789ea983c0da7b02f304baf661a160d10e679 --=_-- . |
From: shelarcy <she...@gm...> - 2009-03-01 07:24:54
|
Pushed. 2009/2/28 shelarcy <she...@gm...>: > Sat Feb 28 00:01:24 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2009 shelarcy <shelarc= > y...@gm...> > * Change version number from 0.11.1 to 0.11.1.0. > > Sat Feb 28 11:36:01 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2009 shelarcy <shelarc= > y...@gm...> > * Refactor to use C++ bool directoly, instead of casting to int type and = > converting to bool type. -- shelarcy <shelarcy hotmail.co.jp> http://page.freett.com/shelarcy/ |
From: Kido T. <she...@co...> - 2009-03-01 05:34:19
|
Fri Feb 27 21:36:01 EST 2009 shelarcy <she...@gm...> * Refactor to use C++ bool directoly, instead of casting to int type and converting to bool type. We cast int type where wxWidgets' method returns bool type, and we convert int to bool where wxWidgets method's argument is bool. But some new wxc code uses bool type directly. This causes problems. So, we changed to use bool type directly everwhere in wxc code. We hope this change avoid to occur problem and fixes a few bugs. M ./wx/src/Graphics/UI/WX/Menu.hs -1 +1 M ./wx/src/Graphics/UI/WX/Types.hs -1 +1 M ./wxc/include/db.h -21 +21 M ./wxc/include/wxc.h -4 +4 M ./wxc/include/wxc_glue.h -181 +185 M ./wxc/src/db.cpp -22 +22 M ./wxc/src/eljartprov.cpp -13 +13 M ./wxc/src/eljbitmap.cpp -40 +40 M ./wxc/src/eljbrush.cpp -29 +29 M ./wxc/src/eljbutton.cpp -30 +30 M ./wxc/src/eljcalendarctrl.cpp -80 +80 M ./wxc/src/eljcaret.cpp -16 +16 M ./wxc/src/eljcheckbox.cpp -4 +9 M ./wxc/src/eljchecklistbox.cpp -6 +11 M ./wxc/src/eljchoice.cpp -19 +19 M ./wxc/src/eljclipboard.cpp -23 +23 M ./wxc/src/eljcoldata.cpp -16 +16 M ./wxc/src/eljcolour.cpp -22 +22 M ./wxc/src/eljcolourdlg.cpp -4 +4 M ./wxc/src/eljcombobox.cpp -68 +62 M ./wxc/src/eljcommand.cpp -35 +33 M ./wxc/src/eljconfigbase.cpp -82 +82 M ./wxc/src/eljcontrol.cpp -6 +6 M ./wxc/src/eljctxhelp.cpp -33 +33 M ./wxc/src/eljcursor.cpp -6 +6 M ./wxc/src/eljdataformat.cpp -17 +17 M ./wxc/src/eljdatetime.cpp -156 +156 M ./wxc/src/eljdc.cpp -222 +222 M ./wxc/src/eljdialog.cpp -14 +14 M ./wxc/src/eljdialup.cpp -35 +35 M ./wxc/src/eljdnd.cpp -85 +85 M ./wxc/src/eljevent.cpp -342 +347 M ./wxc/src/eljfont.cpp -71 +87 M ./wxc/src/eljfontdata.cpp -34 +34 M ./wxc/src/eljframe.cpp -79 +79 M ./wxc/src/eljgrid.cpp -172 +172 M ./wxc/src/eljhelpcontroller.cpp -45 +45 M ./wxc/src/eljicon.cpp -31 +31 M ./wxc/src/eljimage.cpp -93 +93 M ./wxc/src/eljimagelist.cpp -25 +25 M ./wxc/src/eljipc.cpp -40 +40 M ./wxc/src/eljjoystick.cpp -86 +86 M ./wxc/src/eljlayoutconstraints.cpp -70 +70 M ./wxc/src/eljlistbox.cpp -35 +35 M ./wxc/src/eljlistctrl.cpp -171 +171 M ./wxc/src/eljlocale.cpp -14 +14 M ./wxc/src/eljlog.cpp -53 +52 M ./wxc/src/eljmenu.cpp -127 +126 M ./wxc/src/eljmenubar.cpp -42 +42 M ./wxc/src/eljmime.cpp -36 +36 M ./wxc/src/eljnotebook.cpp -38 +38 M ./wxc/src/eljpalette.cpp -20 +20 M ./wxc/src/eljpen.cpp -44 +44 M ./wxc/src/eljprintdlg.cpp -72 +72 M ./wxc/src/eljprinting.cpp -268 +268 M ./wxc/src/eljprocess.cpp -64 +64 M ./wxc/src/eljradiobox.cpp -4 +4 M ./wxc/src/eljradiobutton.cpp -4 +4 M ./wxc/src/eljrc.cpp -64 +64 M ./wxc/src/eljregion.cpp -34 +34 M ./wxc/src/eljregioniter.cpp -22 +22 M ./wxc/src/eljsash.cpp -19 +19 M ./wxc/src/eljscrollbar.cpp -19 +19 M ./wxc/src/eljscrolledwindow.cpp -32 +32 M ./wxc/src/eljsingleinst.cpp -6 +6 M ./wxc/src/eljsizer.cpp -195 +195 M ./wxc/src/eljsplitterwindow.cpp -38 +38 M ./wxc/src/eljstaticline.cpp -6 +6 M ./wxc/src/eljtextctrl.cpp -70 +70 M ./wxc/src/eljtglbtn.cpp -8 +8 M ./wxc/src/eljthread.cpp -37 +37 M ./wxc/src/eljtimer.cpp -26 +26 M ./wxc/src/eljtoolbar.cpp -57 +57 M ./wxc/src/eljvalidator.cpp -64 +64 M ./wxc/src/eljwindow.cpp -235 +236 M ./wxc/src/eljwizard.cpp -20 +20 M ./wxc/src/extra.cpp -221 +221 M ./wxc/src/glcanvas.cpp -3 +3 M ./wxc/src/printout.cpp -8 +8 M ./wxc/src/sound.cpp -6 +6 M ./wxc/src/stc.cpp -1 +1 M ./wxc/src/treectrl.cpp -24 +24 M ./wxc/src/wrapper.cpp -18 +18 M ./wxcore/src/Graphics/UI/WXCore/Draw.hs -3 +3 M ./wxcore/src/Graphics/UI/WXCore/Events.hs -2 +2 M ./wxcore/src/Graphics/UI/WXCore/Types.hs -1 +1 M ./wxcore/src/Graphics/UI/WXCore/WxcTypes.hs -12 +6 View patch online: http://code.haskell.org/wxhaskell/_darcs/patches/20090228023601-c1071-ccb5a951bfb8313d45302dd0e43223ec7bcbef56.gz |
From: Kido T. <she...@co...> - 2009-03-01 05:34:19
|
Fri Feb 27 10:01:24 EST 2009 shelarcy <she...@gm...> * Change version number from 0.11.1 to 0.11.1.0. Ignore-this: c6772c8eac4bd552702e469b76a3101a M ./configure -1 +1 M ./wx/wx.cabal -1 +1 M ./wxc/wxc-2.8.dsp -4 +4 M ./wxcore.cabal -1 +1 M ./wxdirect/wxdirect.cabal -1 +1 View patch online: http://code.haskell.org/wxhaskell/_darcs/patches/20090227150124-c1071-0a33dad556bb0573ff9609831b6a4b9f99279ea2.gz |
From: shelarcy <she...@gm...> - 2009-02-28 03:20:32
|
DarcsURL: C:/home/shelarcy/wxhaskell MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=_" --=_ Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Sat Feb 28 00:01:24 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2009 shelarcy <shelarc= y...@gm...> * Change version number from 0.11.1 to 0.11.1.0. Sat Feb 28 11:36:01 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2009 shelarcy <shelarc= y...@gm...> * Refactor to use C++ bool directoly, instead of casting to int type and = converting to bool type. = We cast int type where wxWidgets' method returns bool type, and we convert int to bool where wxWidgets method's argument is bool. = But some new wxc code uses bool type directly. This causes problems. = So, we changed to use bool type directly everwhere in wxc code. We hope this change avoid to occur problem and fixes a few bugs. --=_ Content-Type: text/x-darcs-patch; name="change-version-number-from-0_11_1-to-0_11_1_0_.dpatch" Content-Transfer-Encoding: quoted-printable Content-Description: A darcs patch for your repository! New patches: [Change version number from 0.11.1 to 0.11.1.0. shelarcy <she...@gm...>**20090227150124 Ignore-this: c6772c8eac4bd552702e469b76a3101a ] { hunk ./configure 15 #-------------------------------------------------------------------- # Versioning #-------------------------------------------------------------------- -version=3D"0.11.1" +version=3D"0.11.1.0" release=3D"0" = #-------------------------------------------------------------------- hunk ./wx/wx.cabal 2 Name: wx -Version: 0.11.1 +Version: 0.11.1.0 License: LGPL License-file: license.txt Homepage: http://haskell.org/haskellwiki/WxHaskell hunk ./wxc/wxc-2.8.dsp 57 LINK32=3Dlink.exe=0D # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.= lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odb= ccp32.lib /nologo /dll /machine:I386=0D =0D -# ADD LINK32 wxzlib.lib wxregexu.lib wxpng.lib wxjpeg.lib wxtiff.lib wxexp= at.lib wxbase28u.lib wxbase28u_net.lib wxbase28u_odbc.lib wxbase28u_xml.lib= wxmsw28u_core.lib wxmsw28u_adv.lib wxmsw28u_dbgrid.lib wxmsw28u_gl.lib wxm= sw28u_html.lib wxmsw28u_media.lib wxmsw28u_stc.lib wxmsw28u_svg.lib wxmsw28= u_xrc.lib kernel32.lib user32.lib gdi32.lib gdiplus.lib winspool.lib comdlg= 32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib = odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /no= logo /dll /machine:I386 /nodefaultlib:"LIBCMT" /out:"..\dist\wxc\wxc-msw2.8= .9-0.11.1.dll" /libpath:"..\..\wxWidgets-2.8.9\lib\vc_lib"=0D +# ADD LINK32 wxzlib.lib wxregexu.lib wxpng.lib wxjpeg.lib wxtiff.lib wxexp= at.lib wxbase28u.lib wxbase28u_net.lib wxbase28u_odbc.lib wxbase28u_xml.lib= wxmsw28u_core.lib wxmsw28u_adv.lib wxmsw28u_dbgrid.lib wxmsw28u_gl.lib wxm= sw28u_html.lib wxmsw28u_media.lib wxmsw28u_stc.lib wxmsw28u_svg.lib wxmsw28= u_xrc.lib kernel32.lib user32.lib gdi32.lib gdiplus.lib winspool.lib comdlg= 32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib = odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /no= logo /dll /machine:I386 /nodefaultlib:"LIBCMT" /out:"..\dist\wxc\wxc-msw2.8= .9-0.11.1.0.dll" /libpath:"..\..\wxWidgets-2.8.9\lib\vc_lib"=0D # Begin Special Build Tool=0D SOURCE=3D"$(InputPath)"=0D hunk ./wxc/wxc-2.8.dsp 60 -PostBuild_Cmds=3Decho Generating mingw32 import library ... ..\bin\reimp .= .\dist\wxc\wxc-msw2.8.9-0.11.1.lib move libwxc-msw2.8.9-0.11.1.a ..\dist\wx= c move wxc-msw2.8.9-0.11.1.def ..\dist\wxc echo Done.=0D +PostBuild_Cmds=3Decho Generating mingw32 import library ... ..\bin\reimp .= .\dist\wxc\wxc-msw2.8.9-0.11.1.0.lib move libwxc-msw2.8.9-0.11.1.0.a ..\dis= t\wxc move wxc-msw2.8.9-0.11.1.0.def ..\dist\wxc echo Done.=0D # End Special Build Tool=0D =0D !ELSEIF "$(CFG)" =3D=3D "wxc - Win32 Debug"=0D hunk ./wxc/wxc-2.8.dsp 88 LINK32=3Dlink.exe=0D # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.= lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odb= ccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept=0D =0D -# ADD LINK32 wxzlibd.lib wxregexud.lib wxpngd.lib wxjpegd.lib wxtiffd.lib = wxexpatd.lib wxbase28ud.lib wxbase28ud_net.lib wxbase28ud_odbc.lib wxbase28= ud_xml.lib wxmsw28ud_core.lib wxmsw28ud_adv.lib wxmsw28ud_dbgrid.lib wxmsw2= 8ud_gl.lib wxmsw28ud_html.lib wxmsw28ud_media.lib wxmsw28ud_stc.lib wxmsw28= ud_svg.lib wxmsw28ud_xrc.lib kernel32.lib user32.lib gdi32.lib gdiplus.lib = winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib u= uid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl3= 2.lib winmm.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBCMTD" /= out:"..\dist\wxc\wxcd-msw2.8.9-0.11.1.dll" /pdbtype:sept /libpath:"..\..\wx= Widgets-2.8.9\lib\vc_lib"=0D +# ADD LINK32 wxzlibd.lib wxregexud.lib wxpngd.lib wxjpegd.lib wxtiffd.lib = wxexpatd.lib wxbase28ud.lib wxbase28ud_net.lib wxbase28ud_odbc.lib wxbase28= ud_xml.lib wxmsw28ud_core.lib wxmsw28ud_adv.lib wxmsw28ud_dbgrid.lib wxmsw2= 8ud_gl.lib wxmsw28ud_html.lib wxmsw28ud_media.lib wxmsw28ud_stc.lib wxmsw28= ud_svg.lib wxmsw28ud_xrc.lib kernel32.lib user32.lib gdi32.lib gdiplus.lib = winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib u= uid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl3= 2.lib winmm.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBCMTD" /= out:"..\dist\wxc\wxcd-msw2.8.9-0.11.1.0.dll" /pdbtype:sept /libpath:"..\..\= wxWidgets-2.8.9\lib\vc_lib"=0D # Begin Special Build Tool=0D SOURCE=3D"$(InputPath)"=0D hunk ./wxc/wxc-2.8.dsp 91 -PostBuild_Cmds=3Decho Generating mingw32 import library ... ..\bin\reimp .= .\dist\wxc\wxcd-msw2.8.9-0.11.1.lib move libwxcd-msw2.8.9-0.11.1.a ..\dist\= wxc move wxcd-msw2.8.9-0.11.1.def ..\dist\wxc echo Done.=0D +PostBuild_Cmds=3Decho Generating mingw32 import library ... ..\bin\reimp .= .\dist\wxc\wxcd-msw2.8.9-0.11.1.0.lib move libwxcd-msw2.8.9-0.11.1.0.a ..\d= ist\wxc move wxcd-msw2.8.9-0.11.1.0.def ..\dist\wxc echo Done.=0D # End Special Build Tool=0D =0D !ENDIF =0D hunk ./wxcore.cabal 2 Name: wxcore -Version: 0.11.1 +Version: 0.11.1.0 License: LGPL License-file: license.txt Homepage: http://haskell.org/haskellwiki/WxHaskell hunk ./wxdirect/wxdirect.cabal 2 Name: wxdirect -Version: 0.11.1 +Version: 0.11.1.0 License: BSD3 Homepage: http://haskell.org/haskellwiki/WxHaskell Author: Daan Leijen } [Refactor to use C++ bool directoly, instead of casting to int type and con= verting to bool type. shelarcy <she...@gm...>**20090228023601 = We cast int type where wxWidgets' method returns bool type, and we convert int to bool where wxWidgets method's argument is bool. = But some new wxc code uses bool type directly. This causes problems. = So, we changed to use bool type directly everwhere in wxc code. We hope this change avoid to occur problem and fixes a few bugs. ] { hunk ./wx/src/Graphics/UI/WX/Menu.hs 277 help =3D newAttr "help" menuItemGetHelp menuItemSetHelp = instance Checkable (MenuItem a) where - checkable =3D reflectiveAttr "checkable" menuItemIsCheckable (\m c -> me= nuItemSetCheckable m (intFromBool c)) + checkable =3D reflectiveAttr "checkable" menuItemIsCheckable (\m c -> me= nuItemSetCheckable m c) checked =3D newAttr "checked" menuItemIsChecked menuItemCheck = instance Identity (MenuItem a) where hunk ./wx/src/Graphics/UI/WX/Types.hs 37 , BitMask(..), mask, (.+.), (.-.), bits, bitsSet = -- ** Booleans - , boolFromInt, intFromBool + , toCBool, fromCBool = -- ** Misc. , Style hunk ./wxc/include/db.h 16 Global=0D --------------------------------------------------------------------------= ---*/=0D /** Are the database classes supported on this platform ? */=0D -TBoolInt wxDb_IsSupported();=0D +TBool wxDb_IsSupported();=0D int wxDb_SqlTypeToStandardSqlType( int sqlType );=0D int wxDb_StandardSqlTypeToSqlType( int sqlType );=0D void wxDb_CloseConnections();=0D hunk ./wxc/include/db.h 22 int wxDb_ConnectionsInUse();=0D TClass(wxDb) wxDb_GetConnection( TClass(wxDbConnectInf) connectInf, TBool= fwdCursorsOnly );=0D -TBoolInt wxDb_FreeConnection( TClass(wxDb) db);=0D -TBoolInt wxDb_GetDataSource( TClass(HENV) henv, void* dsn, int dsnLen, voi= d* description, int descLen, int direction );=0D +TBool wxDb_FreeConnection( TClass(wxDb) db);=0D +TBool wxDb_GetDataSource( TClass(HENV) henv, void* dsn, int dsnLen, void* = description, int descLen, int direction );=0D =0D /*------------------------------------------------------------------------= -----=0D ConnectInf=0D hunk ./wxc/include/db.h 51 TClass(wxString) wxDb_GetErrorMessage( TSelf(wxDb) db, int index);=0D /** Get the number of stored error messages. */=0D int wxDb_GetNumErrorMessages( TSelf(wxDb) db);=0D -TBoolInt wxDb_IsOpen(TSelf(wxDb) db );=0D +TBool wxDb_IsOpen(TSelf(wxDb) db );=0D void wxDb_Close(TSelf(wxDb) db);=0D hunk ./wxc/include/db.h 53 -TBoolInt wxDb_CommitTrans(TSelf(wxDb) db);=0D -TBoolInt wxDb_RollbackTrans(TSelf(wxDb) db);=0D +TBool wxDb_CommitTrans(TSelf(wxDb) db);=0D +TBool wxDb_RollbackTrans(TSelf(wxDb) db);=0D TClass(wxHENV) wxDb_GetHENV(TSelf(wxDb) db);=0D TClass(wxHDBC) wxDb_GetHDBC(TSelf(wxDb) db);=0D TClass(wxHSTMT) wxDb_GetHSTMT(TSelf(wxDb) db);=0D hunk ./wxc/include/db.h 58 -TBoolInt wxDb_GetNextError(TSelf(wxDb) db, TClass(wxHENV) henv, TClass(wxH= DBC) hdbc, TClass(wxHSTMT) hstmt);=0D -TBoolInt wxDb_ExecSql(TSelf(wxDb) db, TClass(wxString) sql);=0D -TBoolInt wxDb_GetNext(TSelf(wxDb) db);=0D -TBoolInt wxDb_GetData(TSelf(wxDb) db, int column, int ctype, void* data, i= nt dataLen, int* usedLen );=0D -TBoolInt wxDb_GetDataInt(TSelf(wxDb) db, int column, int* i, int* usedLen = );=0D -TBoolInt wxDb_GetDataDouble(TSelf(wxDb) db, int column, double* d, int* us= edLen );=0D +TBool wxDb_GetNextError(TSelf(wxDb) db, TClass(wxHENV) henv, TClass(wxHDBC= ) hdbc, TClass(wxHSTMT) hstmt);=0D +TBool wxDb_ExecSql(TSelf(wxDb) db, TClass(wxString) sql);=0D +TBool wxDb_GetNext(TSelf(wxDb) db);=0D +TBool wxDb_GetData(TSelf(wxDb) db, int column, int ctype, void* data, int = dataLen, int* usedLen );=0D +TBool wxDb_GetDataInt(TSelf(wxDb) db, int column, int* i, int* usedLen );= =0D +TBool wxDb_GetDataDouble(TSelf(wxDb) db, int column, double* d, int* usedL= en );=0D /** usage: @dbGetDataBinary db column asChars pbuffer plen@. Returns binar= y data to given buffer (that must be deallocated using 'wxcFree'). The retu= rn length is 'wxSQL_NULL_DATA' if @NULL@ data was encountered. If @asChars@= is 'True', the data is returned as characters, true binary data is than re= turned as a string of hex values (@3E002C...@).*/=0D hunk ./wxc/include/db.h 65 -TBoolInt wxDb_GetDataBinary(TSelf(wxDb) db, int column, TBool asChars, voi= d* pbuf, int* len );=0D -TBoolInt wxDb_GetDataDate(TSelf(wxDb) db, int column, int* ctime, int* use= dLen );=0D -TBoolInt wxDb_GetDataTimeStamp(TSelf(wxDb) db, int column, int* ctime, int= * fraction, int* usedLen );=0D -TBoolInt wxDb_GetDataTime(TSelf(wxDb) db, int column, int* secs, int* used= Len );=0D +TBool wxDb_GetDataBinary(TSelf(wxDb) db, int column, TBool asChars, void* = pbuf, int* len );=0D +TBool wxDb_GetDataDate(TSelf(wxDb) db, int column, int* ctime, int* usedLe= n );=0D +TBool wxDb_GetDataTimeStamp(TSelf(wxDb) db, int column, int* ctime, int* f= raction, int* usedLen );=0D +TBool wxDb_GetDataTime(TSelf(wxDb) db, int column, int* secs, int* usedLen= );=0D =0D int wxDb_Dbms(TSelf(wxDb) db);=0D TClass(wxString) wxDb_GetDatabaseName(TSelf(wxDb) db);=0D hunk ./wxc/include/db.h 75 TClass(wxString) wxDb_GetDatasourceName(TSelf(wxDb) db);=0D TClass(wxString) wxDb_GetPassword(TSelf(wxDb) db);=0D TClass(wxString) wxDb_GetUsername(TSelf(wxDb) db);=0D -TBoolInt wxDb_Grant(TSelf(wxDb) db, int privileges, TClass(wxString) table= Name, TClass(wxString) userList );=0D +TBool wxDb_Grant(TSelf(wxDb) db, int privileges, TClass(wxString) tableNam= e, TClass(wxString) userList );=0D int wxDb_GetTableCount(TSelf(wxDb) db);=0D TClass(wxDbInf) wxDb_GetCatalog( TSelf(wxDb) db, TClass(wxString) userName= );=0D int wxDb_GetColumnCount(TSelf(wxDb) db, TClass(wxString) tableName, TClass= (wxString) userName );=0D hunk ./wxc/include/db.h 80 TClass(wxDbColInfArray) wxDb_GetColumns(TSelf(wxDb) db, TClass(wxString) t= ableName, int* columnCount, TClass(wxString) userName);=0D -TBoolInt wxDb_Open(TSelf(wxDb) db, TClass(wxString) dsn, TClass(wxString) = userId, TClass(wxString) password);=0D +TBool wxDb_Open(TSelf(wxDb) db, TClass(wxString) dsn, TClass(wxString) use= rId, TClass(wxString) password);=0D TClass(wxString) wxDb_SQLColumnName(TSelf(wxDb) db, TClass(wxString) colum= nName);=0D TClass(wxString) wxDb_SQLTableName(TSelf(wxDb) db, TClass(wxString) tableN= ame);=0D hunk ./wxc/include/db.h 83 -TBoolInt wxDb_TableExists(TSelf(wxDb) db, TClass(wxString) tableName, TCla= ss(wxString) userName, TClass(wxString) path );=0D -TBoolInt wxDb_TablePrivileges(TSelf(wxDb) db, TClass(wxString) tableName, = TClass(wxString) privileges, TClass(wxString) userName, TClass(wxString) sc= hema, TClass(wxString) path );=0D +TBool wxDb_TableExists(TSelf(wxDb) db, TClass(wxString) tableName, TClass(= wxString) userName, TClass(wxString) path );=0D +TBool wxDb_TablePrivileges(TSelf(wxDb) db, TClass(wxString) tableName, TCl= ass(wxString) privileges, TClass(wxString) userName, TClass(wxString) schem= a, TClass(wxString) path );=0D int wxDb_TranslateSqlState(TSelf(wxDb) db, TClass(wxString) sqlState);=0D TClass(wxDb) wxDb_Create( TClass(wxHENV) henv, TBool fwdOnlyCursors );=0D void wxDb_Delete( TSelf(wxDb) db );=0D hunk ./wxc/include/db.h 137 int wxDbColInf_GetDbDataType( TSelf(wxDbColInf) self );=0D int wxDbColInf_GetPkCol( TSelf(wxDbColInf) self );=0D int wxDbColInf_GetFkCol( TSelf(wxDbColInf) self );=0D -TBoolInt wxDbColInf_IsNullable( TSelf(wxDbColInf) self );=0D +TBool wxDbColInf_IsNullable( TSelf(wxDbColInf) self );=0D =0D hunk ./wxc/include/wxc.h 123 void wxListCtrl_GetItem2( TSelf(wxListCtrl) _obj, TClassRef(wxListItem) in= fo);=0D void wxListCtrl_GetItemPosition2( TSelf(wxListCtrl) _obj, int item, TPoint= Out(x,y));=0D /** Sort items in a list control. Takes a closure that is called with a 'C= ommandEvent' where the @Int@ is the item data of the first item and the @Ex= traLong@ the item data of the second item. The event handler should set the= @Int@ to 0 when the items are equal, -1 when the first is less, and 1 when= the second is less. */=0D -TBoolInt wxListCtrl_SortItems2(TSelf(wxListCtrl) _obj, TClass(wxClosure) c= losure );=0D +TBool wxListCtrl_SortItems2(TSelf(wxListCtrl) _obj, TClass(wxClosure) clos= ure );=0D =0D /* tree ctrl */=0D TClassDefExtend(wxcTreeItemData,wxTreeItemData)=0D hunk ./wxc/include/wxc.h 258 TClass(wxHtmlWindow) wxHtmlWindow_Create( TClass(wxWindow) _prt, int _id, = TRect(_lft,_top,_wdt,_hgt), int _stl, TClass(wxString) _txt ); TBool wxHtmlWindow_AppendToPage( TSelf(wxHtmlWindow) _obj, = TClass(wxString) source ); TClass(wxHtmlContainerCell) wxHtmlWindow_GetInternalRepresentation( TSelf(= wxHtmlWindow) _obj ); -TStringLen wxHtmlWindow_GetOpenedAnchor( TSelf(wxHtmlWindow) _ob= j, TStringOutVoid _buf ) ; -TStringLen wxHtmlWindow_GetOpenedPage( TSelf(wxHtmlWindow) _obj,= TStringOutVoid _buf ); -TStringLen wxHtmlWindow_GetOpenedPageTitle( TSelf(wxHtmlWindow)= _obj, TStringOutVoid _buf ); +TClass(wxString) wxHtmlWindow_GetOpenedAnchor( TSelf(wxHtmlWindow) _ob= j ) ; +TClass(wxString) wxHtmlWindow_GetOpenedPage( TSelf(wxHtmlWindow) _obj = ); +TClass(wxString) wxHtmlWindow_GetOpenedPageTitle( TSelf(wxHtmlWindow) = _obj ); TClass(wxFrame) wxHtmlWindow_GetRelatedFrame( TSelf(wxHtmlWindow) _ob= j ); TBool wxHtmlWindow_HistoryBack( TSelf(wxHtmlWindow) _obj); TBool wxHtmlWindow_HistoryCanBack( TSelf(wxHtmlWindow) _obj= ); hunk ./wxc/include/wxc_glue.h 390 TClass(wxString) ELJApp_GetVendorName( );=0D /* int ELJApp_GetWantDebugOutput( ); */=0D void ELJApp_InitAllImageHandlers( );=0D -int ELJApp_Initialized( );=0D +TBool ELJApp_Initialized( );=0D int ELJApp_MainLoop( );=0D void ELJApp_MousePosition( TPointOutVoid(_x,_y) );=0D int ELJApp_Pending( );=0D hunk ./wxc/include/wxc_glue.h 926 TClass(wxAcceleratorTable) wxAcceleratorTable_Create( int n, void* entries= );=0D void wxAcceleratorTable_Delete( TSelf(wxAcceleratorTable) _obj );=0D =0D -/* wxActivateEvent */=0D +/* wxctivateEvent */=0D TClassDefExtend(wxActivateEvent,wxEvent)=0D void wxActivateEvent_CopyObject( TSelf(wxActivateEvent) _obj, void* = obj );=0D hunk ./wxc/include/wxc_glue.h 929 -int wxActivateEvent_GetActive( TSelf(wxActivateEvent) _obj );=0D +TBool wxActivateEvent_GetActive( TSelf(wxActivateEvent) _obj );=0D =0D /* wxApp */=0D TClassDefExtend(wxApp,wxEvtHandler)=0D hunk ./wxc/include/wxc_glue.h 942 =0D /* wxArtProvider */=0D TClassDefExtend(wxArtProvider,wxObject)=0D -int PopProvider( );=0D +TBool PopProvider( );=0D void PushProvider( TClass(wxArtProvider) provider );=0D TBool RemoveProvider( TClass(wxArtProvider) provider );=0D =0D hunk ./wxc/include/wxc_glue.h 1028 void wxBrush_GetStipple( TSelf(wxBrush) _obj, TClassRef(wxBitmap) _r= ef );=0D int wxBrush_GetStyle( TSelf(wxBrush) _obj );=0D TBool wxBrush_IsEqual( TSelf(wxBrush) _obj, TClass(wxBrush) brush );= =0D -TBool wxBrush_Ok( TSelf(wxBrush) _obj );=0D +TBool wxBrush_IsOk( TSelf(wxBrush) _obj );=0D void wxBrush_SetColour( TSelf(wxBrush) _obj, TClass(wxColour) col );= =0D void wxBrush_SetColourSingle( TSelf(wxBrush) _obj, TChar r, TChar g,= TChar b );=0D void wxBrush_SetStipple( TSelf(wxBrush) _obj, TClass(wxBitmap) stipp= le );=0D hunk ./wxc/include/wxc_glue.h 1085 =0D /* wxCalendarCtrl */=0D TClassDefExtend(wxCalendarCtrl,wxControl)=0D -TClass(wxCalendarCtrl) wxCalendarCtrl_Create( TClass(wxWindow) _prt, int _= id, void* _dat, TRect(_lft,_top,_wdt,_hgt), int _stl );=0D +TClass(wxCalendarCtrl) wxCalendarCtrl_Create( TClass(wxWindow) _prt, int _= id, TClass(wxDateTime) _dat, TRect(_lft,_top,_wdt,_hgt), int _stl );=0D void wxCalendarCtrl_EnableHolidayDisplay( TSelf(wxCalendarCtrl) _obj= , int display );=0D void wxCalendarCtrl_EnableMonthChange( TSelf(wxCalendarCtrl) _obj, T= Bool enable );=0D void wxCalendarCtrl_EnableYearChange( TSelf(wxCalendarCtrl) _obj, TB= ool enable );=0D hunk ./wxc/include/wxc_glue.h 1152 /* wxCheckBox */=0D TClassDefExtend(wxCheckBox,wxControl)=0D TClass(wxCheckBox) wxCheckBox_Create( TClass(wxWindow) _prt, int _id, TCla= ss(wxString) _txt, TRect(_lft,_top,_wdt,_hgt), int _stl );=0D -TBoolInt wxCheckBox_GetValue( TSelf(wxCheckBox) _obj );=0D +void wxCheckBox_Delete( TSelf(wxCheckBox) _obj );=0D +TBool wxCheckBox_GetValue( TSelf(wxCheckBox) _obj );=0D void wxCheckBox_SetValue( TSelf(wxCheckBox) _obj, TBoolInt value );= =0D =0D /* wxCheckListBox */=0D hunk ./wxc/include/wxc_glue.h 1160 TClassDefExtend(wxCheckListBox,wxListBox)=0D void wxCheckListBox_Check( TSelf(wxCheckListBox) _obj, int item, TBo= ol check );=0D TClass(wxCheckListBox) wxCheckListBox_Create( TClass(wxWindow) _prt, int _= id, TRect(_lft,_top,_wdt,_hgt), TArrayString(n,str), int _stl );=0D +void wxCheckListBox_Delete( TSelf(wxCheckListBox) _obj );=0D TBool wxCheckListBox_IsChecked( TSelf(wxCheckListBox) _obj, int item = );=0D =0D /* wxChoice */=0D hunk ./wxc/include/wxc_glue.h 1201 =0D /* wxClipboard */=0D TClassDefExtend(wxClipboard,wxObject)=0D -int wxClipboard_AddData( TSelf(wxClipboard) _obj, TClass(wxDataObje= ct) data );=0D +TBool wxClipboard_AddData( TSelf(wxClipboard) _obj, TClass(wxDataObje= ct) data );=0D void wxClipboard_Clear( TSelf(wxClipboard) _obj );=0D void wxClipboard_Close( TSelf(wxClipboard) _obj );=0D TClass(wxClipboard) wxClipboard_Create( );=0D hunk ./wxc/include/wxc_glue.h 1205 -int wxClipboard_Flush( TSelf(wxClipboard) _obj );=0D -int wxClipboard_GetData( TSelf(wxClipboard) _obj, TClass(wxDataObje= ct) data );=0D +TBool wxClipboard_Flush( TSelf(wxClipboard) _obj );=0D +TBool wxClipboard_GetData( TSelf(wxClipboard) _obj, TClass(wxDataObje= ct) data );=0D TBool wxClipboard_IsOpened( TSelf(wxClipboard) _obj );=0D TBool wxClipboard_IsSupported( TSelf(wxClipboard) _obj, TClass(wxData= Format) format );=0D hunk ./wxc/include/wxc_glue.h 1209 -int wxClipboard_Open( TSelf(wxClipboard) _obj );=0D -int wxClipboard_SetData( TSelf(wxClipboard) _obj, TClass(wxDataObje= ct) data );=0D -void wxClipboard_UsePrimarySelection( TSelf(wxClipboard) _obj, int p= rimary );=0D +TBool wxClipboard_Open( TSelf(wxClipboard) _obj );=0D +TBool wxClipboard_SetData( TSelf(wxClipboard) _obj, TClass(wxDataObje= ct) data );=0D +void wxClipboard_UsePrimarySelection( TSelf(wxClipboard) _obj, TBool= primary );=0D =0D /* wxCloseEvent */=0D TClassDefExtend(wxCloseEvent,wxEvent)=0D hunk ./wxc/include/wxc_glue.h 1216 TBool wxCloseEvent_CanVeto( TSelf(wxCloseEvent) _obj );=0D -void wxCloseEvent_CopyObject( TSelf(wxCloseEvent) _obj, void* obj );= =0D -int wxCloseEvent_GetLoggingOff( TSelf(wxCloseEvent) _obj );=0D -int wxCloseEvent_GetVeto( TSelf(wxCloseEvent) _obj );=0D -void wxCloseEvent_SetCanVeto( TSelf(wxCloseEvent) _obj, int canVeto = );=0D -void wxCloseEvent_SetLoggingOff( TSelf(wxCloseEvent) _obj, int logOf= f );=0D -void wxCloseEvent_Veto( TSelf(wxCloseEvent) _obj, int veto );=0D +void wxCloseEvent_CopyObject( TSelf(wxCloseEvent) _obj, TClass(wxObj= ect) obj );=0D +TBool wxCloseEvent_GetLoggingOff( TSelf(wxCloseEvent) _obj );=0D +TBool wxCloseEvent_GetVeto( TSelf(wxCloseEvent) _obj );=0D +void wxCloseEvent_SetCanVeto( TSelf(wxCloseEvent) _obj, TBool canVet= o );=0D +void wxCloseEvent_SetLoggingOff( TSelf(wxCloseEvent) _obj, TBool log= Off );=0D +void wxCloseEvent_Veto( TSelf(wxCloseEvent) _obj, TBool veto );=0D =0D /* wxClosure */=0D TClassDefExtend(wxClosure,wxObject)=0D hunk ./wxc/include/wxc_glue.h 1249 TClassDefExtend(wxColourData,wxObject)=0D TClass(wxColourData) wxColourData_Create( );=0D void wxColourData_Delete( TSelf(wxColourData) _obj );=0D -int wxColourData_GetChooseFull( TSelf(wxColourData) _obj );=0D +TBool wxColourData_GetChooseFull( TSelf(wxColourData) _obj );=0D void wxColourData_GetColour( TSelf(wxColourData) _obj, TClassRef(wxC= olour) _ref );=0D void wxColourData_GetCustomColour( TSelf(wxColourData) _obj, int i, = TClassRef(wxColour) _ref );=0D hunk ./wxc/include/wxc_glue.h 1252 -void wxColourData_SetChooseFull( TSelf(wxColourData) _obj, int flag = );=0D +void wxColourData_SetChooseFull( TSelf(wxColourData) _obj, TBool fla= g );=0D void wxColourData_SetColour( TSelf(wxColourData) _obj, TClass(wxColo= ur) colour );=0D void wxColourData_SetCustomColour( TSelf(wxColourData) _obj, int i, = TClass(wxColour) colour );=0D =0D hunk ./wxc/include/wxc_glue.h 1261 =0D /* wxColourDialog */=0D TClassDefExtend(wxColourDialog,wxDialog)=0D -TClass(wxColourDialog) wxColourDialog_Create( TClass(wxWindow) _prt, TClas= s(wxColour) col );=0D -void wxColourDialog_GetColourData( TSelf(wxColourDialog) _obj, TClas= sRef(wxColour) _ref );=0D +TClass(wxColourDialog) wxColourDialog_Create( TClass(wxWindow) _prt, TClas= s(wxColourData) col );=0D +void wxColourDialog_GetColourData( TSelf(wxColourDialog) _obj, TClas= sRef(wxColourData) _ref );=0D =0D /* wxComboBox */=0D TClassDefExtend(wxComboBox,wxChoice)=0D hunk ./wxc/include/wxc_glue.h 1394 =0D /* wxContextHelp */=0D TClassDefExtend(wxContextHelp,wxObject)=0D -int wxContextHelp_BeginContextHelp( TSelf(wxContextHelp) _obj, TCla= ss(wxWindow) win );=0D -TClass(wxContextHelp) wxContextHelp_Create( TClass(wxWindow) win, int begi= nHelp );=0D +TBool wxContextHelp_BeginContextHelp( TSelf(wxContextHelp) _obj, TCla= ss(wxWindow) win );=0D +TClass(wxContextHelp) wxContextHelp_Create( TClass(wxWindow) win, TBool be= ginHelp );=0D void wxContextHelp_Delete( TSelf(wxContextHelp) _obj );=0D hunk ./wxc/include/wxc_glue.h 1397 -int wxContextHelp_EndContextHelp( TSelf(wxContextHelp) _obj );=0D +TBool wxContextHelp_EndContextHelp( TSelf(wxContextHelp) _obj );=0D =0D /* wxContextHelpButton */=0D TClassDefExtend(wxContextHelpButton,wxBitmapButton)=0D hunk ./wxc/include/wxc_glue.h 1434 /* wxDC */=0D TClassDefExtend(wxDC,wxObject)=0D void wxDC_BeginDrawing( TSelf(wxDC) _obj );=0D -int wxDC_Blit( TSelf(wxDC) _obj, TRect(xdest,ydest,width,height), T= Class(wxDC) source, TPoint(xsrc,ysrc), int rop, TBool useMask );=0D +TBool wxDC_Blit( TSelf(wxDC) _obj, TRect(xdest,ydest,width,height), T= Class(wxDC) source, TPoint(xsrc,ysrc), int rop, TBool useMask );=0D void wxDC_CalcBoundingBox( TSelf(wxDC) _obj, TPoint(x,y) );=0D TBool wxDC_CanDrawBitmap( TSelf(wxDC) _obj );=0D TBool wxDC_CanGetTextExtent( TSelf(wxDC) _obj );=0D hunk ./wxc/include/wxc_glue.h 1500 int wxDC_MaxY( TSelf(wxDC) _obj );=0D int wxDC_MinX( TSelf(wxDC) _obj );=0D int wxDC_MinY( TSelf(wxDC) _obj );=0D -TBool wxDC_Ok( TSelf(wxDC) _obj );=0D +TBool wxDC_IsOk( TSelf(wxDC) _obj );=0D void wxDC_ResetBoundingBox( TSelf(wxDC) _obj );=0D hunk ./wxc/include/wxc_glue.h 1502 -void wxDC_SetAxisOrientation( TSelf(wxDC) _obj, TBoolInt xLeftRight,= TBoolInt yBottomUp );=0D +void wxDC_SetAxisOrientation( TSelf(wxDC) _obj, TBool xLeftRight, TB= ool yBottomUp );=0D void wxDC_SetBackground( TSelf(wxDC) _obj, TClass(wxBrush) brush );= =0D void wxDC_SetBackgroundMode( TSelf(wxDC) _obj, int mode );=0D void wxDC_SetBrush( TSelf(wxDC) _obj, TClass(wxBrush) brush );=0D hunk ./wxc/include/wxc_glue.h 1519 void wxDC_SetTextBackground( TSelf(wxDC) _obj, TClass(wxColour) colo= ur );=0D void wxDC_SetTextForeground( TSelf(wxDC) _obj, TClass(wxColour) colo= ur );=0D void wxDC_SetUserScale( TSelf(wxDC) _obj, double x, double y );=0D -int wxDC_StartDoc( TSelf(wxDC) _obj, TClass(wxString) msg );=0D +TBool wxDC_StartDoc( TSelf(wxDC) _obj, TClass(wxString) msg );=0D void wxDC_StartPage( TSelf(wxDC) _obj );=0D =0D /* wxDCClipper */=0D hunk ./wxc/include/wxc_glue.h 1646 void wxDateTime_SetTime( TSelf(wxDateTime) _obj, int hour, int minut= e, int second, int millisec );=0D void wxDateTime_SetToCurrent( TSelf(wxDateTime) _obj );=0D void wxDateTime_SetToLastMonthDay( TSelf(wxDateTime) _obj, int month= , int year );=0D -int wxDateTime_SetToLastWeekDay( TSelf(wxDateTime) _obj, int weekda= y, int month, int year );=0D +TBool wxDateTime_SetToLastWeekDay( TSelf(wxDateTime) _obj, int weekda= y, int month, int year );=0D void wxDateTime_SetToNextWeekDay( TSelf(wxDateTime) _obj, int weekda= y );=0D void wxDateTime_SetToPrevWeekDay( TSelf(wxDateTime) _obj, int weekda= y );=0D hunk ./wxc/include/wxc_glue.h 1649 -int wxDateTime_SetToWeekDay( TSelf(wxDateTime) _obj, int weekday, i= nt n, int month, int year );=0D +TBool wxDateTime_SetToWeekDay( TSelf(wxDateTime) _obj, int weekday, i= nt n, int month, int year );=0D void wxDateTime_SetToWeekDayInSameWeek( TSelf(wxDateTime) _obj, int = weekday );=0D void wxDateTime_SetYear( TSelf(wxDateTime) _obj, int year );=0D void wxDateTime_SubtractDate( TSelf(wxDateTime) _obj, void* diff, TC= lassRef(wxDateTime) _ref );=0D hunk ./wxc/include/wxc_glue.h 1700 TBool wxDialUpManager_CancelDialing( TSelf(wxDialUpManager) _obj );= =0D TClass(wxDialUpManager) wxDialUpManager_Create( );=0D void wxDialUpManager_Delete( TSelf(wxDialUpManager) _obj );=0D -int wxDialUpManager_Dial( TSelf(wxDialUpManager) _obj, TClass(wxStr= ing) nameOfISP, TClass(wxString) username, TClass(wxString) password, int a= sync );=0D +TBool wxDialUpManager_Dial( TSelf(wxDialUpManager) _obj, TClass(wxStr= ing) nameOfISP, TClass(wxString) username, TClass(wxString) password, TBool= async );=0D void wxDialUpManager_DisableAutoCheckOnlineStatus( TSelf(wxDialUpMan= ager) _obj );=0D hunk ./wxc/include/wxc_glue.h 1702 -int wxDialUpManager_EnableAutoCheckOnlineStatus( TSelf(wxDialUpMana= ger) _obj, int nSeconds );=0D +TBool wxDialUpManager_EnableAutoCheckOnlineStatus( TSelf(wxDialUpMana= ger) _obj, int nSeconds );=0D int wxDialUpManager_GetISPNames( TSelf(wxDialUpManager) _obj, TClas= s(wxList) _lst );=0D hunk ./wxc/include/wxc_glue.h 1704 -int wxDialUpManager_HangUp( TSelf(wxDialUpManager) _obj );=0D +TBool wxDialUpManager_HangUp( TSelf(wxDialUpManager) _obj );=0D TBool wxDialUpManager_IsAlwaysOnline( TSelf(wxDialUpManager) _obj );= =0D TBool wxDialUpManager_IsDialing( TSelf(wxDialUpManager) _obj );=0D TBool wxDialUpManager_IsOk( TSelf(wxDialUpManager) _obj );=0D hunk ./wxc/include/wxc_glue.h 1709 TBool wxDialUpManager_IsOnline( TSelf(wxDialUpManager) _obj );=0D -void wxDialUpManager_SetConnectCommand( TSelf(wxDialUpManager) _obj,= void* commandDial, void* commandHangup );=0D +void wxDialUpManager_SetConnectCommand( TSelf(wxDialUpManager) _obj,= TClass(wxString) commandDial, TClass(wxString) commandHangup );=0D void wxDialUpManager_SetOnlineStatus( TSelf(wxDialUpManager) _obj, T= Bool isOnline );=0D hunk ./wxc/include/wxc_glue.h 1711 -void wxDialUpManager_SetWellKnownHost( TSelf(wxDialUpManager) _obj, = void* hostname, int portno );=0D +void wxDialUpManager_SetWellKnownHost( TSelf(wxDialUpManager) _obj, = TClass(wxString) hostname, int portno );=0D =0D /* wxDialog */=0D TClassDefExtend(wxDialog,wxTopLevelWindow)=0D hunk ./wxc/include/wxc_glue.h 2030 =0D /* wxFont */=0D TClassDefExtend(wxFont,wxGDIObject)=0D -TClass(wxFont) wxFont_Create( int pointSize, int family, int style, int we= ight, int underlined, TClass(wxString) face, int enc );=0D +TClass(wxFont) wxFont_Create( int pointSize, int family, int style, int we= ight, TBool underlined, TClass(wxString) face, int enc );=0D +TClass(wxFont) wxFont_CreateFromStock( int id );=0D TClass(wxFont) wxFont_CreateDefault( );=0D void wxFont_Delete( TSelf(wxFont) _obj );=0D int wxFont_GetDefaultEncoding( TSelf(wxFont) _obj );=0D hunk ./wxc/include/wxc_glue.h 2196 =0D /* wxGrid */=0D TClassDefExtend(wxGrid,wxScrolledWindow)=0D -TBoolInt wxGrid_AppendCols( TSelf(wxGrid) _obj, int numCols, TBoolInt up= dateLabels );=0D -TBoolInt wxGrid_AppendRows( TSelf(wxGrid) _obj, int numRows, TBoolInt up= dateLabels );=0D +TBool wxGrid_AppendCols( TSelf(wxGrid) _obj, int numCols, TBool updat= eLabels );=0D +TBool wxGrid_AppendRows( TSelf(wxGrid) _obj, int numRows, TBool updat= eLabels );=0D void wxGrid_AutoSize( TSelf(wxGrid) _obj );=0D void wxGrid_AutoSizeColumn( TSelf(wxGrid) _obj, int col, TBoolInt se= tAsMin );=0D void wxGrid_AutoSizeColumns( TSelf(wxGrid) _obj, TBoolInt setAsMin )= ;=0D hunk ./wxc/include/wxc_glue.h 2217 void wxGrid_ClearSelection( TSelf(wxGrid) _obj );=0D TClass(wxGrid) wxGrid_Create( TClass(wxWindow) _prt, int _id, TRect(_lft,_= top,_wdt,_hgt), int _stl );=0D void wxGrid_CreateGrid( TSelf(wxGrid) _obj, int rows, int cols, int = selmode );=0D -TBoolInt wxGrid_DeleteCols( TSelf(wxGrid) _obj, int pos, int numCols, TB= oolInt updateLabels );=0D -TBoolInt wxGrid_DeleteRows( TSelf(wxGrid) _obj, int pos, int numRows, TB= oolInt updateLabels );=0D +TBool wxGrid_DeleteCols( TSelf(wxGrid) _obj, int pos, int numCols, TB= ool updateLabels );=0D +TBool wxGrid_DeleteRows( TSelf(wxGrid) _obj, int pos, int numRows, TB= ool updateLabels );=0D void wxGrid_DisableCellEditControl( TSelf(wxGrid) _obj );=0D void wxGrid_DisableDragColSize( TSelf(wxGrid) _obj );=0D void wxGrid_DisableDragGridSize( TSelf(wxGrid) _obj );=0D hunk ./wxc/include/wxc_glue.h 2289 void wxGrid_GetTextBoxSize( TSelf(wxGrid) _obj, TClass(wxDC) dc, TAr= rayString(count,lines), TSizeOutVoid(_w,_h) );=0D int wxGrid_GridLinesEnabled( TSelf(wxGrid) _obj );=0D void wxGrid_HideCellEditControl( TSelf(wxGrid) _obj );=0D -TBoolInt wxGrid_InsertCols( TSelf(wxGrid) _obj, int pos, int numCols, TB= oolInt updateLabels );=0D -TBoolInt wxGrid_InsertRows( TSelf(wxGrid) _obj, int pos, int numRows, TB= oolInt updateLabels );=0D +TBool wxGrid_InsertCols( TSelf(wxGrid) _obj, int pos, int numCols, TB= ool updateLabels );=0D +TBool wxGrid_InsertRows( TSelf(wxGrid) _obj, int pos, int numRows, TB= ool updateLabels );=0D TBool wxGrid_IsCellEditControlEnabled( TSelf(wxGrid) _obj );=0D TBool wxGrid_IsCellEditControlShown( TSelf(wxGrid) _obj );=0D TBool wxGrid_IsCurrentCellReadOnly( TSelf(wxGrid) _obj );=0D hunk ./wxc/include/wxc_glue.h 2298 TBool wxGrid_IsInSelection( TSelf(wxGrid) _obj, int row, int col );= =0D TBool wxGrid_IsReadOnly( TSelf(wxGrid) _obj, int row, int col );=0D TBool wxGrid_IsSelection( TSelf(wxGrid) _obj );=0D -TBool wxGrid_IsVisible( TSelf(wxGrid) _obj, int row, int col, TBoolIn= t wholeCellVisible );=0D +TBool wxGrid_IsVisible( TSelf(wxGrid) _obj, int row, int col, TBool w= holeCellVisible );=0D void wxGrid_MakeCellVisible( TSelf(wxGrid) _obj, int row, int col );= =0D hunk ./wxc/include/wxc_glue.h 2300 -TBoolInt wxGrid_MoveCursorDown( TSelf(wxGrid) _obj, TBoolInt expandSelec= tion );=0D -TBoolInt wxGrid_MoveCursorDownBlock( TSelf(wxGrid) _obj, TBoolInt expand= Selection );=0D -TBoolInt wxGrid_MoveCursorLeft( TSelf(wxGrid) _obj, TBoolInt expandSelec= tion );=0D -TBoolInt wxGrid_MoveCursorLeftBlock( TSelf(wxGrid) _obj, TBoolInt expand= Selection );=0D -TBoolInt wxGrid_MoveCursorRight( TSelf(wxGrid) _obj, TBoolInt expandSele= ction );=0D -TBoolInt wxGrid_MoveCursorRightBlock( TSelf(wxGrid) _obj, TBoolInt expan= dSelection );=0D -TBoolInt wxGrid_MoveCursorUp( TSelf(wxGrid) _obj, TBoolInt expandSelecti= on );=0D -TBoolInt wxGrid_MoveCursorUpBlock( TSelf(wxGrid) _obj, TBoolInt expandSe= lection );=0D -TBoolInt wxGrid_MovePageDown( TSelf(wxGrid) _obj );=0D -TBoolInt wxGrid_MovePageUp( TSelf(wxGrid) _obj );=0D +TBool wxGrid_MoveCursorDown( TSelf(wxGrid) _obj, TBool expandSelectio= n );=0D +TBool wxGrid_MoveCursorDownBlock( TSelf(wxGrid) _obj, TBool expandSel= ection );=0D +TBool wxGrid_MoveCursorLeft( TSelf(wxGrid) _obj, TBool expandSelectio= n );=0D +TBool wxGrid_MoveCursorLeftBlock( TSelf(wxGrid) _obj, TBool expandSel= ection );=0D +TBool wxGrid_MoveCursorRight( TSelf(wxGrid) _obj, TBool expandSelecti= on );=0D +TBool wxGrid_MoveCursorRightBlock( TSelf(wxGrid) _obj, TBool expandSe= lection );=0D +TBool wxGrid_MoveCursorUp( TSelf(wxGrid) _obj, TBool expandSelection = );=0D +TBool wxGrid_MoveCursorUpBlock( TSelf(wxGrid) _obj, TBool expandSelec= tion );=0D +TBool wxGrid_MovePageDown( TSelf(wxGrid) _obj );=0D +TBool wxGrid_MovePageUp( TSelf(wxGrid) _obj );=0D void wxGrid_ProcessColLabelMouseEvent( TSelf(wxGrid) _obj, TClass(wx= MouseEvent) event );=0D void wxGrid_ProcessCornerLabelMouseEvent( TSelf(wxGrid) _obj, TClass= (wxMouseEvent) event );=0D void wxGrid_ProcessGridCellMouseEvent( TSelf(wxGrid) _obj, TClass(wx= MouseEvent) event );=0D hunk ./wxc/include/wxc_glue.h 2314 void wxGrid_ProcessRowLabelMouseEvent( TSelf(wxGrid) _obj, TClass(wx= MouseEvent) event );=0D -int wxGrid_ProcessTableMessage( TSelf(wxGrid) _obj, TClass(wxEvent)= evt );=0D +TBool wxGrid_ProcessTableMessage( TSelf(wxGrid) _obj, TClass(wxEvent)= evt );=0D void wxGrid_RegisterDataType( TSelf(wxGrid) _obj, TClass(wxString) t= ypeName, TClass(wxGridCellRenderer) renderer, TClass(wxGridCellEditor) edit= or );=0D void wxGrid_SaveEditControlValue( TSelf(wxGrid) _obj );=0D void wxGrid_SelectAll( TSelf(wxGrid) _obj );=0D hunk ./wxc/include/wxc_glue.h 2363 void wxGrid_SetSelectionBackground( TSelf(wxGrid) _obj, TClass(wxCol= our) c );=0D void wxGrid_SetSelectionForeground( TSelf(wxGrid) _obj, TClass(wxCol= our) c );=0D void wxGrid_SetSelectionMode( TSelf(wxGrid) _obj, int selmode );=0D -TBoolInt wxGrid_SetTable( TSelf(wxGrid) _obj, TClass(wxGridTableBase) ta= ble, TBoolInt takeOwnership, int selmode );=0D +TBool wxGrid_SetTable( TSelf(wxGrid) _obj, TClass(wxGridTableBase) tab= le, TBool takeOwnership, int selmode );=0D void wxGrid_ShowCellEditControl( TSelf(wxGrid) _obj );=0D int wxGrid_StringToLines( TSelf(wxGrid) _obj, TClass(wxString) valu= e, void* lines );=0D int wxGrid_XToCol( TSelf(wxGrid) _obj, int x );=0D hunk ./wxc/include/wxc_glue.h 2546 =0D /* wxHelpControllerHelpProvider */=0D TClassDefExtend(wxHelpControllerHelpProvider,wxSimpleHelpProvider)=0D -TClass(wxHelpControllerHelpProvider) wxHelpControllerHelpProvider_Create( = void* ctr );=0D -TClass(wxHelpController) wxHelpControllerHelpProvider_GetHelpController( T= Self(wxHelpControllerHelpProvider) _obj );=0D +TClass(wxHelpControllerHelpProvider) wxHelpControllerHelpProvider_Create( = TClass(wxHelpControllerBase) ctr );=0D +TClass(wxHelpControllerBase) wxHelpControllerHelpProvider_GetHelpControlle= r( TSelf(wxHelpControllerHelpProvider) _obj );=0D void wxHelpControllerHelpProvider_SetHelpController( TSelf(wxHelpCon= trollerHelpProvider) _obj, TClass(wxHelpController) hc );=0D =0D /* wxHelpEvent */=0D hunk ./wxc/include/wxc_glue.h 2564 void wxHelpProvider_AddHelp( TSelf(wxHelpProvider) _obj, TClass(wxWi= ndow) window, TClass(wxString) text );=0D void wxHelpProvider_AddHelpById( TSelf(wxHelpProvider) _obj, int id,= TClass(wxString) text );=0D void wxHelpProvider_Delete( TSelf(wxHelpProvider) _obj );=0D -void* wxHelpProvider_Get( );=0D +TSelf(wxHelpProvider) wxHelpProvider_Get( );=0D TClass(wxString) wxHelpProvider_GetHelp( TSelf(wxHelpProvider) _obj, TClas= s(wxWindow) window );=0D void wxHelpProvider_RemoveHelp( TSelf(wxHelpProvider) _obj, TClass(w= xWindow) window );=0D hunk ./wxc/include/wxc_glue.h 2567 -void* wxHelpProvider_Set( TSelf(wxHelpProvider) helpProvider );=0D -int wxHelpProvider_ShowHelp( TSelf(wxHelpProvider) _obj, TClass(wxW= indow) window );=0D +TSelf(wxHelpProvider) wxHelpProvider_Set( TSelf(wxHelpProvider) helpProvid= er );=0D +TBool wxHelpProvider_ShowHelp( TSelf(wxHelpProvider) _obj, TClass(wxW= indow) window );=0D =0D /* wxHtmlCell */=0D TClassDefExtend(wxHtmlCell,wxObject)=0D hunk ./wxc/include/wxc_glue.h 2590 =0D /* wxHtmlHelpController */=0D TClassDefExtend(wxHtmlHelpController,wxHelpControllerBase)=0D -int wxHtmlHelpController_AddBook( TSelf(wxHtmlHelpController) _obj,= void* book, int show_wait_msg );=0D +TBool wxHtmlHelpController_AddBook( TSelf(wxHtmlHelpController) _obj,= void* book, int show_wait_msg );=0D TClass(wxHtmlHelpController) wxHtmlHelpController_Create( int _style );=0D void wxHtmlHelpController_Delete( TSelf(wxHtmlHelpController) _obj )= ;=0D int wxHtmlHelpController_Display( TSelf(wxHtmlHelpController) _obj,= void* x );=0D hunk ./wxc/include/wxc_glue.h 2594 -int wxHtmlHelpController_DisplayBlock( TSelf(wxHtmlHelpController) = _obj, int blockNo );=0D +TBool wxHtmlHelpController_DisplayBlock( TSelf(wxHtmlHelpController) = _obj, int blockNo );=0D int wxHtmlHelpController_DisplayContents( TSelf(wxHtmlHelpControlle= r) _obj );=0D int wxHtmlHelpController_DisplayIndex( TSelf(wxHtmlHelpController) = _obj );=0D int wxHtmlHelpController_DisplayNumber( TSelf(wxHtmlHelpController)= _obj, int id );=0D hunk ./wxc/include/wxc_glue.h 2598 -int wxHtmlHelpController_DisplaySection( TSelf(wxHtmlHelpController= ) _obj, TClass(wxString) section );=0D -int wxHtmlHelpController_DisplaySectionNumber( TSelf(wxHtmlHelpCont= roller) _obj, int sectionNo );=0D +TBool wxHtmlHelpController_DisplaySection( TSelf(wxHtmlHelpController= ) _obj, TClass(wxString) section );=0D +TBool wxHtmlHelpController_DisplaySectionNumber( TSelf(wxHtmlHelpCont= roller) _obj, int sectionNo );=0D TClass(wxFrame) wxHtmlHelpController_GetFrame( TSelf(wxHtmlHelpController)= _obj );=0D void* wxHtmlHelpController_GetFrameParameters( TSelf(wxHtmlHelpContro= ller) _obj, void* title, int* width, int* height, int* pos_x, int* pos_y, i= nt* newFrameEachTime );=0D hunk ./wxc/include/wxc_glue.h 2602 -int wxHtmlHelpController_Initialize( TSelf(wxHtmlHelpController) _o= bj, TClass(wxString) file );=0D -int wxHtmlHelpController_KeywordSearch( TSelf(wxHtmlHelpController)= _obj, TClass(wxString) keyword );=0D -int wxHtmlHelpController_LoadFile( TSelf(wxHtmlHelpController) _obj= , TClass(wxString) file );=0D -int wxHtmlHelpController_Quit( TSelf(wxHtmlHelpController) _obj );= =0D +TBool wxHtmlHelpController_Initialize( TSelf(wxHtmlHelpController) _o= bj, TClass(wxString) file );=0D +TBool wxHtmlHelpController_KeywordSearch( TSelf(wxHtmlHelpController)= _obj, TClass(wxString) keyword );=0D +TBool wxHtmlHelpController_LoadFile( TSelf(wxHtmlHelpController) _obj= , TClass(wxString) file );=0D +TBool wxHtmlHelpController_Quit( TSelf(wxHtmlHelpController) _obj );= =0D void wxHtmlHelpController_ReadCustomization( TSelf(wxHtmlHelpControl= ler) _obj, TClass(wxConfigBase) cfg, TClass(wxString) path );=0D hunk ./wxc/include/wxc_glue.h 2607 -void wxHtmlHelpController_SetFrameParameters( TSelf(wxHtmlHelpContro= ller) _obj, void* title, TSize(width,height), int pos_x, int pos_y, int new= FrameEachTime );=0D +void wxHtmlHelpController_SetFrameParameters( TSelf(wxHtmlHelpContro= ller) _obj, void* title, TSize(width,height), int pos_x, int pos_y, TBool n= ewFrameEachTime );=0D void wxHtmlHelpController_SetTempDir( TSelf(wxHtmlHelpController) _o= bj, TClass(wxString) path );=0D void wxHtmlHelpController_SetTitleFormat( TSelf(wxHtmlHelpController= ) _obj, void* format );=0D void wxHtmlHelpController_SetViewer( TSelf(wxHtmlHelpController) _ob= j, TClass(wxString) viewer, int flags );=0D hunk ./wxc/include/wxc_glue.h 2688 =0D /* wxIdleEvent */=0D TClassDefExtend(wxIdleEvent,wxEvent)=0D -void wxIdleEvent_CopyObject( TSelf(wxIdleEvent) _obj, void* object_d= est );=0D +void wxIdleEvent_CopyObject( TSelf(wxIdleEvent) _obj, TClass(wxObjec= t) object_dest );=0D TBool wxIdleEvent_MoreRequested( TSelf(wxIdleEvent) _obj );=0D void wxIdleEvent_RequestMore( TSelf(wxIdleEvent) _obj, TBool needMor= e );=0D =0D hunk ./wxc/include/wxc_glue.h 2751 int wxImageList_AddMasked( TSelf(wxImageList) _obj, TClass(wxBitmap= ) bitmap, TClass(wxColour) maskColour );=0D TClass(wxImageList) wxImageList_Create( TSize(width,height), TBoolInt mask= , int initialCount );=0D void wxImageList_Delete( TSelf(wxImageList) _obj );=0D -TBoolInt wxImageList_Draw( TSelf(wxImageList) _obj, int index, TClass(wx= DC) dc, TPoint(x,y), int flags, TBoolInt solidBackground );=0D +TBool wxImageList_Draw( TSelf(wxImageList) _obj, int index, TClass(wx= DC) dc, TPoint(x,y), int flags, TBool solidBackground );=0D int wxImageList_GetImageCount( TSelf(wxImageList) _obj );=0D void wxImageList_GetSize( TSelf(wxImageList) _obj, int index, TSizeO= ut(width,height) );=0D hunk ./wxc/include/wxc_glue.h 2754 -TBoolInt wxImageList_Remove( TSelf(wxImageList) _obj, int index );=0D -TBoolInt wxImageList_RemoveAll( TSelf(wxImageList) _obj );=0D -TBoolInt wxImageList_Replace( TSelf(wxImageList) _obj, int index, TClass= (wxBitmap) bitmap, TClass(wxBitmap) mask );=0D -TBoolInt wxImageList_ReplaceIcon( TSelf(wxImageList) _obj, int index, TC= lass(wxIcon) icon );=0D +TBool wxImageList_Remove( TSelf(wxImageList) _obj, int index );=0D +TBool wxImageList_RemoveAll( TSelf(wxImageList) _obj );=0D +TBool wxImageList_Replace( TSelf(wxImageList) _obj, int index, TClass= (wxBitmap) bitmap, TClass(wxBitmap) mask );=0D +TBool wxImageList_ReplaceIcon( TSelf(wxImageList) _obj, int index, TC= lass(wxIcon) icon );=0D =0D /* wxIndividualLayoutConstraint */=0D TClassDefExtend(wxIndividualLayoutConstraint,wxObject)=0D hunk ./wxc/include/wxc_glue.h 2765 void wxIndividualLayoutConstraint_Absolute( TSelf(wxIndividualLayout= Constraint) _obj, int val );=0D void wxIndividualLayoutConstraint_AsIs( TSelf(wxIndividualLayoutCons= traint) _obj );=0D void wxIndividualLayoutConstraint_Below( TSelf(wxIndividualLayoutCon= straint) _obj, TClass(wxWindow) sibling, int marg );=0D -int wxIndividualLayoutConstraint_GetDone( TSelf(wxIndividualLayoutC= onstraint) _obj );=0D +TBool wxIndividualLayoutConstraint_GetDone( TSelf(wxIndividualLayoutC= onstraint) _obj );=0D int wxIndividualLayoutConstraint_GetEdge( TSelf(wxIndividualLayoutC= onstraint) _obj, int which, void* thisWin, void* other );=0D int wxIndividualLayoutConstraint_GetMargin( TSelf(wxIndividualLayou= tConstraint) _obj );=0D int wxIndividualLayoutConstraint_GetMyEdge( TSelf(wxIndividualLayou= tConstraint) _obj );=0D hunk ./wxc/include/wxc_glue.h 2776 int wxIndividualLayoutConstraint_GetValue( TSelf(wxIndividualLayout= Constraint) _obj );=0D void wxIndividualLayoutConstraint_LeftOf( TSelf(wxIndividualLayoutCo= nstraint) _obj, TClass(wxWindow) sibling, int marg );=0D void wxIndividualLayoutConstraint_PercentOf( TSelf(wxIndividualLayou= tConstraint) _obj, TClass(wxWindow) otherW, int wh, int per );=0D -int wxIndividualLayoutConstraint_ResetIfWin( TSelf(wxIndividualLayo= utConstraint) _obj, TClass(wxWindow) otherW );=0D +TBool wxIndividualLayoutConstraint_ResetIfWin( TSelf(wxIndividualLayo= utConstraint) _obj, TClass(wxWindow) otherW );=0D void wxIndividualLayoutConstraint_RightOf( TSelf(wxIndividualLayoutC= onstraint) _obj, TClass(wxWindow) sibling, int marg );=0D void wxIndividualLayoutConstraint_SameAs( TSelf(wxIndividualLayoutCo= nstraint) _obj, TClass(wxWindow) otherW, int edge, int marg );=0D hunk ./wxc/include/wxc_glue.h 2779 -int wxIndividualLayoutConstraint_SatisfyConstraint( TSelf(wxIndivid= ualLayoutConstraint) _obj, void* constraints, TClass(wxWindow) win );=0D +TBool wxIndividualLayoutConstraint_SatisfyConstraint( TSelf(wxIndivid= ualLayoutConstraint) _obj, void* constraints, TClass(wxWindow) win );=0D void wxIndividualLayoutConstraint_Set( TSelf(wxIndividualLayoutConst= raint) _obj, int rel, TClass(wxWindow) otherW, int otherE, int val, int mar= g );=0D hunk ./wxc/include/wxc_glue.h 2781 -void wxIndividualLayoutConstraint_SetDone( TSelf(wxIndividualLayoutC= onstraint) _obj, int d );=0D +void wxIndividualLayoutConstraint_SetDone( TSelf(wxIndividualLayoutC= onstraint) _obj, TBool d );=0D void wxIndividualLayoutConstraint_SetEdge( TSelf(wxIndividualLayoutC= onstraint) _obj, int which );=0D void wxIndividualLayoutConstraint_SetMargin( TSelf(wxIndividualLayou= tConstraint) _obj, int m );=0D void wxIndividualLayoutConstraint_SetRelationship( TSelf(wxIndividua= lLayoutConstraint) _obj, int r );=0D hunk ./wxc/include/wxc_glue.h 2880 void wxKeyEvent_GetPosition( TSelf(wxKeyEvent) _obj, TPointOut(_x,_y= ) );=0D int wxKeyEvent_GetX( TSelf(wxKeyEvent) _obj );=0D int wxKeyEvent_GetY( TSelf(wxKeyEvent) _obj );=0D +int wxKeyEvent_GetModifiers( TSelf(wxKeyEvent) _obj );=0D TBool wxKeyEvent_HasModifiers( TSelf(wxKeyEvent) _obj );=0D TBool wxKeyEvent_MetaDown( TSelf(wxKeyEvent) _obj );=0D void wxKeyEvent_SetKeyCode( TSelf(wxKeyEvent) _obj, int code );=0D hunk ./wxc/include/wxc_glue.h 2900 TClassDefExtend(wxLayoutAlgorithm,wxObject)=0D TClass(wxLayoutAlgorithm) wxLayoutAlgorithm_Create( );=0D void wxLayoutAlgorithm_Delete( TSelf(wxLayoutAlgorithm) _obj );=0D -int wxLayoutAlgorithm_LayoutFrame( TSelf(wxLayoutAlgorithm) _obj, T= Class(wxFrame) frame, void* mainWindow );=0D -int wxLayoutAlgorithm_LayoutMDIFrame( TSelf(wxLayoutAlgorithm) _obj= , TClass(wxFrame) frame, TRect(x,y,w,h), int use );=0D -int wxLayoutAlgorithm_LayoutWindow( TSelf(wxLayoutAlgorithm) _obj, = TClass(wxFrame) frame, void* mainWindow );=0D +TBool wxLayoutAlgorithm_LayoutFrame( TSelf(wxLayoutAlgorithm) _obj, T= Class(wxFrame) frame, void* mainWindow );=0D +TBool wxLayoutAlgorithm_LayoutMDIFrame( TSelf(wxLayoutAlgorithm) _obj= , TClass(wxFrame) frame, TRect(x,y,w,h), int use );=0D +TBool wxLayoutAlgorithm_LayoutWindow( TSelf(wxLayoutAlgorithm) _obj, = TClass(wxFrame) frame, void* mainWindow );=0D =0D /* wxLayoutConstraints */=0D TClassDefExtend(wxLayoutConstraints,wxObject)=0D hunk ./wxc/include/wxc_glue.h 2942 =0D /* wxListCtrl */=0D TClassDefExtend(wxListCtrl,wxControl)=0D -TBoolInt wxListCtrl_Arrange( TSelf(wxListCtrl) _obj, int flag );=0D +TBool wxListCtrl_Arrange( TSelf(wxListCtrl) _obj, int flag );=0D void wxListCtrl_ClearAll( TSelf(wxListCtrl) _obj );=0D TClass(wxListCtrl) wxListCtrl_Create( TClass(wxWindow) _prt, int _id, TRec= t(_lft,_top,_wdt,_hgt), int _stl );=0D hunk ./wxc/include/wxc_glue.h 2945 -TBoolInt wxListCtrl_DeleteAllColumns( TSelf(wxListCtrl) _obj );=0D -TBoolInt wxListCtrl_DeleteAllItems( TSelf(wxListCtrl) _obj );=0D -TBoolInt wxListCtrl_DeleteColumn( TSelf(wxListCtrl) _obj, int col );=0D -TBoolInt wxListCtrl_DeleteItem( TSelf(wxListCtrl) _obj, int item );=0D +TBool wxListCtrl_DeleteAllColumns( TSelf(wxListCtrl) _obj );=0D +TBool wxListCtrl_DeleteAllItems( TSelf(wxListCtrl) _obj );=0D +TBool wxListCtrl_DeleteColumn( TSelf(wxListCtrl) _obj, int col );=0D +TBool wxListCtrl_DeleteItem( TSelf(wxListCtrl) _obj, int item );=0D void wxListCtrl_EditLabel( TSelf(wxListCtrl) _obj, int item );=0D hunk ./wxc/include/wxc_glue.h 2950 -TBoolInt wxListCtrl_EndEditLabel( TSelf(wxListCtrl) _obj, int cancel );= =0D -TBoolInt wxListCtrl_EnsureVisible( TSelf(wxListCtrl) _obj, int item );= =0D +TBool wxListCtrl_EndEditLabel( TSelf(wxListCtrl) _obj, int cancel );= =0D +TBool wxListCtrl_EnsureVisible( TSelf(wxListCtrl) _obj, int item );= =0D int wxListCtrl_FindItem( TSelf(wxListCtrl) _obj, int start, TClass(= wxString) str, TBool partial );=0D int wxListCtrl_FindItemByData( TSelf(wxListCtrl) _obj, int start, i= nt data );=0D int wxListCtrl_FindItemByPosition( TSelf(wxListCtrl) _obj, int star= t, TPoint(x,y), int direction );=0D hunk ./wxc/include/wxc_glue.h 2955 -TBoolInt wxListCtrl_GetColumn( TSelf(wxListCtrl) _obj, int col, TClass(w= xListItem) item );=0D +TBool wxListCtrl_GetColumn( TSelf(wxListCtrl) _obj, int col, TClass(w= xListItem) item );=0D int wxListCtrl_GetColumnCount( TSelf(wxListCtrl) _obj );=0D int wxListCtrl_GetColumnWidth( TSelf(wxListCtrl) _obj, int col );= =0D int wxListCtrl_GetCountPerPage( TSelf(wxListCtrl) _obj );=0D hunk ./wxc/include/wxc_glue.h 2961 TClass(wxTextCtrl) wxListCtrl_GetEditControl( TSelf(wxListCtrl) _obj );= =0D TClass(wxImageList) wxListCtrl_GetImageList( TSelf(wxListCtrl) _obj, int w= hich );=0D -TBoolInt wxListCtrl_GetItem( TSelf(wxListCtrl) _obj, TClass(wxListItem) = info );=0D +TBool wxListCtrl_GetItem( TSelf(wxListCtrl) _obj, TClass(wxListItem) = info );=0D int wxListCtrl_GetItemCount( TSelf(wxListCtrl) _obj );=0D int wxListCtrl_GetItemData( TSelf(wxListCtrl) _obj, int item );=0D hunk ./wxc/include/wxc_glue.h 2964 -TBoolInt wxListCtrl_GetItemPosition( TSelf(wxListCtrl) _obj, int item, i= nt*x, int* y );=0D +TBool wxListCtrl_GetItemPosition( TSelf(wxListCtrl) _obj, int item, i= nt*x, int* y );=0D int wxListCtrl_GetItemRect( TSelf(wxListCtrl) _obj, int item, int c= ode, TRectOutVoid(x,y,w,h) );=0D void wxListCtrl_GetItemSpacing( TSelf(wxListCtrl) _obj, TBool isSmal= l, TSizeOutVoid(w,h) );=0D int wxListCtrl_GetItemState( TSelf(wxListCtrl) _obj, int item, int = stateMask );=0D hunk ./wxc/include/wxc_glue.h 2980 int wxListCtrl_InsertItemWithData( TSelf(wxListCtrl) _obj, int inde= x, TClass(wxString) label );=0D int wxListCtrl_InsertItemWithImage( TSelf(wxListCtrl) _obj, int ind= ex, int imageIndex );=0D int wxListCtrl_InsertItemWithLabel( TSelf(wxListCtrl) _obj, int ind= ex, TClass(wxString) label, int imageIndex );=0D -TBoolInt wxListCtrl_ScrollList( TSelf(wxListCtrl) _obj, TVector(dx,dy) )= ;=0D +TBool wxListCtrl_ScrollList( TSelf(wxListCtrl) _obj, TVector(dx,dy) )= ;=0D void wxListCtrl_SetBackgroundColour( TSelf(wxListCtrl) _obj, TClass(= wxColour) col );=0D hunk ./wxc/include/wxc_glue.h 2982 -TBoolInt wxListCtrl_SetColumn( TSelf(wxListCtrl) _obj, int col, TClass(w= xListItem) item );=0D -TBoolInt wxListCtrl_SetColumnWidth( TSelf(wxListCtrl) _obj, int col, int= width );=0D +TBool wxListCtrl_SetColumn( TSelf(wxListCtrl) _obj, int col, TClass(w= xListItem) item );=0D +TBool wxListCtrl_SetColumnWidth( TSelf(wxListCtrl) _obj, int col, int= width );=0D int wxListCtrl_SetForegroundColour( TSelf(wxListCtrl) _obj, TClass(= wxColour) col );=0D void wxListCtrl_SetImageList( TSelf(wxListCtrl) _obj, TClass(wxImage= List) imageList, int which );=0D hunk ./wxc/include/wxc_glue.h 2986 -TBoolInt wxListCtrl_SetItem( TSelf(wxListCtrl) _obj, int index, int col,= TClass(wxString) label, int imageId );=0D -TBoolInt wxListCtrl_SetItemData( TSelf(wxListCtrl) _obj, int item, int d= ata );=0D -TBoolInt wxListCtrl_SetItemFromInfo( TSelf(wxListCtrl) _obj, TClass(wxLi= stItem) info );=0D -TBoolInt wxListCtrl_SetItemImage( TSelf(wxListCtrl) _obj, int item, int = image, int selImage );=0D -TBoolInt wxListCtrl_SetItemPosition( TSelf(wxListCtrl) _obj, int item, T= Point(x,y) );=0D -TBoolInt wxListCtrl_SetItemState( TSelf(wxListCtrl) _obj, int item, int = state, int stateMask );=0D +TBool wxListCtrl_SetItem( TSelf(wxListCtrl) _obj, int index, int col,= TClass(wxString) label, int imageId );=0D +TBool wxListCtrl_SetItemData( TSelf(wxListCtrl) _obj, int item, int d= ata );=0D +TBool wxListCtrl_SetItemFromInfo( TSelf(wxListCtrl) _obj, TClass(wxLi= stItem) info );=0D +TBool wxListCtrl_SetItemImage( TSelf(wxListCtrl) _obj, int item, int = image, int selImage );=0D +TBool wxListCtrl_SetItemPosition( TSelf(wxListCtrl) _obj, int item, T= Point(x,y) );=0D +TBool wxListCtrl_SetItemState( TSelf(wxListCtrl) _obj, int item, int = state, int stateMask );=0D void wxListCtrl_SetItemText( TSelf(wxListCtrl) _obj, int item, TClas= s(wxString) str );=0D void wxListCtrl_SetSingleStyle( TSelf(wxListCtrl) _obj, int style, T= Bool add );=0D void wxListCtrl_SetTextColour( TSelf(wxListCtrl) _obj, TClass(wxColo= ur) col );=0D hunk ./wxc/include/wxc_glue.h 2996 void wxListCtrl_SetWindowStyleFlag( TSelf(wxListCtrl) _obj, int styl= e );=0D -TBoolInt wxListCtrl_SortItems( TSelf(wxListCtrl) _obj, void* fn, void* e= if_obj );=0D +TBool wxListCtrl_SortItems( TSelf(wxListCtrl) _obj, void* fn, void* e= if_obj );=0D void wxListCtrl_UpdateStyle( TSelf(wxListCtrl) _obj );=0D =0D /* wxListEvent */=0D hunk ./wxc/include/wxc_glue.h 3073 void wxLogChain_Delete( TSelf(wxLogChain) _obj );=0D TClass(wxLog) wxLogChain_GetOldLog( TSelf(wxLogChain) _obj );=0D TBool wxLogChain_IsPassingMessages( TSelf(wxLogChain) _obj );=0D -void wxLogChain_PassMessages( TSelf(wxLogChain) _obj, TBoolInt bDoPa= ss );=0D +void wxLogChain_PassMessages( TSelf(wxLogChain) _obj, TBool bDoPass = );=0D void wxLogChain_SetLog( TSelf(wxLogChain) _obj, TClass(wxLog) logger= );=0D =0D /* wxLogGUI */=0D hunk ./wxc/include/wxc_glue.h 3255 TBool wxMenuItem_IsEnabled( TSelf(wxMenuItem) _obj );=0D TBool wxMenuItem_IsSeparator( TSelf(wxMenuItem) _obj );=0D TBool wxMenuItem_IsSubMenu( TSelf(wxMenuItem) _obj );=0D -void wxMenuItem_SetCheckable( TSelf(wxMenuItem) _obj, int checkable = );=0D +void wxMenuItem_SetCheckable( TSelf(wxMenuItem) _obj, TBool checkabl= e );=0D void wxMenuItem_SetHelp( TSelf(wxMenuItem) _obj, TClass(wxString) st= r );=0D void wxMenuItem_SetId( TSelf(wxMenuItem) _obj, int id );=0D void wxMenuItem_SetSubMenu( TSelf(wxMenuItem) _obj, TClass(wxMenu) m= enu );=0D hunk ./wxc/include/wxc_glue.h 3271 TClassDefExtend(wxMetafile,wxObject)=0D TClass(wxMetafile) wxMetafile_Create( TClass(wxString) _file );=0D void wxMetafile_Delete( TSelf(wxMetafile) _obj );=0D -TBool wxMetafile_Ok( TSelf(wxMetafile) _obj );=0D +TBool wxMetafile_IsOk( TSelf(wxMetafile) _obj );=0D TBool wxMetafile_Play( TSelf(wxMetafile) _obj, TClass(wxDC) _dc );=0D TBool wxMetafile_SetClipboard( TSelf(wxMetafile) _obj, TSize(width,he= ight) );=0D =0D hunk ./wxc/include/wxc_glue.h 3310 /* wxMouseEvent */=0D TClassDefExtend(wxMouseEvent,wxEvent)=0D TBool wxMouseEvent_AltDown( TSelf(wxMouseEvent) _obj );=0D -int wxMouseEvent_Button( TSelf(wxMouseEvent) _obj, int but );=0D +TBool wxMouseEvent_Button( TSelf(wxMouseEvent) _obj, int but );=0D TBool wxMouseEvent_ButtonDClick( TSelf(wxMouseEvent) _obj, int but );= =0D TBool wxMouseEvent_ButtonDown( TSelf(wxMouseEvent) _obj, int but );= =0D TBool wxMouseEvent_ButtonIsDown( TSelf(wxMouseEvent) _obj, int but );= =0D hunk ./wxc/include/wxc_glue.h 3396 /* wxNavigationKeyEvent */=0D TClassDefExtend(wxNavigationKeyEvent,wxEvent)=0D void* wxNavigationKeyEvent_GetCurrentFocus( TSelf(wxNavigationKeyEven= t) _obj );=0D -int wxNavigationKeyEvent_GetDirection( TSelf(wxNavigationKeyEvent) = _obj );=0D +TBool wxNavigationKeyEvent_GetDirection( TSelf(wxNavigationKeyEvent) = _obj );=0D TBool wxNavigationKeyEvent_IsWindowChange( TSelf(wxNavigationKeyEvent= ) _obj );=0D void wxNavigationKeyEvent_SetCurrentFocus( TSelf(wxNavigationKeyEven= t) _obj, TClass(wxWindow) win );=0D hunk ./wxc/include/wxc_glue.h 3399 -void wxNavigationKeyEvent_SetDirection( TSelf(wxNavigationKeyEvent) = _obj, int bForward );=0D +void wxNavigationKeyEvent_SetDirection( TSelf(wxNavigationKeyEvent) = _obj, TBool bForward );=0D /* void wxNavigationKeyEvent_SetPropagate( TSelf(wxNavigationKeyEven= t) _obj, int bDoIt );*/=0D hunk ./wxc/include/wxc_glue.h 3401 -void wxNavigationKeyEvent_SetWindowChange( TSelf(wxNavigationKeyEven= t) _obj, int bIs );=0D +void wxNavigationKeyEvent_SetWindowChange( TSelf(wxNavigationKeyEven= t) _obj, TBool bIs );=0D int wxNavigationKeyEvent_ShouldPropagate( TSelf(wxNavigationKeyEven= t) _obj );=0D =0D /* wxNewBitmapButton */=0D hunk ./wxc/include/wxc_glue.h 3546 TClass(wxPalette) wxPalette_CreateRGB( int n, void* red, void* green, void= * blue );=0D void wxPalette_Delete( TSelf(wxPalette) _obj );=0D int wxPalette_GetPixel( TSelf(wxPalette) _obj, TColorRGB(red,green,= blue) );=0D -TBoolInt wxPalette_GetRGB( TSelf(wxPalette) _obj, int pixel, void* red, = void* green, void* blue );=0D +TBool wxPalette_GetRGB( TSelf(wxPalette) _obj, int pixel, void* red, = void* green, void* blue );=0D TBool wxPalette_IsEqual( TSelf(wxPalette) _obj, TClass(wxPalette) pal= ette );=0D hunk ./wxc/include/wxc_glue.h 3548 -TBool wxPalette_Ok( TSelf(wxPalette) _obj );=0D +TBool wxPalette_IsOk( TSelf(wxPalette) _obj );=0D =0D /* wxPaletteChangedEvent */=0D TClassDefExtend(wxPaletteChangedEvent,wxEvent)=0D hunk ./wxc/include/wxc_glue.h 3581 int wxPen_GetStyle( TSelf(wxPen) _obj );=0D int wxPen_GetWidth( TSelf(wxPen) _obj );=0D TBool wxPen_IsEqual( TSelf(wxPen) _obj, TClass(wxPen) pen );=0D -TBool wxPen_Ok( TSelf(wxPen) _obj );=0D +TBool wxPen_IsOk( TSelf(wxPen) _obj );=0D void wxPen_SetCap( TSelf(wxPen) _obj, int cap );=0D void wxPen_SetColour( TSelf(wxPen) _obj, TClass(wxColour) col );=0D void wxPen_SetColourSingle( TSelf(wxPen) _obj, TChar r, TChar g, TCh= ar b );=0D hunk ./wxc/include/wxc_glue.h 3747 TClass(wxPrintDialogData) wxPrintDialogData_CreateDefault( );=0D TClass(wxPrintDialogData) wxPrintDialogData_CreateFromData( TClass(wxPrint= Data) printData );=0D void wxPrintDialogData_Delete( TSelf(wxPrintDialogData) _obj );=0D -void wxPrintDialogData_EnableHelp( TSelf(wxPrintDialogData) _obj, TB= oolInt flag ... [truncated message content] |
From: Adam W. <awi...@ma...> - 2009-02-15 17:07:39
|
On Fri, 2009-02-13 at 19:10 +0100, Mads Lindstrøm wrote: > Hi > > Shelarcy's latest patch solves the problem. At least it did for me and > Chris Casinghino (according to a wxhaskell post). > > If you upgrade to the latest version from the Darcs repo, then please > report your results. Thanks for this tip. Indeed, current Darcs wxhaskell works fine with wxgtku 2.8 on MDV Cooker. At least, I tried several of the examples and they worked flawlessly. I have now pushed this build and killed wxgtk 2.6 in MDV. Yay. :) -- adamw |
From: SourceForge.net <no...@so...> - 2009-02-14 14:56:03
|
Bugs item #2599836, was opened at 2009-02-14 15:55 Message generated for change (Tracker Item Submitted) made by Item Submitter You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=536845&aid=2599836&group_id=73133 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: None Group: None Status: Open Resolution: None Priority: 5 Private: No Submitted By: Eric Kow (kowey) Assigned to: Nobody/Anonymous (nobody) Summary: segmentation fault (0.11.0 < wxhaskell < 0.11.1) Initial Comment: I'm using the darcs version of wxhaskell with the wxWidgets 2.8 that ships with Ubuntu Intrepid. darcs get http://code.haskell.org/GenI (this is a hashed repository; it requires a darcs 2 client) cd libGenI cabal configure cabal build cabal install cd .. cd GenI ghc --make Setup ./Setup configure --user ./Setup build ./Setup install cd .. geni -m examples/ej/macros -l examples/ej/lexicon -s exampels/ej/suite Click on 'Generate'. Segmentation fault.. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=536845&aid=2599836&group_id=73133 |
From: Mads L. <mad...@ya...> - 2009-02-13 18:44:11
|
Hi Shelarcy's latest patch solves the problem. At least it did for me and Chris Casinghino (according to a wxhaskell post). If you upgrade to the latest version from the Darcs repo, then please report your results. /Mads Adam Williamson wrote: > Hi, guys. I'm currently working to convert all of Mandriva to wxgtk 2.8 > rather than 2.6. wxhaskell is just about the last wxgtk 2.6 piece. :) > > I read via the wiki that 0.11.0 seems not only to claim to support 2.8, > but to more or less require it: > > "wxHaskell 0.11.x supports wxWidgets 2.8. And wxHaskell doesn't support > wxWidgets 2.6 any more." > > However, when I build 0.11.0 against wxgtk 2.8, then try to run any of > the example programs in the source tree as described on the building > wiki page, I get the exact symptoms described here: > > https://sourceforge.net/tracker/?func=detail&atid=536845&aid=1924535&group_id=73133 > > i.e. three console messages and then nothing - no output. > > I've tested with both unicode and non-unicode wx 2.8 - doesn't make any > difference. Both fail. > > Is this known? If so, can the Wiki page be clarified...and can this be, > well, fixed? :) Thanks! |
From: Adam W. <awi...@ma...> - 2009-02-13 18:25:35
|
On Fri, 2009-02-13 at 19:10 +0100, Mads Lindstrøm wrote: > Hi > > Shelarcy's latest patch solves the problem. At least it did for me and > Chris Casinghino (according to a wxhaskell post). > > If you upgrade to the latest version from the Darcs repo, then please > report your results. Well, since that mail, I actually left Mandriva and now work for Red Hat (but I can still be @mandriva.com...thank you, disorganized business processes!) I still have full commit rights and stuff to Mandriva, and RH don't really mind me working on Mandriva stuff in my spare time as long as I'm not using any Super Sekrit Information, but I just don't have much actual time to do it. So, I will probably try and get to doing this in MDV at some point, but it may not be immediately. Thanks for the heads-up, though. -- adamw |
From: Henk-Jan v. T. <hj...@ch...> - 2009-01-28 13:33:30
|
On Sat, 10 Jan 2009 23:57:00 +0100, Henk-Jan van Tuyl <hj...@ch...> wrote: > > L.S., > > I created a bitmapButton as follows: > >> ok <- bitmapButton f [ on command := close f, picture := >> "button62.gif", text := "Ok" ] > > The picture is not shown in full; how can I get this correct? I found > out that wxPython has wx.BU_EXACTFIT to make the button exactly the size > of the image; is there anything like that in wxHaskell? > I have found that wxHaskell defines wxBU_EXACTFIT, but I have found no way to use it. A way get an exact fit is: > bitmapSize <- WXCore.withBitmapFromFile "button63.gif" > WXCore.bitmapGetSize > bmb <- bitmapButton f [ on command := close f > , picture := "button63.gif" > , outerSize := bitmapSize > ] My suggestion is, that a new attribute is defined for bitmapButton: exactFit :: Attr w Bool When this is set to true, the size of the button should be set to the size of the image. With this new attribute, the above code would become: > bmb <- bitmapButton f [ on command := close f > , picture := "button63.gif" > , exactFit := True > ] -- Regards, Henk-Jan van Tuyl -- http://functor.bamikanarie.com http://Van.Tuyl.eu/ -- |
From: Henk-Jan v. T. <hj...@ch...> - 2009-01-26 10:39:00
|
L.S., The documentation for bitmapButton (wxhaskell-0.11.0/doc/html/Graphics-UI-WX-Controls.html) contains the phrase: Use the image attribute to set the bitmap this should be: Use the 'picture' attribute to set the bitmap Add to the list of instances: 'Pictured'; this is probably also necessary for bitmapButtonRes -- Regards, Henk-Jan van Tuyl -- http://functor.bamikanarie.com http://Van.Tuyl.eu/ -- |
From: shelarcy <she...@gm...> - 2009-01-16 03:29:31
|
Pushed. 2009/1/15 shelarcy <she...@gm...>: > Thu Jan 15 17:06:04 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2009 shelarcy <shelarc= > y...@gm...> > * Fix: managed.cpp causes problem on Linux (Debian and Ubuntu) platform. > = > > MERGED: manage to run managed.cpp on ubuntu > r21 | snmsts | 2009-01-10 05:49:49 +0900 (Sat, 10 1 2009) > from Subversion repository at http://snmsts.dreamhosters.com/wxc > = > > This change probably fixes #1924535. > See http://snmsts.dreamhosters.com/diary/index.cgi?routine=3Done&name=3D2= > 009-01-08-1756 > (Note: This page isn't English page. This page is written in Japanese.) = > -- shelarcy <shelarcy hotmail.co.jp> http://page.freett.com/shelarcy/ |
From: Kido T. <she...@co...> - 2009-01-16 03:19:38
|
Thu Jan 15 03:06:04 EST 2009 shelarcy <she...@gm...> * Fix: managed.cpp causes problem on Linux (Debian and Ubuntu) platform. MERGED: manage to run managed.cpp on ubuntu r21 | snmsts | 2009-01-10 05:49:49 +0900 (Sat, 10 1 2009) from Subversion repository at http://snmsts.dreamhosters.com/wxc This change probably fixes #1924535. See http://snmsts.dreamhosters.com/diary/index.cgi?routine=one&name=2009-01-08-1756 (Note: This page isn't English page. This page is written in Japanese.) M ./wxc/src/managed.cpp -7 +10 View patch online: http://code.haskell.org/wxhaskell/_darcs/patches/20090115080604-c1071-f96f7cedb2e71bdb0ed7c3c490ac14765fa6b226.gz |
From: shelarcy <she...@gm...> - 2009-01-15 08:39:18
|
DarcsURL: C:/home/shelarcy/wxhaskell MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=_" --=_ Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Thu Jan 15 17:06:04 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2009 shelarcy <shelarc= y...@gm...> * Fix: managed.cpp causes problem on Linux (Debian and Ubuntu) platform. = MERGED: manage to run managed.cpp on ubuntu r21 | snmsts | 2009-01-10 05:49:49 +0900 (Sat, 10 1 2009) from Subversion repository at http://snmsts.dreamhosters.com/wxc = This change probably fixes #1924535. See http://snmsts.dreamhosters.com/diary/index.cgi?routine=3Done&name=3D2= 009-01-08-1756 (Note: This page isn't English page. This page is written in Japanese.) = --=_ Content-Type: text/x-darcs-patch; name="fix_-managed_cpp-causes-problem-on-linux-_debian-and-ubuntu_-platform_.dpatch" Content-Transfer-Encoding: quoted-printable Content-Description: A darcs patch for your repository! New patches: [Fix: managed.cpp causes problem on Linux (Debian and Ubuntu) platform. shelarcy <she...@gm...>**20090115080604 = MERGED: manage to run managed.cpp on ubuntu r21 | snmsts | 2009-01-10 05:49:49 +0900 (Sat, 10 1 2009) from Subversion repository at http://snmsts.dreamhosters.com/wxc = This change probably fixes #1924535. See http://snmsts.dreamhosters.com/diary/index.cgi?routine=3Done&name=3D20= 09-01-08-1756 (Note: This page isn't English page. This page is written in Japanese.) = ] { hunk ./wxc/src/managed.cpp 57 /*------------------------------------------------------------------------= ----- Operations --------------------------------------------------------------------------= ---*/ -EWXWEXPORT(void*,wxManagedPtr_GetPtr)( wxManagedPtr* self ) +EWXWEXPORT(void*,wxManagedPtr_GetPtr)(wxManagedPtr* self) { if (self!=3DNULL) return self->GetPtr(); else return NULL; hunk ./wxc/src/managed.cpp 63 } = -EWXWEXPORT(void,wxManagedPtr_NoFinalize)( wxManagedPtr* self ) +EWXWEXPORT(void,wxManagedPtr_NoFinalize)(wxManagedPtr* self) { if (self!=3DNULL) { self->NoFinalize(); hunk ./wxc/src/managed.cpp 70 } } = -EWXWEXPORT(void,wxManagedPtr_Finalize)( wxManagedPtr* self ) +EWXWEXPORT(void,wxManagedPtr_Finalize)(wxManagedPtr* self) { if (self!=3DNULL) { self->Finalize(); hunk ./wxc/src/managed.cpp 77 } } = -EWXWEXPORT(void,wxManagedPtr_Delete)( wxManagedPtr* self ) +EWXWEXPORT(void,wxManagedPtr_Delete)(wxManagedPtr* self) { if (self!=3DNULL) { delete self; hunk ./wxc/src/managed.cpp 84 } } = -static void _cdecl deleteManagedPtr( wxManagedPtr* mp ) +static void _cdecl deleteManagedPtr(wxManagedPtr* mp) { if (mp!=3DNULL) { delete mp; hunk ./wxc/src/managed.cpp 365 /*------------------------------------------------------------------------= ----- Finalize wxCursor --------------------------------------------------------------------------= ---*/ - +wxCursor*** staticsCursor(void) +{ #if (wxVERSION_NUMBER < 2800) static wxCursor* wxNULL_CURSOR =3D &wxNullCursor; = hunk ./wxc/src/managed.cpp 391 ,NULL }; #endif + return staticsCursor; +} = EWXWEXPORT(bool,wxCursor_IsStatic)(wxCursor* obj) { hunk ./wxc/src/managed.cpp 396 - IsStatic(obj,staticsCursor); = + IsStatic(obj,staticsCursor()); = } = static void _cdecl deleteCursor( wxCursor* obj ) } Context: [Add int / C++ bool conversion function in wxc. shelarcy <she...@gm...>**20090113135754 Ignore-this: 83a08a3687437074e79f8c8da12c1626 ] = [Remove unused eljtreectrl.cpp. shelarcy <she...@gm...>**20090113104755 Ignore-this: a64b576e93152ebe3474c368fcfc03e9 ] = [Refactor to use wxString instead of calling WString (wxChar) directly. shelarcy <she...@gm...>**20090113094641 = This change will be easy to add encoding mode. wxWidget 2.9 and 3.0 will support to build UTF-8 mode. If we use wxChar directly, we must change many part to support this build mode. = http://www.wxwidgets.org/develop/roadmap.htm = And we think we get some advantages from this change. utf8-string package only support UTF-8, so we want to use full unicode support we must write UTF-8 <-> UTF-16 <-> UTF-32 conversion layer, or we must support new UTF-8 build mode. = (C++0x and C1x will support new string charactor set types, char16_t and char32_t. Haskell and wxWidgets will support these types if compiler (e.g. gcc, VC) support theirs. If we use abstract layer to use string, we can extend wxHaskell support soonly when compiler and library change.) = ] = [Use wxString_Length function instead of getting wxString twice. shelarcy <she...@gm...>**20090108142643 Ignore-this: 2160aa7a6c9e4b5ed07ea0f17be20332 ] = [Fix typos in previous color's alpha channel support. shelarcy <she...@gm...>**20090107021037 Ignore-this: 710e1ec9472142465ed050c97e49892d ] = [Add experimental alpha channel support to Color type. shelarcy <she...@gm...>**20090106182310 Ignore-this: 6c35ed5d80bed81134a6110cd9cfb60a ] = [Add Word support. shelarcy <she...@gm...>**20090106171139 Ignore-this: 81376472899f15f9724f724b656c251d ] = [Change Color's primitive type from CChar to Word8. shelarcy <she...@gm...>**20090106151818 Ignore-this: a63da969a83ee42f141db3797b824fc8 ] = [Add Word8 and Word32 support. shelarcy <she...@gm...>**20090106141358 Ignore-this: 704189efa0ea7576c4752df6d9a39faf ] = [Bump version number to 0.11.1 shelarcy <she...@gm...>**20090106132911 Ignore-this: d945970996e6812d312a0592c2ff2b6e ] = [Remove unused wxWidgets 2.4 and 2.6's Visual Studio project files. shelarcy <she...@gm...>**20090105012854 Ignore-this: 20cc431e49694e048d1d676170200ed6 ] = [TAG 0.11.0 shelarcy <she...@gm...>**20090102223052] = Patch bundle hash: 9cc4a9dab36041cc986c0564b730fe9633e9e4f2 --=_-- . |
From: Kido T. <she...@co...> - 2009-01-14 03:01:26
|
Thu Jan 8 09:26:43 EST 2009 shelarcy <she...@gm...> * Use wxString_Length function instead of getting wxString twice. Ignore-this: 2160aa7a6c9e4b5ed07ea0f17be20332 M ./wxc/include/wxc.h +1 M ./wxc/src/extra.cpp -5 +34 M ./wxcore/src/Graphics/UI/WXCore/WxcTypes.hs -5 +11 View patch online: http://code.haskell.org/wxhaskell/_darcs/patches/20090108142643-c1071-72583e73e1c83c0d779c1a5b2ef44e41ec6e03d9.gz |
From: Kido T. <she...@co...> - 2009-01-14 03:01:17
|
Tue Jan 13 04:46:41 EST 2009 shelarcy <she...@gm...> * Refactor to use wxString instead of calling WString (wxChar) directly. This change will be easy to add encoding mode. wxWidget 2.9 and 3.0 will support to build UTF-8 mode. If we use wxChar directly, we must change many part to support this build mode. http://www.wxwidgets.org/develop/roadmap.htm And we think we get some advantages from this change. utf8-string package only support UTF-8, so we want to use full unicode support we must write UTF-8 <-> UTF-16 <-> UTF-32 conversion layer, or we must support new UTF-8 build mode. (C++0x and C1x will support new string charactor set types, char16_t and char32_t. Haskell and wxWidgets will support these types if compiler (e.g. gcc, VC) support theirs. If we use abstract layer to use string, we can extend wxHaskell support soonly when compiler and library change.) M ./wx/src/Graphics/UI/WX/Draw.hs -1 +1 M ./wxc/include/printout.h -1 +1 M ./wxc/include/stc.h -1 +1 M ./wxc/include/stc_gen.h -29 +29 M ./wxc/include/wxc.h -39 +39 M ./wxc/include/wxc_glue.h -355 +356 M ./wxc/src/apppath.cpp -9 +9 M ./wxc/src/eljbitmap.cpp -59 +59 M ./wxc/src/eljbusyinfo.cpp -8 +8 M ./wxc/src/eljbutton.cpp -30 +30 M ./wxc/src/eljcheckbox.cpp -6 +6 M ./wxc/src/eljchoice.cpp -21 +22 M ./wxc/src/eljcombobox.cpp -64 +68 M ./wxc/src/eljcommand.cpp -21 +23 M ./wxc/src/eljconfigbase.cpp -75 +85 M ./wxc/src/eljcontrol.cpp -6 +7 M ./wxc/src/eljctxhelp.cpp -16 +17 M ./wxc/src/eljcursor.cpp -3 +3 M ./wxc/src/eljdataformat.cpp -13 +14 M ./wxc/src/eljdatetime.cpp -123 +130 M ./wxc/src/eljdc.cpp -21 +21 M ./wxc/src/eljdcsvg.cpp -7 +7 M ./wxc/src/eljdialog.cpp -9 +9 M ./wxc/src/eljdialup.cpp -24 +24 M ./wxc/src/eljdirdlg.cpp -15 +17 M ./wxc/src/eljdnd.cpp -52 +53 M ./wxc/src/eljevent.cpp -29 +36 M ./wxc/src/eljfiledialog.cpp -34 +39 M ./wxc/src/eljfilehist.cpp -11 +12 M ./wxc/src/eljfindrepldlg.cpp -20 +24 M ./wxc/src/eljfont.cpp -55 +59 M ./wxc/src/eljframe.cpp -54 +54 M ./wxc/src/eljgrid.cpp -351 +338 M ./wxc/src/eljhelpcontroller.cpp -42 +42 M ./wxc/src/eljicnbndl.cpp -7 +7 M ./wxc/src/eljicon.cpp -28 +28 M ./wxc/src/eljimage.cpp -54 +59 M ./wxc/src/eljipc.cpp -34 +34 M ./wxc/src/eljjoystick.cpp -30 +31 M ./wxc/src/eljlistbox.cpp -26 +27 M ./wxc/src/eljlistctrl.cpp -136 +133 M ./wxc/src/eljlocale.cpp -12 +13 M ./wxc/src/eljlog.cpp -35 +36 M ./wxc/src/eljmdi.cpp -15 +15 M ./wxc/src/eljmenu.cpp -102 +109 M ./wxc/src/eljmenubar.cpp -44 +47 M ./wxc/src/eljmessagedialog.cpp -4 +4 M ./wxc/src/eljmime.cpp -55 +47 M ./wxc/src/eljminiframe.cpp -2 +2 M ./wxc/src/eljnotebook.cpp -30 +31 M ./wxc/src/eljprinting.cpp -204 +193 M ./wxc/src/eljradiobox.cpp -24 +28 M ./wxc/src/eljradiobutton.cpp -5 +5 M ./wxc/src/eljrc.cpp -24 +25 M ./wxc/src/eljsingleinst.cpp -4 +4 M ./wxc/src/eljspinctrl.cpp -14 +14 M ./wxc/src/eljstaticbox.cpp -2 +2 M ./wxc/src/eljstatictext.cpp -2 +2 M ./wxc/src/eljstatusbar.cpp -15 +16 M ./wxc/src/eljtextctrl.cpp -49 +51 M ./wxc/src/eljtglbtn.cpp -7 +7 M ./wxc/src/eljtipwnd.cpp -4 +4 M ./wxc/src/eljtoolbar.cpp -43 +45 M ./wxc/src/eljwindow.cpp -242 +242 M ./wxc/src/eljwizard.cpp -16 +16 M ./wxc/src/extra.cpp -209 +219 M ./wxc/src/printout.cpp -33 +32 M ./wxc/src/stc.cpp -85 +85 M ./wxc/src/stc_gen.cpp -348 +348 M ./wxc/src/taskbaricon.cpp -5 +5 M ./wxc/src/treectrl.cpp -114 +115 M ./wxc/src/wrapper.cpp -117 +124 M ./wxcore/src/Graphics/UI/WXCore/Dialogs.hs -1 +1 M ./wxcore/src/Graphics/UI/WXCore/Draw.hs -1 +1 View patch online: http://code.haskell.org/wxhaskell/_darcs/patches/20090113094641-c1071-f4d0612f18dd83dfff40bc66d711a88345265c62.gz |
From: Kido T. <she...@co...> - 2009-01-14 03:01:08
|
Tue Jan 13 08:57:54 EST 2009 shelarcy <she...@gm...> * Add int / C++ bool conversion function in wxc. Ignore-this: 83a08a3687437074e79f8c8da12c1626 M ./makefile -1 +2 A ./wxc/src/std.cpp M ./wxc/wxc-2.8.dsp +4 View patch online: http://code.haskell.org/wxhaskell/_darcs/patches/20090113135754-c1071-4490f7e055d681241db9105819f42979beda94fa.gz |
From: Kido T. <she...@co...> - 2009-01-14 03:01:07
|
Tue Jan 13 05:47:55 EST 2009 shelarcy <she...@gm...> * Remove unused eljtreectrl.cpp. Ignore-this: a64b576e93152ebe3474c368fcfc03e9 M ./makefile -3 R ./wxc/src/eljtreectrl.cpp View patch online: http://code.haskell.org/wxhaskell/_darcs/patches/20090113104755-c1071-06ec3c6ebc085baf93315ba834703e1e02ce972f.gz |
From: shelarcy <she...@gm...> - 2009-01-14 02:51:58
|
Pushed. These patches are very big. I hope that this change works well in your environment. And I have a plan to commit big patch once again. 2009/1/13 shelarcy <she...@gm...>: > Thu Jan 8 23:26:43 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2009 shelarcy <shelarc= > y...@gm...> > * Use wxString_Length function instead of getting wxString twice. > > Tue Jan 13 18:46:41 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2009 shelarcy <shelarc= > y...@gm...> > * Refactor to use wxString instead of calling WString (wxChar) directly. > = > > This change will be easy to add encoding mode. wxWidget 2.9 and 3.0 will > support to build UTF-8 mode. If we use wxChar directly, we must change > many part to support this build mode. > = > > http://www.wxwidgets.org/develop/roadmap.htm > = > > And we think we get some advantages from this change. utf8-string package > only support UTF-8, so we want to use full unicode support we must write > UTF-8 <-> UTF-16 <-> UTF-32 conversion layer, or we must support new UTF-= > 8 > build mode. > = > > (C++0x and C1x will support new string charactor set types, char16_t and > char32_t. Haskell and wxWidgets will support these types if compiler > (e.g. gcc, VC) support theirs. If we use abstract layer to use string, > we can extend wxHaskell support soonly when compiler and library change.)= > = > > > Tue Jan 13 19:47:55 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2009 shelarcy <shelarc= > y...@gm...> > * Remove unused eljtreectrl.cpp. > > Tue Jan 13 22:57:54 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2009 shelarcy <shelarc= > y...@gm...> > * Add int / C++ bool conversion function in wxc. -- shelarcy <shelarcy hotmail.co.jp> http://page.freett.com/shelarcy/ |
From: shelarcy <she...@gm...> - 2009-01-13 14:19:48
|
DarcsURL: C:/home/shelarcy/wxhaskell MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=_" --=_ Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Thu Jan 8 23:26:43 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2009 shelarcy <shelarc= y...@gm...> * Use wxString_Length function instead of getting wxString twice. Tue Jan 13 18:46:41 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2009 shelarcy <shelarc= y...@gm...> * Refactor to use wxString instead of calling WString (wxChar) directly. = This change will be easy to add encoding mode. wxWidget 2.9 and 3.0 will support to build UTF-8 mode. If we use wxChar directly, we must change many part to support this build mode. = http://www.wxwidgets.org/develop/roadmap.htm = And we think we get some advantages from this change. utf8-string package only support UTF-8, so we want to use full unicode support we must write UTF-8 <-> UTF-16 <-> UTF-32 conversion layer, or we must support new UTF-= 8 build mode. = (C++0x and C1x will support new string charactor set types, char16_t and char32_t. Haskell and wxWidgets will support these types if compiler (e.g. gcc, VC) support theirs. If we use abstract layer to use string, we can extend wxHaskell support soonly when compiler and library change.)= = Tue Jan 13 19:47:55 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2009 shelarcy <shelarc= y...@gm...> * Remove unused eljtreectrl.cpp. Tue Jan 13 22:57:54 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2009 shelarcy <shelarc= y...@gm...> * Add int / C++ bool conversion function in wxc. --=_ Content-Type: text/x-darcs-patch; name="use-wxstring_length-function-instead-of-getting-wxstring-twice_.dpatch" Content-Transfer-Encoding: quoted-printable Content-Description: A darcs patch for your repository! New patches: [Use wxString_Length function instead of getting wxString twice. shelarcy <she...@gm...>**20090108142643 Ignore-this: 2160aa7a6c9e4b5ed07ea0f17be20332 ] { hunk ./wxc/include/wxc.h 100 TClass(wxString) wxString_CreateLen( TString buffer, int len );=0D void wxString_Delete( TSelf(wxString) s );=0D TStringLen wxString_GetString( TSelf(wxString) s, TStringOut buffer = );=0D +size_t wxString_Length( TSelf(wxString) s );=0D = = /* menu */ hunk ./wxc/src/extra.cpp 1481 /*------------------------------------------------------------------------= ----- String --------------------------------------------------------------------------= ---*/ -EWXWEXPORT(wxString*, wxString_Create)( wxChar* buffer ) +typedef char utf8char; + +EWXWEXPORT(wxString*,wxString_Create)(wxChar* buffer) { return new wxString(buffer); } hunk ./wxc/src/extra.cpp 1488 = -EWXWEXPORT(wxString*, wxString_CreateLen)( wxChar* buffer, int len ) +EWXWEXPORT(wxString*,wxString_CreateUTF8)(utf8char* buffer) +{ + return new wxString (buffer,wxConvUTF8); +} + +EWXWEXPORT(wxString*,wxString_CreateLen)(wxChar* buffer,int len) { return new wxString(buffer,len); } hunk ./wxc/src/extra.cpp 1498 = -EWXWEXPORT(void,wxString_Delete)( wxString* s ) +EWXWEXPORT(void,wxString_Delete)(wxString* s) { delete s; } hunk ./wxc/src/extra.cpp 1503 = -EWXWEXPORT(int,wxString_GetString)( wxString* s, wxChar* buffer ) +EWXWEXPORT(int,wxString_GetString)(wxString* s,wxChar* buffer) { if (buffer) memcpy (buffer, s->c_str(), s->Length() * sizeof(wxChar)); return s->Length(); hunk ./wxc/src/extra.cpp 1507 -} = +} + +EWXWEXPORT(size_t,wxString_Length)(wxString* s) +{ + return s->length(); +} + +EWXWEXPORT(wxCharBuffer*,wxString_GetUtf8)(wxString* s) +{ + wxCharBuffer *cb =3D new wxCharBuffer; + *cb =3D s->utf8_str(); + return cb; +} + +EWXWEXPORT(utf8char*,wxCharBuffer_DataUtf8)(wxCharBuffer* cb) +{ + return (utf8char*)cb->data(); +} + +EWXWEXPORT(void,wxCharBuffer_Delete)(wxCharBuffer* cb) +{ + delete cb; +} = /*------------------------------------------------------------------------= ----- classinfo hunk ./wxcore/src/Graphics/UI/WXCore/WxcTypes.hs 1138 withManagedStringResult :: IO (Ptr (TWxString a)) -> IO String withManagedStringResult io =3D do wxs <- io - s <- withWStringResult (wxString_GetString wxs) + len <- wxString_Length wxs + s <- if (len<=3D0) + then return "" + else withCWString (replicate (fromCInt len) ' ') $ \cstr -= > + do wxString_GetString wxs cstr + peekCWStringLen (cstr, fromCInt len) wxString_Delete wxs return s = hunk ./wxcore/src/Graphics/UI/WXCore/WxcTypes.hs 1148 = -foreign import ccall "wxString_Create" wxString_Create :: Ptr CWchar= -> IO (Ptr (TWxString a)) -foreign import ccall "wxString_CreateLen" wxString_CreateLen :: Ptr CWchar= -> CInt -> IO (Ptr (TWxString a)) -foreign import ccall "wxString_Delete" wxString_Delete :: Ptr (TWxSt= ring a) -> IO () -foreign import ccall "wxString_GetString" wxString_GetString :: Ptr (TWxSt= ring a) -> Ptr CWchar -> IO CInt +foreign import ccall wxString_Create :: Ptr CWchar -> IO (Ptr (TWxStrin= g a)) +foreign import ccall wxString_CreateLen :: Ptr CWchar -> CInt -> IO (Ptr (= TWxString a)) +foreign import ccall wxString_Delete :: Ptr (TWxString a) -> IO () +foreign import ccall wxString_GetString :: Ptr (TWxString a) -> Ptr CWchar= -> IO CInt +foreign import ccall wxString_Length :: Ptr (TWxString a) -> IO CInt = = {-------------------------------------------------------------------------= ---------------- } [Refactor to use wxString instead of calling WString (wxChar) directly. shelarcy <she...@gm...>**20090113094641 = This change will be easy to add encoding mode. wxWidget 2.9 and 3.0 will support to build UTF-8 mode. If we use wxChar directly, we must change many part to support this build mode. = http://www.wxwidgets.org/develop/roadmap.htm = And we think we get some advantages from this change. utf8-string package only support UTF-8, so we want to use full unicode support we must write UTF-8 <-> UTF-16 <-> UTF-32 conversion layer, or we must support new UTF-8 build mode. = (C++0x and C1x will support new string charactor set types, char16_t and char32_t. Haskell and wxWidgets will support these types if compiler (e.g. gcc, VC) support theirs. If we use abstract layer to use string, we can extend wxHaskell support soonly when compiler and library change.) = ] { hunk ./wx/src/Graphics/UI/WX/Draw.hs 209 drawBitmap dc bitmap point transparent props =3D if bitmap =3D=3D nullBitmap || objectIsNull bitmap = then return () - else do ok <- bitmapOk bitmap + else do ok <- bitmapIsOk bitmap if not ok = then return () else dcWith dc props (dcDrawBitmap dc bitmap point transpare= nt) hunk ./wxc/include/printout.h 20 void wxPrintout_GetPPIScreen( TSelf(wxPrintout) _obj, TPointOutVoid(= _x,_y) );=0D void wxPrintout_GetPageSizeMM( TSelf(wxPrintout) _obj, TSizeOutVoid(= _w,_h) );=0D void wxPrintout_GetPageSizePixels( TSelf(wxPrintout) _obj, TSizeOutV= oid(_w,_h) );=0D -TStringLen wxPrintout_GetTitle( TSelf(wxPrintout) _obj, TStringOutVoid _bu= f );=0D +TClass(wxString) wxPrintout_GetTitle( TSelf(wxPrintout) _obj );=0D TBool wxPrintout_IsPreview( TSelf(wxPrintout) _obj );=0D void wxPrintout_SetDC( TSelf(wxPrintout) _obj, TClass(wxDC) dc );=0D void wxPrintout_SetIsPreview( TSelf(wxPrintout) _obj, TBoolInt p );= =0D hunk ./wxc/include/stc.h 6 = /* wxStyledTextCtrl */ TClassDefExtend(wxStyledTextCtrl,wxControl) -TClass(wxStyledTextCtrl) wxStyledTextCtrl_Create( TClass(wxWindow) _prt, i= nt _id, TString _txt, TRect(_lft,_top,_wdt,_hgt), int style ); +TClass(wxStyledTextCtrl) wxStyledTextCtrl_Create( TClass(wxWindow) _prt, i= nt _id, TClass(wxString) _txt, TRect(_lft,_top,_wdt,_hgt), int style ); = = /* tricky handwritten functions */ hunk ./wxc/include/stc_gen.h 1 -void wxStyledTextCtrl_AddText(TSelf(wxStyledTextCtrl) _obj, TString text);= =0D +void wxStyledTextCtrl_AddText(TSelf(wxStyledTextCtrl) _obj, TClass(wxStrin= g) text);=0D =0D void wxStyledTextCtrl_AddStyledText(TSelf(wxStyledTextCtrl) _obj, TClass(w= xMemoryBuffer) data);=0D =0D hunk ./wxc/include/stc_gen.h 5 -void wxStyledTextCtrl_InsertText(TSelf(wxStyledTextCtrl) _obj, int pos, TS= tring text);=0D +void wxStyledTextCtrl_InsertText(TSelf(wxStyledTextCtrl) _obj, int pos, TC= lass(wxString) text);=0D =0D void wxStyledTextCtrl_ClearAll(TSelf(wxStyledTextCtrl) _obj);=0D =0D hunk ./wxc/include/stc_gen.h 121 =0D void wxStyledTextCtrl_StyleSetSize(TSelf(wxStyledTextCtrl) _obj, int style= , int sizePoints);=0D =0D -void wxStyledTextCtrl_StyleSetFaceName(TSelf(wxStyledTextCtrl) _obj, int s= tyle, TString fontName);=0D +void wxStyledTextCtrl_StyleSetFaceName(TSelf(wxStyledTextCtrl) _obj, int s= tyle, TClass(wxString) fontName);=0D =0D void wxStyledTextCtrl_StyleSetEOLFilled(TSelf(wxStyledTextCtrl) _obj, int = style, TBool filled);=0D =0D hunk ./wxc/include/stc_gen.h 147 =0D void wxStyledTextCtrl_CmdKeyClearAll(TSelf(wxStyledTextCtrl) _obj);=0D =0D -void wxStyledTextCtrl_SetStyleBytes(TSelf(wxStyledTextCtrl) _obj, int leng= th, TString styleBytes);=0D +void wxStyledTextCtrl_SetStyleBytes(TSelf(wxStyledTextCtrl) _obj, int leng= th, char* styleBytes);=0D =0D void wxStyledTextCtrl_StyleSetVisible(TSelf(wxStyledTextCtrl) _obj, int st= yle, TBool visible);=0D =0D hunk ./wxc/include/stc_gen.h 155 =0D void wxStyledTextCtrl_SetCaretPeriod(TSelf(wxStyledTextCtrl) _obj, int per= iodMilliseconds);=0D =0D -void wxStyledTextCtrl_SetWordChars(TSelf(wxStyledTextCtrl) _obj, TString c= haracters);=0D +void wxStyledTextCtrl_SetWordChars(TSelf(wxStyledTextCtrl) _obj, TClass(wx= String) characters);=0D =0D void wxStyledTextCtrl_BeginUndoAction(TSelf(wxStyledTextCtrl) _obj);=0D =0D hunk ./wxc/include/stc_gen.h 187 =0D void wxStyledTextCtrl_StyleSetChangeable(TSelf(wxStyledTextCtrl) _obj, int= style, TBool changeable);=0D =0D -void wxStyledTextCtrl_AutoCompShow(TSelf(wxStyledTextCtrl) _obj, int lenEn= tered, TString itemList);=0D +void wxStyledTextCtrl_AutoCompShow(TSelf(wxStyledTextCtrl) _obj, int lenEn= tered, TClass(wxString) itemList);=0D =0D void wxStyledTextCtrl_AutoCompCancel(TSelf(wxStyledTextCtrl) _obj);=0D =0D hunk ./wxc/include/stc_gen.h 197 =0D void wxStyledTextCtrl_AutoCompComplete(TSelf(wxStyledTextCtrl) _obj);=0D =0D -void wxStyledTextCtrl_AutoCompStops(TSelf(wxStyledTextCtrl) _obj, TString = characterSet);=0D +void wxStyledTextCtrl_AutoCompStops(TSelf(wxStyledTextCtrl) _obj, TClass(w= xString) characterSet);=0D =0D void wxStyledTextCtrl_AutoCompSetSeparator(TSelf(wxStyledTextCtrl) _obj, i= nt separatorCharacter);=0D =0D hunk ./wxc/include/stc_gen.h 203 int wxStyledTextCtrl_AutoCompGetSeparator(TSelf(wxStyledTextCtrl) _obj);= =0D =0D -void wxStyledTextCtrl_AutoCompSelect(TSelf(wxStyledTextCtrl) _obj, TString= text);=0D +void wxStyledTextCtrl_AutoCompSelect(TSelf(wxStyledTextCtrl) _obj, TClass(= wxString) text);=0D =0D void wxStyledTextCtrl_AutoCompSetCancelAtStart(TSelf(wxStyledTextCtrl) _ob= j, TBool cancel);=0D =0D hunk ./wxc/include/stc_gen.h 209 TBool wxStyledTextCtrl_AutoCompGetCancelAtStart(TSelf(wxStyledTextCtrl) _o= bj);=0D =0D -void wxStyledTextCtrl_AutoCompSetFillUps(TSelf(wxStyledTextCtrl) _obj, TSt= ring characterSet);=0D +void wxStyledTextCtrl_AutoCompSetFillUps(TSelf(wxStyledTextCtrl) _obj, TCl= ass(wxString) characterSet);=0D =0D void wxStyledTextCtrl_AutoCompSetChooseSingle(TSelf(wxStyledTextCtrl) _obj= , TBool chooseSingle);=0D =0D hunk ./wxc/include/stc_gen.h 219 =0D TBool wxStyledTextCtrl_AutoCompGetIgnoreCase(TSelf(wxStyledTextCtrl) _obj)= ;=0D =0D -void wxStyledTextCtrl_UserListShow(TSelf(wxStyledTextCtrl) _obj, int listT= ype, TString itemList);=0D +void wxStyledTextCtrl_UserListShow(TSelf(wxStyledTextCtrl) _obj, int listT= ype, TClass(wxString) itemList);=0D =0D void wxStyledTextCtrl_AutoCompSetAutoHide(TSelf(wxStyledTextCtrl) _obj, TB= ool autoHide);=0D =0D hunk ./wxc/include/stc_gen.h 289 =0D int wxStyledTextCtrl_GetPrintColourMode(TSelf(wxStyledTextCtrl) _obj);=0D =0D -int wxStyledTextCtrl_FindText(TSelf(wxStyledTextCtrl) _obj, int minPos, in= t maxPos, TString text, int flags);=0D +int wxStyledTextCtrl_FindText(TSelf(wxStyledTextCtrl) _obj, int minPos, in= t maxPos, TClass(wxString) text, int flags);=0D =0D int wxStyledTextCtrl_FormatRange(TSelf(wxStyledTextCtrl) _obj, TBool doDra= w, int startPos, int endPos, TClass(wxDC) draw, TClass(wxDC) target, TClass= (wxRect) renderRect, TClass(wxRect) pageRect);=0D =0D hunk ./wxc/include/stc_gen.h 319 =0D void wxStyledTextCtrl_EnsureCaretVisible(TSelf(wxStyledTextCtrl) _obj);=0D =0D -void wxStyledTextCtrl_ReplaceSelection(TSelf(wxStyledTextCtrl) _obj, TStri= ng text);=0D +void wxStyledTextCtrl_ReplaceSelection(TSelf(wxStyledTextCtrl) _obj, TClas= s(wxString) text);=0D =0D void wxStyledTextCtrl_SetReadOnly(TSelf(wxStyledTextCtrl) _obj, TBool read= Only);=0D =0D hunk ./wxc/include/stc_gen.h 339 =0D void wxStyledTextCtrl_Clear(TSelf(wxStyledTextCtrl) _obj);=0D =0D -void wxStyledTextCtrl_SetText(TSelf(wxStyledTextCtrl) _obj, TString text);= =0D +void wxStyledTextCtrl_SetText(TSelf(wxStyledTextCtrl) _obj, TClass(wxStrin= g) text);=0D =0D int wxStyledTextCtrl_GetTextLength(TSelf(wxStyledTextCtrl) _obj);=0D =0D hunk ./wxc/include/stc_gen.h 359 =0D int wxStyledTextCtrl_GetTargetEnd(TSelf(wxStyledTextCtrl) _obj);=0D =0D -int wxStyledTextCtrl_ReplaceTarget(TSelf(wxStyledTextCtrl) _obj, TString t= ext);=0D +int wxStyledTextCtrl_ReplaceTarget(TSelf(wxStyledTextCtrl) _obj, TClass(wx= String) text);=0D =0D hunk ./wxc/include/stc_gen.h 361 -int wxStyledTextCtrl_ReplaceTargetRE(TSelf(wxStyledTextCtrl) _obj, TString= text);=0D +int wxStyledTextCtrl_ReplaceTargetRE(TSelf(wxStyledTextCtrl) _obj, TClass(= wxString) text);=0D =0D hunk ./wxc/include/stc_gen.h 363 -int wxStyledTextCtrl_SearchInTarget(TSelf(wxStyledTextCtrl) _obj, TString = text);=0D +int wxStyledTextCtrl_SearchInTarget(TSelf(wxStyledTextCtrl) _obj, TClass(w= xString) text);=0D =0D void wxStyledTextCtrl_SetSearchFlags(TSelf(wxStyledTextCtrl) _obj, int fla= gs);=0D =0D hunk ./wxc/include/stc_gen.h 369 int wxStyledTextCtrl_GetSearchFlags(TSelf(wxStyledTextCtrl) _obj);=0D =0D -void wxStyledTextCtrl_CallTipShow(TSelf(wxStyledTextCtrl) _obj, int pos, T= String definition);=0D +void wxStyledTextCtrl_CallTipShow(TSelf(wxStyledTextCtrl) _obj, int pos, T= Class(wxString) definition);=0D =0D void wxStyledTextCtrl_CallTipCancel(TSelf(wxStyledTextCtrl) _obj);=0D =0D hunk ./wxc/include/stc_gen.h 443 =0D int wxStyledTextCtrl_GetScrollWidth(TSelf(wxStyledTextCtrl) _obj);=0D =0D -int wxStyledTextCtrl_TextWidth(TSelf(wxStyledTextCtrl) _obj, int style, TS= tring text);=0D +int wxStyledTextCtrl_TextWidth(TSelf(wxStyledTextCtrl) _obj, int style, TC= lass(wxString) text);=0D =0D void wxStyledTextCtrl_SetEndAtLastLine(TSelf(wxStyledTextCtrl) _obj, TBool= endAtLastLine);=0D =0D hunk ./wxc/include/stc_gen.h 455 =0D TBool wxStyledTextCtrl_GetUseVerticalScrollBar(TSelf(wxStyledTextCtrl) _ob= j);=0D =0D -void wxStyledTextCtrl_AppendText(TSelf(wxStyledTextCtrl) _obj, TString tex= t);=0D +void wxStyledTextCtrl_AppendText(TSelf(wxStyledTextCtrl) _obj, TClass(wxSt= ring) text);=0D =0D TBool wxStyledTextCtrl_GetTwoPhaseDraw(TSelf(wxStyledTextCtrl) _obj);=0D =0D hunk ./wxc/include/stc_gen.h 513 =0D void wxStyledTextCtrl_SearchAnchor(TSelf(wxStyledTextCtrl) _obj);=0D =0D -int wxStyledTextCtrl_SearchNext(TSelf(wxStyledTextCtrl) _obj, int flags, T= String text);=0D +int wxStyledTextCtrl_SearchNext(TSelf(wxStyledTextCtrl) _obj, int flags, T= Class(wxString) text);=0D =0D hunk ./wxc/include/stc_gen.h 515 -int wxStyledTextCtrl_SearchPrev(TSelf(wxStyledTextCtrl) _obj, int flags, T= String text);=0D +int wxStyledTextCtrl_SearchPrev(TSelf(wxStyledTextCtrl) _obj, int flags, T= Class(wxString) text);=0D =0D int wxStyledTextCtrl_LinesOnScreen(TSelf(wxStyledTextCtrl) _obj);=0D =0D hunk ./wxc/include/stc_gen.h 593 =0D void wxStyledTextCtrl_CopyRange(TSelf(wxStyledTextCtrl) _obj, int start, i= nt end);=0D =0D -void wxStyledTextCtrl_CopyText(TSelf(wxStyledTextCtrl) _obj, int length, T= String text);=0D +void wxStyledTextCtrl_CopyText(TSelf(wxStyledTextCtrl) _obj, int length, T= Class(wxString) text);=0D =0D void wxStyledTextCtrl_StartRecord(TSelf(wxStyledTextCtrl) _obj);=0D =0D hunk ./wxc/include/stc_gen.h 605 =0D void wxStyledTextCtrl_Colourise(TSelf(wxStyledTextCtrl) _obj, int start, i= nt end);=0D =0D -void wxStyledTextCtrl_SetProperty(TSelf(wxStyledTextCtrl) _obj, TString ke= y, TString value);=0D +void wxStyledTextCtrl_SetProperty(TSelf(wxStyledTextCtrl) _obj, TClass(wxS= tring) key, TClass(wxString) value);=0D =0D hunk ./wxc/include/stc_gen.h 607 -void wxStyledTextCtrl_SetKeyWords(TSelf(wxStyledTextCtrl) _obj, int keywor= dSet, TString keyWords);=0D +void wxStyledTextCtrl_SetKeyWords(TSelf(wxStyledTextCtrl) _obj, int keywor= dSet, TClass(wxString) keyWords);=0D =0D hunk ./wxc/include/stc_gen.h 609 -void wxStyledTextCtrl_SetLexerLanguage(TSelf(wxStyledTextCtrl) _obj, TStri= ng language);=0D +void wxStyledTextCtrl_SetLexerLanguage(TSelf(wxStyledTextCtrl) _obj, TClas= s(wxString) language);=0D =0D int wxStyledTextCtrl_GetCurrentLine(TSelf(wxStyledTextCtrl) _obj);=0D =0D hunk ./wxc/include/stc_gen.h 613 -void wxStyledTextCtrl_StyleSetSpec(TSelf(wxStyledTextCtrl) _obj, int style= Num, TString spec);=0D +void wxStyledTextCtrl_StyleSetSpec(TSelf(wxStyledTextCtrl) _obj, int style= Num, TClass(wxString) spec);=0D =0D void wxStyledTextCtrl_StyleSetFont(TSelf(wxStyledTextCtrl) _obj, int style= Num, TClass(wxFont) font);=0D =0D hunk ./wxc/include/stc_gen.h 617 -void wxStyledTextCtrl_StyleSetFontAttr(TSelf(wxStyledTextCtrl) _obj, int s= tyleNum, int size, TString faceName, TBool bold, TBool italic, TBool underl= ine);=0D +void wxStyledTextCtrl_StyleSetFontAttr(TSelf(wxStyledTextCtrl) _obj, int s= tyleNum, int size, TClass(wxString) faceName, TBool bold, TBool italic, TBo= ol underline);=0D =0D void wxStyledTextCtrl_CmdKeyExecute(TSelf(wxStyledTextCtrl) _obj, int cmd)= ;=0D =0D hunk ./wxc/include/stc_gen.h 637 =0D void wxStyledTextCtrl_SetLastKeydownProcessed(TSelf(wxStyledTextCtrl) _obj= , TBool val);=0D =0D -TBool wxStyledTextCtrl_SaveFile(TSelf(wxStyledTextCtrl) _obj, TString file= name);=0D +TBool wxStyledTextCtrl_SaveFile(TSelf(wxStyledTextCtrl) _obj, TClass(wxStr= ing) filename);=0D =0D hunk ./wxc/include/stc_gen.h 639 -TBool wxStyledTextCtrl_LoadFile(TSelf(wxStyledTextCtrl) _obj, TString file= name);=0D +TBool wxStyledTextCtrl_LoadFile(TSelf(wxStyledTextCtrl) _obj, TClass(wxStr= ing) filename);=0D hunk ./wxc/include/wxc.h 66 void wxObject_Delete( TSelf(wxObject) obj );=0D = /* Frame */ -TStringLen wxFrame_GetTitle( TSelf(wxFrame) _obj, TStringOutVoid _buf ); -void wxFrame_SetTitle( TSelf(wxFrame) _frame, TString _txt ); +TClass(wxString) wxFrame_GetTitle( TSelf(wxFrame) _obj ); +void wxFrame_SetTitle( TSelf(wxFrame) _frame, TClass(wxString) _txt= ); TBool wxFrame_SetShape( TSelf(wxFrame) self, TClass(wxRegion) region= );=0D TBool wxFrame_ShowFullScreen( TSelf(wxFrame) self, TBool show, int s= tyle);=0D TBool wxFrame_IsFullScreen( TSelf(wxFrame) self );=0D hunk ./wxc/include/wxc.h 145 void wxTreeEvent_Allow( TSelf(wxTreeEvent) _obj);=0D =0D TClass(wxTreeCtrl) wxTreeCtrl_Create2( TClass(wxWindow) _prt, int _id, TRe= ct(_lft,_top,_wdt,_hgt), int _stl );=0D -void wxTreeCtrl_InsertItem2( TSelf(wxTreeCtrl) _obj, TClass(wxWindow) pa= rent, TClass(wxTreeItemId) idPrevious, TStringVoid text, int image, int sel= ectedImage, TClass(wxClosure) closure, TClassRef(wxTreeItemId) _item );=0D -void wxTreeCtrl_InsertItemByIndex2( TSelf(wxTreeCtrl) _obj, TClass(wxWin= dow) parent, int index, TStringVoid text, int image, int selectedImage, TCl= ass(wxClosure) closure, TClassRef(wxTreeItemId) _item );=0D +void wxTreeCtrl_InsertItem2( TSelf(wxTreeCtrl) _obj, TClass(wxWindow) pa= rent, TClass(wxTreeItemId) idPrevious, TClass(wxString) text, int image, in= t selectedImage, TClass(wxClosure) closure, TClassRef(wxTreeItemId) _item )= ;=0D +void wxTreeCtrl_InsertItemByIndex2( TSelf(wxTreeCtrl) _obj, TClass(wxWin= dow) parent, int index, TClass(wxString) text, int image, int selectedImage= , TClass(wxClosure) closure, TClassRef(wxTreeItemId) _item );=0D TClass(wxClosure) wxTreeCtrl_GetItemClientClosure( TSelf(wxTreeCtrl) _obj= , TClass(wxTreeItemId) item );=0D void wxTreeCtrl_SetItemClientClosure( TSelf(wxTreeCtrl) _obj, TClass(wxT= reeItemId) item, TClass(wxClosure) closure );=0D void wxTreeCtrl_AssignImageList(TSelf(wxTreeCtrl) _obj, TClass(wxImageLi= st) imageList );=0D hunk ./wxc/include/wxc.h 171 = /* wxClassInfo */ TClassDef(wxClassInfo) -TClass(wxClassInfo) wxClassInfo_FindClass( TString _txt ); -TStringLen wxClassInfo_GetBaseClassName1( TSelf(wxClassInfo) _obj, TStrin= gOutVoid _buf ); -TStringLen wxClassInfo_GetBaseClassName2( TSelf(wxClassInfo) _obj, TStrin= gOutVoid _buf ); -TStringLen wxClassInfo_GetClassNameEx( TSelf(wxClassInfo) _obj, TStringOu= tVoid _buf ); +TClass(wxClassInfo) wxClassInfo_FindClass( TClass(wxString) _txt ); +TClass(wxString) wxClassInfo_GetBaseClassName1( TSelf(wxClassInfo) _obj ); +TClass(wxString) wxClassInfo_GetBaseClassName2( TSelf(wxClassInfo) _obj ); +TClass(wxString) wxClassInfo_GetClassNameEx( TSelf(wxClassInfo) _obj ); int wxClassInfo_GetSize( TSelf(wxClassInfo) _obj ); TBool wxClassInfo_IsKindOfEx( TSelf(wxClassInfo) _obj, TClass(wxClas= sInfo) classInfo ); = hunk ./wxc/include/wxc.h 188 TClass(wxClosure) wxTimerEx_GetClosure( TSelf(wxTimerEx) _obj ); = /* Menu */=0D -void wxMenu_AppendRadioItem( TSelf(wxMenu) self, int id, TString text, TS= tring help);=0D +void wxMenu_AppendRadioItem( TSelf(wxMenu) self, int id, TClass(wxString)= text, TClass(wxString) help);=0D =0D =0D /* Menu Item */ hunk ./wxc/include/wxc.h 193 TClass(wxMenuItem) wxMenuItem_CreateSeparator(); -TClass(wxMenuItem) wxMenuItem_CreateEx(int id, TString label, TString hel= p, int itemkind, TClass(wxMenu) submenu); +TClass(wxMenuItem) wxMenuItem_CreateEx(int id, TClass(wxString) label, TC= lass(wxString) help, int itemkind, TClass(wxMenu) submenu); =0D /* Toolbar */=0D hunk ./wxc/include/wxc.h 196 -void wxToolBar_AddTool2( TSelf(wxToolBar) _obj, int toolId, TString label,= TClass(wxBitmap) bmp, TClass(wxBitmap) bmpDisabled, int itemKind, TString = shortHelp, TString longHelp );=0D +void wxToolBar_AddTool2( TSelf(wxToolBar) _obj, int toolId, TClass(wxStrin= g) label, TClass(wxBitmap) bmp, TClass(wxBitmap) bmpDisabled, int itemKind,= TClass(wxString) shortHelp, TClass(wxString) longHelp );=0D = /* Progress dialog */ hunk ./wxc/include/wxc.h 199 -TClass(wxProgressDialog) wxProgressDialog_Create( TString title, TString m= essage, int max, TClass(wxWindow) parent, int style ); +TClass(wxProgressDialog) wxProgressDialog_Create( TClass(wxString) title, = TClass(wxString) message, int max, TClass(wxWindow) parent, int style ); int wxProgressDialog_Update(TSelf(wxProgressDialog) obj, int value ); hunk ./wxc/include/wxc.h 201 -int wxProgressDialog_UpdateWithMessage( TSelf(wxProgressDialog) obj, int = value, TString message ); +int wxProgressDialog_UpdateWithMessage( TSelf(wxProgressDialog) obj, int = value, TClass(wxString) message ); void wxProgressDialog_Resume( TSelf(wxProgressDialog) obj ); = /** Get the version number of wxWindows as a number composed of the major = version times 1000, minor version times 100, and the release number. For ex= ample, release 2.1.15 becomes 2115. */ hunk ./wxc/include/wxc.h 253 = /* html window */ TClassDefExtend(wxcHtmlWindow,wxHtmlWindow) -TClass(wxcHtmlWindow) wxcHtmlWindow_Create( TClass(wxWindow) _prt, int _id= , TRect(_lft,_top,_wdt,_hgt), int _stl, TString _txt ); +TClass(wxcHtmlWindow) wxcHtmlWindow_Create( TClass(wxWindow) _prt, int _id= , TRect(_lft,_top,_wdt,_hgt), int _stl, TClass(wxString) _txt ); = hunk ./wxc/include/wxc.h 255 -TClass(wxHtmlWindow) wxHtmlWindow_Create( TClass(wxWindow) _prt, int _id, = TRect(_lft,_top,_wdt,_hgt), int _stl, TString _txt ); -TBool wxHtmlWindow_AppendToPage( TSelf(wxHtmlWindow) _obj, = TString source ); +TClass(wxHtmlWindow) wxHtmlWindow_Create( TClass(wxWindow) _prt, int _id, = TRect(_lft,_top,_wdt,_hgt), int _stl, TClass(wxString) _txt ); +TBool wxHtmlWindow_AppendToPage( TSelf(wxHtmlWindow) _obj, = TClass(wxString) source ); TClass(wxHtmlContainerCell) wxHtmlWindow_GetInternalRepresentation( TSelf(= wxHtmlWindow) _obj ); TStringLen wxHtmlWindow_GetOpenedAnchor( TSelf(wxHtmlWindow) _ob= j, TStringOutVoid _buf ) ; TStringLen wxHtmlWindow_GetOpenedPage( TSelf(wxHtmlWindow) _obj,= TStringOutVoid _buf ); hunk ./wxc/include/wxc.h 267 TBool wxHtmlWindow_HistoryCanForward( TSelf(wxHtmlWindow) _= obj ); void wxHtmlWindow_HistoryClear( TSelf(wxHtmlWindow) _obj); TBool wxHtmlWindow_HistoryForward( TSelf(wxHtmlWindow) _obj= ); -TBool wxHtmlWindow_LoadPage( TSelf(wxHtmlWindow) _obj, TStr= ing location ); -void wxHtmlWindow_ReadCustomization( TSelf(wxHtmlWindow) _= obj, TClass(wxConfigBase) cfg, TString path); +TBool wxHtmlWindow_LoadPage( TSelf(wxHtmlWindow) _obj, TCla= ss(wxString) location ); +void wxHtmlWindow_ReadCustomization( TSelf(wxHtmlWindow) _= obj, TClass(wxConfigBase) cfg, TClass(wxString) path); void wxHtmlWindow_SetBorders( TSelf(wxHtmlWindow) _obj, in= t b ); hunk ./wxc/include/wxc.h 270 -void wxHtmlWindow_SetFonts( TSelf(wxHtmlWindow) _obj, TStr= ing normal_face, TString fixed_face, int * sizes ); -void wxHtmlWindow_SetPage( TSelf(wxHtmlWindow) _obj, TStri= ng source ); -void wxHtmlWindow_SetRelatedFrame( TSelf(wxHtmlWindow) _ob= j , TClass(wxFrame) frame, TString format ); +void wxHtmlWindow_SetFonts( TSelf(wxHtmlWindow) _obj, TCla= ss(wxString) normal_face, TClass(wxString) fixed_face, int * sizes ); +void wxHtmlWindow_SetPage( TSelf(wxHtmlWindow) _obj, TClas= s(wxString) source ); +void wxHtmlWindow_SetRelatedFrame( TSelf(wxHtmlWindow) _ob= j , TClass(wxFrame) frame, TClass(wxString) format ); void wxHtmlWindow_SetRelatedStatusBar( TSelf(wxHtmlWindow)= _obj, int bar); hunk ./wxc/include/wxc.h 274 -void wxHtmlWindow_WriteCustomization( TSelf(wxHtmlWindow) = _obj, TClass(wxConfigBase) cfg, TString path ); +void wxHtmlWindow_WriteCustomization( TSelf(wxHtmlWindow) = _obj, TClass(wxConfigBase) cfg, TClass(wxString) path ); = /* wxGridCellTextEnterEditor */=0D TClassDefExtend(wxGridCellTextEnterEditor,wxGridCellTextEditor)=0D hunk ./wxc/include/wxc.h 288 TClass(wxLogWindow) wxLogWindow_Create( TClass(wxWindow) parent, TString= title, TBoolInt showit, TBoolInt passthrough ); TClass(wxFrame) wxLogWindow_GetFrame( TSelf(wxLogWindow) obj ); = -void LogError(TStringVoid _msg); -void LogFatalError(TStringVoid _msg); -void LogWarning(TStringVoid _msg); -void LogMessage(TStringVoid _msg); -void LogVerbose(TStringVoid _msg); -void LogStatus(TStringVoid _msg); -void LogSysError(TStringVoid _msg); -void LogDebug(TStringVoid _msg); -void LogTrace(TStringVoid mask, TStringVoid _msg); +void LogError(TClass(wxString) _msg); +void LogFatalError(TClass(wxString) _msg); +void LogWarning(TClass(wxString) _msg); +void LogMessage(TClass(wxString) _msg); +void LogVerbose(TClass(wxString) _msg); +void LogStatus(TClass(wxString) _msg); +void LogSysError(TClass(wxString) _msg); +void LogDebug(TClass(wxString) _msg); +void LogTrace(TClass(wxString) mask, TClass(wxString) _msg); = hunk ./wxc/include/wxc.h 298 -void wxLog_AddTraceMask( TSelf(wxLog) _obj, TStringVoid str ); +void wxLog_AddTraceMask( TSelf(wxLog) _obj, TClass(wxString) str ); void wxLog_Delete( TSelf(wxLog) _obj ); void wxLog_DontCreateOnDemand( TSelf(wxLog) _obj ); void wxLog_Flush( TSelf(wxLog) _obj ); hunk ./wxc/include/wxc.h 310 TBool wxLog_HasPendingMessages( TSelf(wxLog) _obj ); TBool wxLog_IsAllowedTraceMask( TSelf(wxLog) _obj, TClass(wxMask) mas= k ); void wxLog_OnLog( TSelf(wxLog) _obj, int level, TStringVoid szString= , int t ); -void wxLog_RemoveTraceMask( TSelf(wxLog) _obj, TStringVoid str ); +void wxLog_RemoveTraceMask( TSelf(wxLog) _obj, TClass(wxString) str = ); void wxLog_Resume( TSelf(wxLog) _obj ); TClass(wxLog) wxLog_SetActiveTarget( TSelf(wxLog) pLogger ); void wxLog_SetTimestamp( TSelf(wxLog) _obj, TStringVoid ts ); hunk ./wxc/include/wxc.h 320 = = /* process */ -TClass(wxProcess) wxProcess_Open( TString cmd, int flags ); +TClass(wxProcess) wxProcess_Open( TClass(wxString) cmd, int flags ); TBool wxProcess_IsErrorAvailable( TSelf(wxProcess) _obj ); TBool wxProcess_IsInputAvailable( TSelf(wxProcess) _obj ); TBool wxProcess_IsInputOpened( TSelf(wxProcess) _obj ); hunk ./wxc/include/wxc.h 333 void wxGetFontFromUser(TClass(wxWindow) parent, TClass(wxFont) font= Init, TClassRef(wxFont) font ); TStringLen wxGetPasswordFromUser(TString message, TString caption, TStrin= g defaultText, TClass(wxWindow) parent, TStringOut _buf ); TStringLen wxGetTextFromUser(TString message, TString caption, TString de= faultText, TClass(wxWindow) parent, TPoint(x,y), TBool center, TStringOut _= buf ); -long wxGetNumberFromUser( TString message, TString prompt, TString = caption, long value, long min, long max, TClass(wxWindow) parent, TPoint(x,= y) ); +long wxGetNumberFromUser( TClass(wxString) message, TClass(wxString= ) prompt, TClass(wxString) caption, long value, long min, long max, TClass(= wxWindow) parent, TPoint(x,y) ); void wxcBell(); void wxcBeginBusyCursor(); void wxcEndBusyCursor(); hunk ./wxc/include/wxc.h 342 /* text ctrl */ TBool wxTextCtrl_EmulateKeyPress( TSelf(wxTextCtrl) _obj, TC= lass(wxKeyEvent) keyevent); TClass (wxTextAttr) wxTextCtrl_GetDefaultStyle( TSelf(wxTextCtrl) _obj ); -TStringLen wxTextCtrl_GetRange( TSelf(wxTextCtrl) _obj, long from= , long to, TStringOutVoid _buf ); -TStringLen wxTextCtrl_GetStringSelection( TSelf(wxTextCtrl) _obj,= TStringOutVoid _buf ); +TClass(wxString) wxTextCtrl_GetRange( TSelf(wxTextCtrl) _obj, long from= , long to ); +TClass(wxString) wxTextCtrl_GetStringSelection( TSelf(wxTextCtrl) _obj = ); TBool wxTextCtrl_IsMultiLine( TSelf(wxTextCtrl) _obj ); TBool wxTextCtrl_IsSingleLine( TSelf(wxTextCtrl) _obj ); TBool wxTextCtrl_SetDefaultStyle( TSelf(wxTextCtrl) _obj, TC= lass(wxTextAttr) style); hunk ./wxc/include/wxc.h 409 =0D /* application directory */=0D /** Return the directory of the application. On unix systems (except MacOS= X), it is not always possible to determine this correctly. Therefore, the = APPDIR environment variable is returned first if it is defined. */=0D -TStringLen wxGetApplicationDir( TStringOut buffer);=0D +TClass(wxString) wxGetApplicationDir();=0D /** Return the full path of the application. On unix systems (except MacOS= X), it is not always possible to determine this correctly. */=0D hunk ./wxc/include/wxc.h 411 -TStringLen wxGetApplicationPath( TStringOut buffer);=0D +TClass(wxString) wxGetApplicationPath();=0D =0D /* ELJApp */ void ELJApp_InitializeC( TClass(wxClosure) closure, int _argc, TChar** _a= rgv );=0D hunk ./wxc/include/wxc_glue.h 350 /* Misc. */=0D int ELJSysErrorCode( );=0D void* ELJSysErrorMsg( int nErrCode );=0D -void LogErrorMsg( TStringVoid _msg );=0D -void LogFatalErrorMsg( TStringVoid _msg );=0D -void LogMessageMsg( TStringVoid _msg );=0D -void LogWarningMsg( TStringVoid _msg );=0D +void LogErrorMsg( TClass(wxString) _msg );=0D +void LogFatalErrorMsg( TClass(wxString) _msg );=0D +void LogMessageMsg( TClass(wxString) _msg );=0D +void LogWarningMsg( TClass(wxString) _msg );=0D TBool Quantize( TClass(wxImage) src, TClass(wxImage) dest, int desire= dNoColours, void* eightBitData, int flags );=0D TBool QuantizePalette( TClass(wxImage) src, TClass(wxImage) dest, voi= d* pPalette, int desiredNoColours, void* eightBitData, int flags );=0D void wxCFree( void* _ptr );=0D hunk ./wxc/include/wxc_glue.h 370 void ELJApp_DisplaySize( TSizeOutVoid(_w,_h) );=0D void ELJApp_EnableTooltips( TBool _enable );=0D void ELJApp_EnableTopLevelWindows( int _enb );=0D -int ELJApp_ExecuteProcess( TStringVoid _cmd, int _snc, TClass(wxPro= cess) _prc );=0D +int ELJApp_ExecuteProcess( TClass(wxString) _cmd, int _snc, TClass(= wxProcess) _prc );=0D void ELJApp_Exit( );=0D void ELJApp_ExitMainLoop( );=0D void* ELJApp_FindWindowById( int _id, TClass(wxWindow) _prt );=0D hunk ./wxc/include/wxc_glue.h 374 -TClass(wxWindow) ELJApp_FindWindowByLabel( TStringVoid _lbl, TClass(wxWind= ow) _prt );=0D -TClass(wxWindow) ELJApp_FindWindowByName( TStringVoid _lbl, TClass(wxWindo= w) _prt );=0D +TClass(wxWindow) ELJApp_FindWindowByLabel( TClass(wxString) _lbl, TClass(w= xWindow) _prt );=0D +TClass(wxWindow) ELJApp_FindWindowByName( TClass(wxString) _lbl, TClass(wx= Window) _prt );=0D TClass(wxApp) ELJApp_GetApp( );=0D hunk ./wxc/include/wxc_glue.h 377 -TStringLen ELJApp_GetAppName( TStringOutVoid _buf );=0D -TStringLen ELJApp_GetClassName( TStringOutVoid _buf );=0D -int ELJApp_GetExitOnFrameDelete( );=0D -TStringLen ELJApp_GetOsDescription( TStringOutVoid _buf );=0D +TClass(wxString) ELJApp_GetAppName( );=0D +TClass(wxString) ELJApp_GetClassName( );=0D +int ELJApp_GetExitOnFrameDelete( );=0D +TClass(wxString) ELJApp_GetOsDescription( );=0D int ELJApp_GetOsVersion( void* _maj, void* _min );=0D TClass(wxWindow) ELJApp_GetTopWindow( );=0D int ELJApp_GetUseBestVisual( );=0D hunk ./wxc/include/wxc_glue.h 384 -TStringLen ELJApp_GetUserHome( void* _usr, TStringOutVoid _buf );=0D -TStringLen ELJApp_GetUserId( TStringOutVoid _buf );=0D -TStringLen ELJApp_GetUserName( TStringOutVoid _buf );=0D -TStringLen ELJApp_GetVendorName( TStringOutVoid _buf );=0D +TClass(wxString) ELJApp_GetUserHome( void* _usr );=0D +TClass(wxString) ELJApp_GetUserId( );=0D +TClass(wxString) ELJApp_GetUserName( );=0D +TClass(wxString) ELJApp_GetVendorName( );=0D /* int ELJApp_GetWantDebugOutput( ); */=0D void ELJApp_InitAllImageHandlers( );=0D int ELJApp_Initialized( );=0D hunk ./wxc/include/wxc_glue.h 397 int ELJApp_SafeYield( TClass(wxWindow) _win );=0D /* int ELJApp_SendIdleEvents( ); */=0D /* int ELJApp_SendIdleEventsToWindow( TClass(wxWindow) win ); */=0D -void ELJApp_SetAppName( TString name );=0D -void ELJApp_SetClassName( TString name );=0D +void ELJApp_SetAppName( TClass(wxString) name );=0D +void ELJApp_SetClassName( TClass(wxString) name );=0D void ELJApp_SetExitOnFrameDelete( int flag );=0D void ELJApp_SetPrintMode( int mode );=0D void ELJApp_SetTooltipDelay( int _ms );=0D hunk ./wxc/include/wxc_glue.h 404 void ELJApp_SetTopWindow( TClass(wxWindow) _wnd );=0D void ELJApp_SetUseBestVisual( int flag );=0D -void ELJApp_SetVendorName( TString name );=0D +void ELJApp_SetVendorName( TClass(wxString) name );=0D void ELJApp_Sleep( int _scs );=0D void ELJApp_MilliSleep( int _mscs );=0D int ELJApp_Yield( );=0D hunk ./wxc/include/wxc_glue.h 420 TClassDefExtend(ELJClient,wxClient)=0D TClass(ELJClient) ELJClient_Create( void* _eobj, void* _cnct );=0D void ELJClient_Delete( TSelf(ELJClient) _obj );=0D -void ELJClient_MakeConnection( TSelf(ELJClient) _obj, void* host, TC= lass(wxServer) server, void* topic );=0D +void ELJClient_MakeConnection( TSelf(ELJClient) _obj, TClass(wxStrin= g) host, TClass(wxServer) server, TClass(wxString) topic );=0D =0D /* ELJCommand */=0D TClassDefExtend(ELJCommand,wxCommand)=0D hunk ./wxc/include/wxc_glue.h 425 TBool ELJCommand_CanUndo( TSelf(ELJCommand) _obj );=0D -TClass(ELJCommand) ELJCommand_Create( int _und, void* _nme, void* _obj, vo= id* _clb );=0D +TClass(ELJCommand) ELJCommand_Create( int _und, TClass(wxString) _nme, voi= d* _obj, void* _clb );=0D void ELJCommand_Delete( TSelf(ELJCommand) _obj );=0D hunk ./wxc/include/wxc_glue.h 427 -TStringLen ELJCommand_GetName( TSelf(ELJCommand) _obj, TStringOutVoid _buf= );=0D +TClass(wxString) ELJCommand_GetName( TSelf(ELJCommand) _obj );=0D =0D /* ELJConnection */=0D TClassDefExtend(ELJConnection,wxConnection)=0D hunk ./wxc/include/wxc_glue.h 431 -int ELJConnection_Advise( TSelf(ELJConnection) _obj, void* item, vo= id* data, int size, int format );=0D +int ELJConnection_Advise( TSelf(ELJConnection) _obj, TClass(wxStrin= g) item, void* data, int size, int format );=0D void ELJConnection_Compress( TSelf(ELJConnection) _obj, int on );=0D TClass(ELJConnection) ELJConnection_Create( void* _obj, void* buffer, int = size );=0D TClass(ELJConnection) ELJConnection_CreateDefault( TSelf(ELJConnection) _o= bj );=0D hunk ./wxc/include/wxc_glue.h 436 void ELJConnection_Delete( TSelf(ELJConnection) _obj );=0D -int ELJConnection_Disconnect( TSelf(ELJConnection) _obj );=0D -int ELJConnection_Execute( TSelf(ELJConnection) _obj, void* data, i= nt size, int format );=0D -int ELJConnection_Poke( TSelf(ELJConnection) _obj, void* item, void= * data, int size, int format );=0D -void* ELJConnection_Request( TSelf(ELJConnection) _obj, void* item, T= Class(wxSize) size, int format );=0D +TBool ELJConnection_Disconnect( TSelf(ELJConnection) _obj );=0D +TBool ELJConnection_Execute( TSelf(ELJConnection) _obj, TClass(wxStri= ng) data, int size, int format );=0D +TBool ELJConnection_Poke( TSelf(ELJConnection) _obj, TClass(wxString)= item, void* data, int size, int format );=0D +void* ELJConnection_Request( TSelf(ELJConnection) _obj, TClass(wxStri= ng) item, TClass(wxSize) size, int format );=0D void ELJConnection_SetOnAdvise( TSelf(ELJConnection) _obj, void* _fn= c );=0D void ELJConnection_SetOnDisconnect( TSelf(ELJConnection) _obj, void*= _fnc );=0D void ELJConnection_SetOnExecute( TSelf(ELJConnection) _obj, void* _f= nc );=0D hunk ./wxc/include/wxc_glue.h 447 void ELJConnection_SetOnRequest( TSelf(ELJConnection) _obj, void* _f= nc );=0D void ELJConnection_SetOnStartAdvise( TSelf(ELJConnection) _obj, void= * _fnc );=0D void ELJConnection_SetOnStopAdvise( TSelf(ELJConnection) _obj, void*= _fnc );=0D -int ELJConnection_StartAdvise( TSelf(ELJConnection) _obj, void* ite= m );=0D -int ELJConnection_StopAdvise( TSelf(ELJConnection) _obj, void* item= );=0D +TBool ELJConnection_StartAdvise( TSelf(ELJConnection) _obj, TClass(wx= String) item );=0D +TBool ELJConnection_StopAdvise( TSelf(ELJConnection) _obj, TClass(wxS= tring) item );=0D =0D /* ELJDragDataObject */=0D TClassDef(ELJDragDataObject)=0D hunk ./wxc/include/wxc_glue.h 452 -TClass(ELJDragDataObject) ELJDragDataObject_Create( void* _obj, void* _fmt= , void* _func1, void* _func2, void* _func3 );=0D +TClass(ELJDragDataObject) ELJDragDataObject_Create( void* _obj, TClass(wxS= tring) _fmt, void* _func1, void* _func2, void* _func3 );=0D void ELJDragDataObject_Delete( TSelf(ELJDragDataObject) _obj );=0D =0D /* ELJDropTarget */=0D hunk ./wxc/include/wxc_glue.h 553 void ELJPrintout_GetPPIScreen( TSelf(ELJPrintout) _obj, TPointOutVoi= d(_x,_y) );=0D void ELJPrintout_GetPageSizeMM( TSelf(ELJPrintout) _obj, TSizeOutVoi= d(_w,_h) );=0D void ELJPrintout_GetPageSizePixels( TSelf(ELJPrintout) _obj, TSizeOu= tVoid(_w,_h) );=0D -TStringLen ELJPrintout_GetTitle( TSelf(ELJPrintout) _obj, TStringOutVoid _= buf );=0D +TClass(wxString) ELJPrintout_GetTitle( TSelf(ELJPrintout) _obj );=0D TBool ELJPrintout_IsPreview( TSelf(ELJPrintout) _obj );=0D void ELJPrintout_SetDC( TSelf(ELJPrintout) _obj, TClass(wxDC) dc );= =0D void ELJPrintout_SetIsPreview( TSelf(ELJPrintout) _obj, int p );=0D hunk ./wxc/include/wxc_glue.h 567 TClassDefExtend(ELJServer,wxServer)=0D TClass(ELJServer) ELJServer_Create( void* _eobj, void* _cnct );=0D void ELJServer_Delete( TSelf(ELJServer) _obj );=0D -int ELJServer_Initialize( TSelf(ELJServer) _obj, TStringVoid name )= ;=0D +int ELJServer_Initialize( TSelf(ELJServer) _obj, TClass(wxString) n= ame );=0D =0D /* ELJTextDropTarget */=0D TClassDefExtend(ELJTextDropTarget,wxTextDropTarget)=0D hunk ./wxc/include/wxc_glue.h 962 TClass(wxBitmap) wxBitmap_CreateDefault( );=0D TClass(wxBitmap) wxBitmap_CreateEmpty( TSize(_width,_height), int _depth )= ;=0D TClass(wxBitmap) wxBitmap_CreateFromXPM( TSelf(wxBitmap) data );=0D -TClass(wxBitmap) wxBitmap_CreateLoad( TStringVoid name, int type );=0D +TClass(wxBitmap) wxBitmap_CreateLoad( TClass(wxString) name, int type );= =0D void wxBitmap_Delete( TSelf(wxBitmap) _obj );=0D void* wxBitmap_FindHandlerByExtension( TSelf(wxBitmap) extension, int= type );=0D hunk ./wxc/include/wxc_glue.h 965 -void* wxBitmap_FindHandlerByName( TStringVoid name );=0D +void* wxBitmap_FindHandlerByName( TClass(wxString) name );=0D void* wxBitmap_FindHandlerByType( int type );=0D int wxBitmap_GetDepth( TSelf(wxBitmap) _obj );=0D int wxBitmap_GetHeight( TSelf(wxBitmap) _obj );=0D hunk ./wxc/include/wxc_glue.h 974 int wxBitmap_GetWidth( TSelf(wxBitmap) _obj );=0D void wxBitmap_InitStandardHandlers( );=0D void wxBitmap_InsertHandler( TClass(wxEvtHandler) handler );=0D -int wxBitmap_LoadFile( TSelf(wxBitmap) _obj, TStringVoid name, int = type );=0D -TBool wxBitmap_Ok( TSelf(wxBitmap) _obj );=0D -int wxBitmap_RemoveHandler( TStringVoid name );=0D -int wxBitmap_SaveFile( TSelf(wxBitmap) _obj, TStringVoid name, int = type, TClass(wxPalette) cmap );=0D +int wxBitmap_LoadFile( TSelf(wxBitmap) _obj, TClass(wxString) name,= int type );=0D +TBool wxBitmap_IsOk( TSelf(wxBitmap) _obj );=0D +TBool wxBitmap_RemoveHandler( TClass(wxString) name );=0D +int wxBitmap_SaveFile( TSelf(wxBitmap) _obj, TClass(wxString) name,= int type, TClass(wxPalette) cmap );=0D void wxBitmap_SetDepth( TSelf(wxBitmap) _obj, int d );=0D void wxBitmap_SetHeight( TSelf(wxBitmap) _obj, int h );=0D void wxBitmap_SetMask( TSelf(wxBitmap) _obj, TClass(wxMask) mask );= =0D hunk ./wxc/include/wxc_glue.h 1063 =0D /* wxBusyInfo */=0D TClassDef(wxBusyInfo)=0D -TClass(wxBusyInfo) wxBusyInfo_Create( TStringVoid _txt );=0D +TClass(wxBusyInfo) wxBusyInfo_Create( TClass(wxString) _txt );=0D void wxBusyInfo_Delete( TSelf(wxBusyInfo) _obj );=0D =0D /* wxButton */=0D hunk ./wxc/include/wxc_glue.h 1068 TClassDefExtend(wxButton,wxControl)=0D -TClass(wxButton) wxButton_Create( TClass(wxWindow) _prt, int _id, TString = _txt, TRect(_lft,_top,_wdt,_hgt), int _stl );=0D +TClass(wxButton) wxButton_Create( TClass(wxWindow) _prt, int _id, TClass(w= xString) _txt, TRect(_lft,_top,_wdt,_hgt), int _stl );=0D int wxButton_SetBackgroundColour( TSelf(wxButton) _obj, TClass(wxCo= lour) colour );=0D void wxButton_SetDefault( TSelf(wxButton) _obj );=0D =0D hunk ./wxc/include/wxc_glue.h 1151 =0D /* wxCheckBox */=0D TClassDefExtend(wxCheckBox,wxControl)=0D -TClass(wxCheckBox) wxCheckBox_Create( TClass(wxWindow) _prt, int _id, TStr= ing _txt, TRect(_lft,_top,_wdt,_hgt), int _stl );=0D +TClass(wxCheckBox) wxCheckBox_Create( TClass(wxWindow) _prt, int _id, TCla= ss(wxString) _txt, TRect(_lft,_top,_wdt,_hgt), int _stl );=0D TBoolInt wxCheckBox_GetValue( TSelf(wxCheckBox) _obj );=0D void wxCheckBox_SetValue( TSelf(wxCheckBox) _obj, TBoolInt value );= =0D =0D hunk ./wxc/include/wxc_glue.h 1163 =0D /* wxChoice */=0D TClassDefExtend(wxChoice,wxControl)=0D -void wxChoice_Append( TSelf(wxChoice) _obj, TString item );=0D +void wxChoice_Append( TSelf(wxChoice) _obj, TClass(wxString) item );= =0D void wxChoice_Clear( TSelf(wxChoice) _obj );=0D TClass(wxChoice) wxChoice_Create( TClass(wxWindow) _prt, int _id, TRect(_l= ft,_top,_wdt,_hgt), TArrayString(n,str), int _stl );=0D void wxChoice_Delete( TSelf(wxChoice) _obj, int n );=0D hunk ./wxc/include/wxc_glue.h 1167 -int wxChoice_FindString( TSelf(wxChoice) _obj, TString s );=0D +int wxChoice_FindString( TSelf(wxChoice) _obj, TClass(wxString) s )= ;=0D int wxChoice_GetCount( TSelf(wxChoice) _obj );=0D int wxChoice_GetSelection( TSelf(wxChoice) _obj );=0D hunk ./wxc/include/wxc_glue.h 1170 -TStringLen wxChoice_GetString( TSelf(wxChoice) _obj, int n, TStringOutVoid= _buf );=0D +TClass(wxString) wxChoice_GetString( TSelf(wxChoice) _obj, int n );=0D void wxChoice_SetSelection( TSelf(wxChoice) _obj, int n );=0D hunk ./wxc/include/wxc_glue.h 1172 -void wxChoice_SetString( TSelf(wxChoice) _obj, int n, TString s );= =0D +void wxChoice_SetString( TSelf(wxChoice) _obj, int n, TClass(wxStrin= g) s );=0D =0D /* wxClassInfo */=0D TClassDef(wxClassInfo)=0D hunk ./wxc/include/wxc_glue.h 1178 void* wxClassInfo_CreateClassByName( TSelf(wxClassInfo) _inf );=0D void* wxClassInfo_GetClassName( TSelf(wxClassInfo) _inf );=0D -TBool wxClassInfo_IsKindOf( TSelf(wxClassInfo) _obj, TStringVoid _nam= e );=0D +TBool wxClassInfo_IsKindOf( TSelf(wxClassInfo) _obj, TClass(wxString)= _name );=0D =0D /* wxClient */=0D TClassDefExtend(wxClient,wxClientBase)=0D hunk ./wxc/include/wxc_glue.h 1264 =0D /* wxComboBox */=0D TClassDefExtend(wxComboBox,wxChoice)=0D -void wxComboBox_Append( TSelf(wxComboBox) _obj, TString item );=0D -void wxComboBox_AppendData( TSelf(wxComboBox) _obj, TString item, vo= id* d );=0D +void wxComboBox_Append( TSelf(wxComboBox) _obj, TClass(wxString) ite= m );=0D +void wxComboBox_AppendData( TSelf(wxComboBox) _obj, TClass(wxString)= item, void* d );=0D void wxComboBox_Clear( TSelf(wxComboBox) _obj );=0D void wxComboBox_Copy( TSelf(wxComboBox) _obj );=0D hunk ./wxc/include/wxc_glue.h 1268 -TClass(wxComboBox) wxComboBox_Create( TClass(wxWindow) _prt, int _id, TStr= ingVoid _txt, TRect(_lft,_top,_wdt,_hgt), TArrayString(n,str), int _stl );= =0D +TClass(wxComboBox) wxComboBox_Create( TClass(wxWindow) _prt, int _id, TCla= ss(wxString) _txt, TRect(_lft,_top,_wdt,_hgt), TArrayString(n,str), int _st= l );=0D void wxComboBox_Cut( TSelf(wxComboBox) _obj );=0D void wxComboBox_Delete( TSelf(wxComboBox) _obj, int n );=0D hunk ./wxc/include/wxc_glue.h 1271 -int wxComboBox_FindString( TSelf(wxComboBox) _obj, TString s );=0D +int wxComboBox_FindString( TSelf(wxComboBox) _obj, TClass(wxString)= s );=0D TClass(wxClientData) wxComboBox_GetClientData( TSelf(wxComboBox) _obj, int= n );=0D int wxComboBox_GetCount( TSelf(wxComboBox) _obj );=0D int wxComboBox_GetInsertionPoint( TSelf(wxComboBox) _obj );=0D hunk ./wxc/include/wxc_glue.h 1277 int wxComboBox_GetLastPosition( TSelf(wxComboBox) _obj );=0D int wxComboBox_GetSelection( TSelf(wxComboBox) _obj );=0D -TStringLen wxComboBox_GetString( TSelf(wxComboBox) _obj, int n, TStringOut= Void _buf );=0D -TStringLen wxComboBox_GetStringSelection( TSelf(wxComboBox) _obj, TStringO= utVoid _buf );=0D -TStringLen wxComboBox_GetValue( TSelf(wxComboBox) _obj, TStringOutVoid _bu= f );=0D +TClass(wxString) wxComboBox_GetString( TSelf(wxComboBox) _obj, int n );=0D +TClass(wxString) wxComboBox_GetStringSelection( TSelf(wxComboBox) _obj );= =0D +TClass(wxString) wxComboBox_GetValue( TSelf(wxComboBox) _obj );=0D void wxComboBox_Paste( TSelf(wxComboBox) _obj );=0D void wxComboBox_Remove( TSelf(wxComboBox) _obj, int from, int to );= =0D hunk ./wxc/include/wxc_glue.h 1282 -void wxComboBox_Replace( TSelf(wxComboBox) _obj, int from, int to, T= String value );=0D +void wxComboBox_Replace( TSelf(wxComboBox) _obj, int from, int to, T= Class(wxString) value );=0D void wxComboBox_SetClientData( TSelf(wxComboBox) _obj, int n, TClass= (wxClientData) clientData );=0D void wxComboBox_SetEditable( TSelf(wxComboBox) _obj, TBool editable = );=0D void wxComboBox_SetInsertionPoint( TSelf(wxComboBox) _obj, int pos )= ;=0D hunk ./wxc/include/wxc_glue.h 1303 long wxCommandEvent_GetExtraLong( TSelf(wxCommandEvent) _obj );=0D long wxCommandEvent_GetInt( TSelf(wxCommandEvent) _obj );=0D int wxCommandEvent_GetSelection( TSelf(wxCommandEvent) _obj );=0D -TStringLen wxCommandEvent_GetString( TSelf(wxCommandEvent) _obj, TStringOu= tVoid _buf );=0D +TClass(wxString) wxCommandEvent_GetString( TSelf(wxCommandEvent) _obj );= =0D TBool wxCommandEvent_IsChecked( TSelf(wxCommandEvent) _obj );=0D TBool wxCommandEvent_IsSelection( TSelf(wxCommandEvent) _obj );=0D void wxCommandEvent_SetClientData( TSelf(wxCommandEvent) _obj, TClas= s(wxClientData) clientData );=0D hunk ./wxc/include/wxc_glue.h 1310 void wxCommandEvent_SetClientObject( TSelf(wxCommandEvent) _obj, TCl= ass(wxClientData) clientObject );=0D void wxCommandEvent_SetExtraLong( TSelf(wxCommandEvent) _obj, long e= xtraLong );=0D void wxCommandEvent_SetInt( TSelf(wxCommandEvent) _obj, int i );=0D -void wxCommandEvent_SetString( TSelf(wxCommandEvent) _obj, TString s= );=0D +void wxCommandEvent_SetString( TSelf(wxCommandEvent) _obj, TClass(wx= String) s );=0D =0D /* wxCommandLineParser */=0D TClassDef(wxCommandLineParser)=0D hunk ./wxc/include/wxc_glue.h 1346 TClass(wxConfigBase) wxConfigBase_Create( );=0D void wxConfigBase_Delete( TSelf(wxConfigBase) _obj );=0D TBool wxConfigBase_DeleteAll( TSelf(wxConfigBase) _obj );=0D -TBool wxConfigBase_DeleteEntry( TSelf(wxConfigBase) _obj, TStringVoid= key, TBoolInt bDeleteGroupIfEmpty );=0D -TBool wxConfigBase_DeleteGroup( TSelf(wxConfigBase) _obj, TStringVoid= key );=0D -TBool wxConfigBase_Exists( TSelf(wxConfigBase) _obj, TStringVoid strN= ame );=0D -TStringLen wxConfigBase_ExpandEnvVars( TSelf(wxConfigBase) _obj, TStringVo= id str, TStringOutVoid _buf );=0D +TBool wxConfigBase_DeleteEntry( TSelf(wxConfigBase) _obj, TClass(wxSt= ring) key, TBool bDeleteGroupIfEmpty );=0D +TBool wxConfigBase_DeleteGroup( TSelf(wxConfigBase) _obj, TClass(wxSt= ring) key );=0D +TBool wxConfigBase_Exists( TSelf(wxConfigBase) _obj, TClass(wxString)= strName );=0D +TClass(wxString) wxConfigBase_ExpandEnvVars( TSelf(wxConfigBase) _obj, TCl= ass(wxString) str );=0D TBool wxConfigBase_Flush( TSelf(wxConfigBase) _obj, TBool bCurrentOnl= y );=0D hunk ./wxc/include/wxc_glue.h 1351 -TStringLen wxConfigBase_GetAppName( TSelf(wxConfigBase) _obj, TStringOutVo= id _buf );=0D -int wxConfigBase_GetEntryType( TSelf(wxConfigBase) _obj, TStringVoi= d name );=0D +TClass(wxString) wxConfigBase_GetAppName( TSelf(wxConfigBase) _obj );=0D +int wxConfigBase_GetEntryType( TSelf(wxConfigBase) _obj, TClass(wxS= tring) name );=0D TClass(wxString) wxConfigBase_GetFirstEntry( TSelf(wxConfigBase) _obj, voi= d* lIndex );=0D TClass(wxString) wxConfigBase_GetFirstGroup( TSelf(wxConfigBase) _obj, voi= d* lIndex );=0D TClass(wxString) wxConfigBase_GetNextEntry( TSelf(wxConfigBase) _obj, void= * lIndex);=0D hunk ./wxc/include/wxc_glue.h 1357 TClass(wxString) wxConfigBase_GetNextGroup( TSelf(wxConfigBase) _obj, void= * lIndex);=0D -int wxConfigBase_GetNumberOfEntries( TSelf(wxConfigBase) _obj, TBoo= lInt bRecursive );=0D -int wxConfigBase_GetNumberOfGroups( TSelf(wxConfigBase) _obj, TBool= Int bRecursive );=0D -TStringLen wxConfigBase_GetPath( TSelf(wxConfigBase) _obj, TStringOutVoid = _buf );=0D +int wxConfigBase_GetNumberOfEntries( TSelf(wxConfigBase) _obj, TBoo= l bRecursive );=0D +int wxConfigBase_GetNumberOfGroups( TSelf(wxConfigBase) _obj, TBool= bRecursive );=0D +TClass(wxString) wxConfigBase_GetPath( TSelf(wxConfigBase) _obj );=0D int wxConfigBase_GetStyle( TSelf(wxConfigBase) _obj );=0D hunk ./wxc/include/wxc_glue.h 1361 -TStringLen wxConfigBase_GetVendorName( TSelf(wxConfigBase) _obj, TStringOu= tVoid _buf );=0D -TBool wxConfigBase_HasEntry( TSelf(wxConfigBase) _obj, TStringVoid st= rName );=0D -TBool wxConfigBase_HasGroup( TSelf(wxConfigBase) _obj, TStringVoid st= rName );=0D +TClass(wxString) wxConfigBase_GetVendorName( TSelf(wxConfigBase) _obj );= =0D +TBool wxConfigBase_HasEntry( TSelf(wxConfigBase) _obj, TClass(wxStrin= g) strName );=0D +TBool wxConfigBase_HasGroup( TSelf(wxConfigBase) _obj, TClass(wxStrin= g) strName );=0D TBool wxConfigBase_IsExpandingEnvVars( TSelf(wxConfigBase) _obj );=0D TBool wxConfigBase_IsRecordingDefaults( TSelf(wxConfigBase) _obj );= =0D hunk ./wxc/include/wxc_glue.h 1366 -TBoolInt wxConfigBase_ReadBool( TSelf(wxConfigBase) _obj, TStringVoid ke= y, TBoolInt defVal );=0D -double wxConfigBase_ReadDouble( TSelf(wxConfigBase) _obj, TStringVoid = key, double defVal );=0D -int wxConfigBase_ReadInteger( TSelf(wxConfigBase) _obj, TStringVoid= key, int defVal );=0D -TClass(wxString) wxConfigBase_ReadString( TSelf(wxConfigBase) _obj, TStrin= gVoid key, TStringVoid defVal );=0D -TBoolInt wxConfigBase_RenameEntry( TSelf(wxConfigBase) _obj, TStringVoid= oldName, TStringVoid newName );=0D -TBoolInt wxConfigBase_RenameGroup( TSelf(wxConfigBase) _obj, TStringVoid= oldName, TStringVoid newName );=0D -void wxConfigBase_SetAppName( TSelf(wxConfigBase) _obj, TStringVoid = appName );=0D -void wxConfigBase_SetExpandEnvVars( TSelf(wxConfigBase) _obj, TBoolI= nt bDoIt );=0D -void wxConfigBase_SetPath( TSelf(wxConfigBase) _obj, TStringVoid str= Path );=0D -void wxConfigBase_SetRecordDefaults( TSelf(wxConfigBase) _obj, TBool= Int bDoIt );=0D +TBool wxConfigBase_ReadBool( TSelf(wxConfigBase) _obj, TClass(wxStrin= g) key, TBool defVal );=0D +double wxConfigBase_ReadDouble( TSelf(wxConfigBase) _obj, TClass(wxStr= ing) key, double defVal );=0D +int wxConfigBase_ReadInteger( TSelf(wxConfigBase) _obj, TClass(wxSt= ring) key, int defVal );=0D +TClass(wxString) wxConfigBase_ReadString( TSelf(wxConfigBase) _obj, TClass= (wxString) key, TClass(wxString) defVal );=0D +TBool wxConfigBase_RenameEntry( TSelf(wxConfigBase) _obj, TClass(wxSt= ring) oldName, TClass(wxString) newName );=0D +TBool wxConfigBase_RenameGroup( TSelf(wxConfigBase) _obj, TClass(wxSt= ring) oldName, TClass(wxString) newName );=0D +void wxConfigBase_SetAppName( TSelf(wxConfigBase) _obj, TClass(wxStr= ing) appName );=0D +void wxConfigBase_SetExpandEnvVars( TSelf(wxConfigBase) _obj, TBool = bDoIt );=0D +void wxConfigBase_SetPath( TSelf(wxConfigBase) _obj, TClass(wxString= ) strPath );=0D +void wxConfigBase_SetRecordDefaults( TSelf(wxConfigBase) _obj, TBool= bDoIt );=0D void wxConfigBase_SetStyle( TSelf(wxConfigBase) _obj, int style );= =0D hunk ./wxc/include/wxc_glue.h 1377 -void wxConfigBase_SetVendorName( TSelf(wxConfigBase) _obj, TStringVo= id vendorName );=0D -TBoolInt wxConfigBase_WriteBool( TSelf(wxConfigBase) _obj, TStringVoid k= ey, TBoolInt value );=0D -TBoolInt wxConfigBase_WriteDouble( TSelf(wxConfigBase) _obj, TStringVoid= key, double value );=0D -TBoolInt wxConfigBase_WriteInteger( TSelf(wxConfigBase) _obj, TStringVoi= d key, int value );=0D -TBoolInt wxConfigBase_WriteString( TSelf(wxConfigBase) _obj, TStringVoid= key, TStringVoid value );=0D +void wxConfigBase_SetVendorName( TSelf(wxConfigBase) _obj, TClass(wx= String) vendorName );=0D +TBool wxConfigBase_WriteBool( TSelf(wxConfigBase) _obj, TClass(wxStri= ng) key, TBool value );=0D +TBool wxConfigBase_WriteDouble( TSelf(wxConfigBase) _obj, TClass(wxSt= ring) key, double value );=0D +TBool wxConfigBase_WriteInteger( TSelf(wxConfigBase) _obj, TClass(wxS= tring) key, int value );=0D +TBool wxConfigBase_WriteLong( TSelf(wxConfigBase) _obj, TClass(wxStri= ng) key, long value );=0D +TBool wxConfigBase_WriteString( TSelf(wxConfigBase) _obj, TClass(wxSt= ring) key, TClass(wxString) value );=0D =0D /* wxConnection */=0D TClassDefExtend(wxConnection,wxConnectionBase)=0D hunk ./wxc/include/wxc_glue.h 1404 /* wxControl */=0D TClassDefExtend(wxControl,wxWindow)=0D void wxControl_Command( TSelf(wxControl) _obj, TClass(wxEvent) event= );=0D -TStringLen wxControl_GetLabel( TSelf(wxControl) _obj, TStringOutVoid _buf = );=0D -void wxControl_SetLabel( TSelf(wxControl) _obj, TString text );=0D +TClass(wxString) wxControl_GetLabel( TSelf(wxControl) _obj );=0D +void wxControl_SetLabel( TSelf(wxControl) _obj, TClass(wxString) tex= t );=0D =0D /* wxCountingOutputStream */=0D TClassDefExtend(wxCountingOutputStream,wxOutputStream)=0D hunk ./wxc/include/wxc_glue.h 1424 TClassDefExtend(wxCursor,wxBitmap)=0D TClass(wxCursor) Cursor_CreateFromStock( int _id );=0D TClass(wxCursor) Cursor_CreateFromImage( TClass(wxImage) image );=0D -TClass(wxCursor) Cursor_CreateLoad( TStringVoid name, long type, TSize(wi= dth,height) );=0D +TClass(wxCursor) Cursor_CreateLoad( TClass(wxString) name, long type, TSi= ze(width,height) );=0D =0D /* wxCustomDataObject */=0D TClassDefExtend(wxCustomDataObject,wxDataObjectSimple)=0D hunk ./wxc/include/wxc_glue.h 1452 void wxDC_DrawEllipse( TSelf(wxDC) _obj, TRect(x,y,width,height) );= =0D void wxDC_DrawEllipticArc( TSelf(wxDC) _obj, TRect(x,y,w,h), double = sa, double ea );=0D void wxDC_DrawIcon( TSelf(wxDC) _obj, TClass(wxIcon) icon, TPoint(x,= y) );=0D -void wxDC_DrawLabel( TSelf(wxDC) _obj, TString str, TRect(x,y,w,h), = int align, int indexAccel);=0D -void wxDC_DrawLabelBitmap( TSelf(wxDC) _obj, TString str, TClass(wxB= itmap) bmp, TRect(x,y,w,h), int align, int indexAccel, int *_x, int *_y, in= t *_w, int *_h );=0D +void wxDC_DrawLabel( TSelf(wxDC) _obj, TClass(wxString) str, TRect(x= ,y,w,h), int align, int indexAccel);=0D +void wxDC_DrawLabelBitmap( TSelf(wxDC) _obj, TClass(wxString) str, T= Class(wxBitmap) bmp, TRect(x,y,w,h), int align, int indexAccel, int *_x, in= t *_y, int *_w, int *_h );=0D void wxDC_DrawLine( TSelf(wxDC) _obj, TPoint(x1,y1), TPoint(x2,y2) )= ;=0D void wxDC_DrawLines( TSelf(wxDC) _obj, int n, void* x, void* y, TPoi= nt(xoffset,yoffset) );=0D void wxDC_DrawPoint( TSelf(wxDC) _obj, TPoint(x,y) );=0D hunk ./wxc/include/wxc_glue.h 1460 void wxDC_DrawPolygon( TSelf(wxDC) _obj, int n, void* x, void* y, TP= oint(xoffset,yoffset), int fillStyle );=0D void wxDC_DrawPolyPolygon( TSelf(wxDC) _obj, int n, void *count, voi= d *x, void *y, TPoint(xoffset,yoffset), int fillStyle);=0D void wxDC_DrawRectangle( TSelf(wxDC) _obj, TRect(x,y,width,height) )= ;=0D -void wxDC_DrawRotatedText( TSelf(wxDC) _obj, TStringVoid text, TPoin= t(x,y), double angle );=0D +void wxDC_DrawRotatedText( TSelf(wxDC) _obj, TClass(wxString) text, = TPoint(x,y), double angle );=0D void wxDC_DrawRoundedRectangle( TSelf(wxDC) _obj, TRect(x,y,width,he= ight), double radius );=0D hunk ./wxc/include/wxc_glue.h 1462 -void wxDC_DrawText( TSelf(wxDC) _obj, TStringVoid text, TPoint(x,y) = );=0D +void wxDC_DrawText( TSelf(wxDC) _obj, TClass(wxString) text, TPoint(= x,y) );=0D void wxDC_EndDoc( TSelf(wxDC) _obj );=0D void wxDC_EndDrawing( TSelf(wxDC) _obj );=0D void wxDC_EndPage( TSelf(wxDC) _obj );=0D hunk ./wxc/include/wxc_glue.h 1486 void wxDC_GetSize( TSelf(wxDC) _obj, TSizeOutVoid(_w,_h) );=0D void wxDC_GetSizeMM( TSelf(wxDC) _obj, TSizeOutVoid(_w,_h) );=0D void wxDC_GetTextBackground( TSelf(wxDC) _obj, TClassRef(wxColour) _= ref );=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 +void wxDC_GetTextExtent( TSelf(wxDC) self, TClass(wxString) string, = void* w, void* h, void* descent, void* externalLeading, TClass(wxFont) theF= ont );=0D +void wxDC_GetMultiLineTextExtent( TSelf(wxDC) self, TClass(wxString)= string, void* w, void* h, void* heightLine, TClass(wxFont) theFont );=0D void wxDC_GetTextForeground( TSelf(wxDC) _obj, TClassR... [truncated message content] |
From: Henk-Jan v. T. <hj...@ch...> - 2009-01-11 16:40:09
|
L.S., When a bitmapButton is used, with both a picture and a text, the text is not displayed (the text should be projected over the picture). See the attached program and image. Package: wxHaskell 0.11.0, wxWidgets 2.8.9 OS: Windows XP Compiler: GHC version 6.10.1 -- Regards, Henk-Jan van Tuyl -- http://functor.bamikanarie.com http://Van.Tuyl.eu/ -- |
From: shelarcy <she...@gm...> - 2009-01-07 02:55:03
|
Pushed with one extra patch that fixes typos in these changes. 2009/1/7 shelarcy <she...@gm...>: > Tue Jan 6 22:29:11 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2009 shelarcy <shelarc= > y...@gm...> > * Bump version number to 0.11.1 > > Tue Jan 6 23:13:58 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2009 shelarcy <shelarc= > y...@gm...> > * Add Word8 and Word32 support. > > Wed Jan 7 00:18:18 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2009 shelarcy <shelarc= > y...@gm...> > * Change Color's primitive type from CChar to Word8. > > Wed Jan 7 02:11:39 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2009 shelarcy <shelarc= > y...@gm...> > * Add Word support. > > Wed Jan 7 03:23:10 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2009 shelarcy <shelarc= > y...@gm...> > * Add experimental alpha channel support to Color type. -- shelarcy <shelarcy hotmail.co.jp> http://page.freett.com/shelarcy/ |
From: Kido T. <she...@co...> - 2009-01-07 02:17:09
|
Tue Jan 6 09:13:58 EST 2009 shelarcy <she...@gm...> * Add Word8 and Word32 support. Ignore-this: 704189efa0ea7576c4752df6d9a39faf M ./wxc/include/wxc_types.h +6 M ./wxdirect/src/CompileClasses.hs +4 M ./wxdirect/src/ParseC.hs +2 M ./wxdirect/src/Types.hs +2 View patch online: http://code.haskell.org/wxhaskell/_darcs/patches/20090106141358-c1071-7dbab878267d72e157f9dc97b30b5c18d367d8ba.gz |