Menu
▾
▴
wxhaskell-users — General mailing list for wxhaskell users
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(12) |
Aug
(34) |
Sep
(14) |
Oct
(36) |
Nov
(32) |
Dec
(15) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
|
Feb
(9) |
Mar
(31) |
Apr
(36) |
May
(17) |
Jun
(21) |
Jul
(13) |
Aug
(18) |
Sep
(2) |
Oct
(10) |
Nov
(18) |
Dec
(28) |
| 2005 |
Jan
(26) |
Feb
(15) |
Mar
(26) |
Apr
(11) |
May
(60) |
Jun
(3) |
Jul
(12) |
Aug
(4) |
Sep
(12) |
Oct
(19) |
Nov
(36) |
Dec
(10) |
| 2006 |
Jan
(6) |
Feb
(13) |
Mar
(6) |
Apr
(2) |
May
(9) |
Jun
(3) |
Jul
(6) |
Aug
(13) |
Sep
(1) |
Oct
(24) |
Nov
(33) |
Dec
(47) |
| 2007 |
Jan
(21) |
Feb
(41) |
Mar
(17) |
Apr
(9) |
May
(4) |
Jun
(20) |
Jul
(24) |
Aug
(71) |
Sep
(35) |
Oct
(10) |
Nov
(39) |
Dec
(39) |
| 2008 |
Jan
(24) |
Feb
(42) |
Mar
(61) |
Apr
(12) |
May
(11) |
Jun
(4) |
Jul
(9) |
Aug
(6) |
Sep
(6) |
Oct
(4) |
Nov
(3) |
Dec
(14) |
| 2009 |
Jan
(25) |
Feb
(18) |
Mar
(19) |
Apr
(24) |
May
(14) |
Jun
(7) |
Jul
(14) |
Aug
(25) |
Sep
(40) |
Oct
(20) |
Nov
(22) |
Dec
(4) |
| 2010 |
Jan
(55) |
Feb
(11) |
Mar
(9) |
Apr
(10) |
May
(10) |
Jun
(9) |
Jul
(7) |
Aug
(4) |
Sep
(15) |
Oct
(7) |
Nov
(2) |
Dec
(3) |
| 2011 |
Jan
(2) |
Feb
(1) |
Mar
(4) |
Apr
(6) |
May
(20) |
Jun
(30) |
Jul
(15) |
Aug
(4) |
Sep
(23) |
Oct
(24) |
Nov
(3) |
Dec
(8) |
| 2012 |
Jan
(23) |
Feb
(7) |
Mar
(19) |
Apr
(48) |
May
(8) |
Jun
(27) |
Jul
(10) |
Aug
(1) |
Sep
(11) |
Oct
(1) |
Nov
|
Dec
(3) |
| 2013 |
Jan
(1) |
Feb
|
Mar
(17) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(12) |
Sep
(2) |
Oct
|
Nov
|
Dec
(1) |
| 2015 |
Jan
|
Feb
|
Mar
(14) |
Apr
(5) |
May
(1) |
Jun
|
Jul
|
Aug
(2) |
Sep
(5) |
Oct
(1) |
Nov
(2) |
Dec
(1) |
| 2016 |
Jan
(7) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2018 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Jeremy O'D. <jer...@gm...> - 2007-08-21 09:12:59
|
Hi Shelarcy, On 20/08/07, shelarcy <she...@gm...> wrote: > > On Tue, 21 Aug 2007 00:42:26 +0900, Jeremy O'Donoghue <jer...@gm...> wrote: > > > > This really only works as an option if we decide that users must build > > wxWidgets from source *before* they can build wxHaskell. > > Really? > I think that nowadays wxWidgets packager worried about wxPython. > And wxPython depends on contribs. > > http://www.wxpython.org/builddoc.php [snip other examples of bindings depending on contrib] > So I want to know about wxWidgets package's condition. > > > It's likely to be irritating to Linux users who are used to "apt-get > > install wxWidgets" as their usual approach to installing libraries. > > Is this right? > Any packages system's wxWidgets doesn't have contrib? Or any package > system doesn't choose version that supports contrib? So far as I can tell, Debian supports contrib on wxWidgets 2.4 but not 2.6 (and doesn't yet have a wxWidgets 2.8 package), so I do think this is an issue, e.g.: http://packages.debian.org/unstable/libdevel/libwxgtk2.4-contrib-dev http://packages.debian.org/unstable/libdevel/libwxgtk2.6-dev However, I'm convinced by your argument that the contrib components are useful, and that we should depend on them - I think that all it means is that we need to provide binaries for wxWidgets for those who have neither the time nor inclination to build themselves. Therefore, I'll complete the updates to the build system on the basis that contrib components (and OpenGL support) have been compiled into wxWidgets. Regards Jeremy |
|
From: Eric K. <eri...@gm...> - 2007-08-21 08:38:40
|
SGkgSmVyZW15LAoKPiAoKikgVGhlcmUncyBhIHNlY29uZGFyeSByZWFzb24gZm9yIGZhY3Rvcmlu ZyBvdXQgdGhlIHd4YyBidWlsZCBmcm9tCj4gdGhlIHd4SGFza2VsbCBidWlsZDogYSBudW1iZXIg b2Ygb3RoZXIgbGFuZ3VhZ2VzIChtb3N0IG9mIHRoZW0gaW4gdGhlCj4gRlAgY2h1cmNoLCBpZiB5 b3UgZGVmaW5lIGl0IHJlYXNvbmFibHkgYnJvYWRseSkgdXNlIHd4QyBhcyB0aGUgYmFzaXMKPiBm b3IgdGhlaXIgd3hXaWRnZXRzIGJpbmRpbmdzLgoKQXJlIHlvdSBhd2FyZSBvZiB0aGUgd3hjIHBy b2plY3QgYnkgYW55IGNoYW5jZT8KCmh0dHA6Ly93eGMuc291cmNlZm9yZ2UubmV0LwoKV2UgaGFk IGRpc2N1c3NlZCBwb29saW5nIG91ciByZXNvdXJjZXMgYXQgc29tZSBwb2ludCwgYnV0IGRlY2lk ZWQgdGhlCmJlc3QgdGhpbmcgd2FzIHRvIHByaW9yaXRpc2UgYSB3eGhhc2tlbGwgcmVsZWFzZSBh bmQgdGhlbiB0YWxrIGFib3V0CndvcmtpbmcgdG9nZXRoZXIuCgotLSAKRXJpYyBLb3cgICAgICAg ICAgICAgICAgICAgICBodHRwOi8vd3d3LmxvcmlhLmZyL35rb3cKUEdQIEtleSBJRDogMDhBQzA0 RjkgICAgICAgICBNZXJjaSBkZSBjb3JyaWdlciBtb24gZnJhbsOnYWlzLgo= |
|
From: Jeremy O'D. <jer...@gm...> - 2007-08-21 08:32:40
|
HI Shelarcy, On 21/08/07, shelarcy <she...@gm...> wrote: > > The problem is that we can't use nmake, because building on Windows > deeply depends on Visual C++ project files. I've actually already almost solved this. I've factored out the wxc build from the top level makefile(*) and made it compatible with Visual Studio 2005 command line tools as well as GCC. This will enable a single makefile to be used for building wxC on all hosts OS. The Visual Studio project files are awkward to maintain because they require editing depending on the file locations chosen on build machine, and require irritating small changes whenever the underlying wxWidgets version changes. It has required a lot of work to get this working for all cases (I haven't rolled out the patch as I don't consider it fully tested as yet), but I do think that it represents a more easily maintainable way forward. What I'm trying to get to is a top level build system where all the user needs to do (once wxWidgets installed) is: runghc Setup.hs configure runghc Setup.hs build runghc Setup.hs install i.e. it will look just like a Cabal build even though large parts of the build are actually Makefiles. This should make things much simpler for newcomers as it's the same set of build commands as used on most Haskell projects these days. I'm more than 90% finished with this, and when it comes along it will represent a pretty large patch (so maybe Eric will be glad not to have to do a detailed review :-) on the build system. Regards Jeremy (*) There's a secondary reason for factoring out the wxc build from the wxHaskell build: a number of other languages (most of them in the FP church, if you define it reasonably broadly) use wxC as the basis for their wxWidgets bindings. In pretty much every case, the original Eiffel wxC implementation was forked, and then no-one has really maintained the C bindings. The wxHaskell implementation of wxC is far and away the most mature and best maintained C binding to wxWidgets (I checked the others - looking to see if we could bring in any code). By making wxC buildable separately from wxHaskell, maintainers of other wxWidgets bindings can make use of wxC more readily, and hopefully we can encourage maintainers of the other language bindings to contribute improvements to the C bindings in a single place... to the benefit of wxHaskell. |
|
From: Eric Y. K. <eri...@gm...> - 2007-08-21 06:00:41
|
Pushed in. Thanks. --=20 Eric Kow http://www.loria.fr/~kow PGP Key ID: 08AC04F9 Merci de corriger mon fran=E7ais. |
|
From: Eric Y. K. <eri...@gm...> - 2007-08-21 06:00:27
|
> Sun Aug 19 22:59:54 CEST 2007 Eric Kow <eri...@lo...> > * Remove auto-generated stc files. > Otherwise, you get annoying new changes in the working directory. Pushed in. Note that darcs complains about an invalid pending bug, but it seems harmless (and will hopefully be fixed in the next version). You can avoid the problem by reverting any changes to these two files before you pull. --=20 Eric Kow http://www.loria.fr/~kow PGP Key ID: 08AC04F9 Merci de corriger mon fran=E7ais. |
|
From: shelarcy <she...@gm...> - 2007-08-21 05:41:50
|
DarcsURL: http://darcs.haskell.org/wxhaskell/=0A= MIME-Version: 1.0=0A= Content-Type: multipart/mixed; boundary=3D"=3D_"=0A= =0A= --=3D_=0A= Content-Type: text/plain=0A= Content-Transfer-Encoding: quoted-printable=0A= =0A= Tue Aug 21 13:34:53 =3D93=3D8C=3D8B=3D9E (=3D95W=3D8F=3D80=3D8E=3D9E) = 2007 shelarcy <shelarc=3D=0A= y...@gm...>=0A= * Remove old wxh samples=0A= =0A= Tue Aug 21 13:37:54 =3D93=3D8C=3D8B=3D9E (=3D95W=3D8F=3D80=3D8E=3D9E) = 2007 shelarcy <shelarc=3D=0A= y...@gm...>=0A= * Remove old wxc project files between 2.6.0 - 2.6.3=0A= =0A= Tue Aug 21 13:46:12 =3D93=3D8C=3D8B=3D9E (=3D95W=3D8F=3D80=3D8E=3D9E) = 2007 shelarcy <shelarc=3D=0A= y...@gm...>=0A= * Update VC++ project file to reflect updated DLL version supporting = wxWi=3D=0A= dgets 2.6.4=0A= =0A= Tue Aug 21 14:09:57 =3D93=3D8C=3D8B=3D9E (=3D95W=3D8F=3D80=3D8E=3D9E) = 2007 shelarcy <shelarc=3D=0A= y...@gm...>=0A= * Rename wxcu-2.6.4.* to wxc-2.6.* as wxc-2.4 things=0A= =0A= --=3D_=0A= Content-Type: text/x-darcs-patch; name=3D"remove-old-wxh-samples.dpatch"=0A= Content-Transfer-Encoding: quoted-printable=0A= Content-Description: A darcs patch for your repository!=0A= =0A= =0A= New patches:=0A= =0A= [Remove old wxh samples=0A= shelarcy <she...@gm...>**20070821043453] {=0A= hunk ./samples/wxh/BouncingBalls.hs 1=0A= -{-----------------------------------------------------------------------= --=3D=0A= -------=0A= - Bouncing Balls demo=0A= -------------------------------------------------------------------------= --=3D=0A= ------}=0A= -module Main where=0A= -=0A= -import Graphics.UI.WXH=0A= -=0A= -main=0A= - =3D3D run ballsFrame=0A= -=0A= -ballsFrame=0A= - =3D3D do -- a list of balls, where each ball is represented by a list = of a=3D=0A= ll future Y positions.=0A= - vballs <- varCreate []=0A= -=0A= - -- create a non-user-resizable top-level (orphan) frame.=0A= - f <- frameCreate objectNull idAny "Bouncing balls" rectNull=0A= - (wxMINIMIZE_BOX + wxSYSTEM_MENU + wxCAPTION + = wxN=3D=0A= O_FULL_REPAINT_ON_RESIZE + wxCLIP_CHILDREN)=0A= - windowSetClientSize f (sz maxX maxY)=0A= -=0A= - -- add a panel to draw on, nice grey color.=0A= - p <- panelCreate f idAny rectNull 0 -- = (wxNO_FULL_REPAINT_ON_RESIZE=3D=0A= )=0A= -=0A= - -- create a timer, on each tick it advances all the balls to = their =3D=0A= next position=0A= - t <- windowTimerCreate f=0A= - timerOnCommand t (nextBalls p vballs)=0A= -=0A= - -- paint the balls: double buffer is not really necessary as the = ba=3D=0A= lls are too small anyway.=0A= - windowOnPaint p False {- double-buffer? -} (paintBalls vballs)=0A= -=0A= - -- left-click: new ball, right-click: new window=0A= - windowOnMouse p False {- no motion events -} (onMouse p vballs)=0A= -=0A= - -- '-': decrease interval, '+': increase interval.=0A= - windowOnKeyChar p (onKey t)=0A= -=0A= - -- show the frame=0A= - windowShow f=0A= - windowRaise f=0A= -=0A= - -- and start the timer (25 msec).=0A= - timerStart t 25 False {- one-shot timer? -}=0A= - return ()=0A= - where=0A= - -- react on mouse events=0A= - onMouse w vballs mouse=0A= - =3D3D case mouse of=0A= - MouseLeftDown pt mods -> dropBall w vballs pt -- new ball=0A= - MouseRightDown pt mods -> ballsFrame -- new window = wi=3D=0A= th bouncing balls=0A= - other -> skipCurrentEvent -- = unprocessed e=3D=0A= vent: send up the window chain=0A= -=0A= - -- react on the keyboard=0A= - onKey t keyboard=0A= - =3D3D case keyKey keyboard of=0A= - KeyChar '-' -> updateInterval t (\i -> i+5)=0A= - KeyChar '+' -> updateInterval t (\i -> max 1 (i-5))=0A= - other -> skipCurrentEvent=0A= -=0A= - updateInterval t f=0A= - =3D3D do i <- timerGetInterval t=0A= - timerStop t=0A= - timerStart t (f i) False=0A= - return ()=0A= -=0A= - -- advance all the balls to their next position=0A= - nextBalls w vballs=0A= - =3D3D do varUpdate vballs (filter (not.null) . map (drop 1))=0A= - windowRefresh w False=0A= -=0A= - -- add a new ball=0A= - dropBall w vballs pt=0A= - =3D3D do varUpdate vballs (bouncing pt:)=0A= - windowRefresh w False=0A= -=0A= - -- calculate all future positions=0A= - bouncing (Point x y)=0A= - =3D3D map (\h -> Point x (maxH-h)) (bounce (maxH-y) 0)=0A= -=0A= - bounce h v=0A= - | h <=3D3D 0 && v =3D3D=3D3D 0 =3D3D []=0A= - | h <=3D3D 0 && v < 0 =3D3D bounce 0 ((-v)-2)=0A= - | otherwise =3D3D h : bounce (h+v) (v-1)=0A= -=0A= -=0A= - -- paint the balls=0A= - paintBalls vballs dc viewRect updateAreas=0A= - =3D3D do dcClear dc=0A= - balls <- varGet vballs=0A= - dcWithBrushStyle dc (BrushStyle BrushSolid red) $=0A= - mapM_ (drawBall dc) (map head (filter (not.null) balls))=0A= -=0A= - drawBall dc pt=0A= - =3D3D dcDrawCircle dc pt radius=0A= -=0A= -=0A= --- radius the ball, and the maximal x and y coordinates=0A= -radius, maxX, maxY :: Int=0A= -maxY =3D3D 300=0A= -maxX =3D3D 300=0A= -radius =3D3D 10=0A= -=0A= --- the max. height is at most max. y minus the radius of a ball.=0A= -maxH :: Int=0A= -maxH =3D3D maxY - radius=0A= +=0A= rmfile ./samples/wxh/BouncingBalls.hs=0A= hunk ./samples/wxh/ByeDemo.hs 1=0A= -{-----------------------------------------------------------------------= --=3D=0A= -------=0A= -This program implements the "goodbye" demo as posted by John Meacham on=0A= -the Haskell GUI mailing list. The program is specified as:=0A= -=0A= -I propose a simple program which pops up a window saying 'Hello World'=0A= -with a button saying 'Bye' which you click and it changes the message=0A= -to 'Goodbye'. if you click the button again the program exits.=0A= -=0A= -When the button is clicked the first time, it calls "onCommand1". This = fun=3D=0A= ction=0A= -changes the text of the label and installs another event handler on the = bu=3D=0A= tton=0A= -that closes the main frame. (by default, wxWindows exits the gui when = all=0A= -windows are closed).=0A= -------------------------------------------------------------------------= --=3D=0A= ------}=0A= -module Main where=0A= -=0A= -import Graphics.UI.WXH=0A= -=0A= -main :: IO ()=0A= -main=0A= - =3D3D run gui=0A= -=0A= -gui :: IO ()=0A= -gui=0A= - =3D3D do -- create top frame=0A= - f <- frameCreateTopFrame "Bye demo"=0A= - windowSetBackgroundColour f white=0A= -=0A= - -- panel for automatic tab management and the nice background=0A= - p <- panelCreate f idAny rectNull 0=0A= -=0A= - -- create text and button control=0A= - t <- staticTextCreate p idAny "Hello World" rectNull 0=0A= - b <- buttonCreate p idAny "Bye" rectNull 0=0A= -=0A= - -- press spacebar to invoke the button by default=0A= - panelSetDefaultItem p b=0A= -=0A= - -- set the layout=0A= - windowSetLayout f (fill (container p (margin 5 (column 5 [widget = t,=3D=0A= widget b]))))=0A= -=0A= - -- set command handler on the button=0A= - buttonOnCommand b (onCommand1 f t b)=0A= -=0A= - -- show the frame=0A= - windowShow f=0A= - windowRaise f=0A= - return ()=0A= - where=0A= - -- call on the first click=0A= - onCommand1 f t b=0A= - =3D3D do controlSetLabel t "Goodbye!"=0A= - buttonOnCommand b (onCommand2 f)=0A= - return ()=0A= -=0A= - -- call on the second click=0A= - onCommand2 f=0A= - =3D3D do windowClose f False {- can veto -}=0A= - return ()=0A= +=0A= rmfile ./samples/wxh/ByeDemo.hs=0A= hunk ./samples/wxh/HelloWorld.hs 1=0A= -{-----------------------------------------------------------------------= --=3D=0A= -------=0A= - The 'hello world' demo from the wxWindows site.=0A= -------------------------------------------------------------------------= --=3D=0A= ------}=0A= -module Main where=0A= -=0A= -import Graphics.UI.WXH=0A= -=0A= -main=0A= - =3D3D run helloWorld=0A= -=0A= -helloWorld=0A= - =3D3D do -- create file menu: we use standard Id's but could also use = any =3D=0A= other identifier, like 1 or 27.=0A= - fm <- menuCreate "" 0=0A= - menuAppend fm wxID_ABOUT "&About.." "About wxHaskell" False {- = not =3D=0A= checkable -}=0A= - menuAppendSeparator fm=0A= - menuAppend fm wxID_EXIT "&Quit\tCtrl-Q" "Quit the demo" False=0A= -=0A= - -- create menu bar=0A= - m <- menuBarCreate 0=0A= - menuBarAppend m fm "&File"=0A= -=0A= - -- create top frame=0A= - f <- frameCreateTopFrame "Hello world"=0A= - windowSetBackgroundColour f white=0A= - windowSetClientSize f (sz 300 250)=0A= -=0A= - -- set status bar with 1 field=0A= - frameCreateStatusBar f 1 0=0A= - frameSetStatusText f "Welcome to wxHaskell" 0=0A= -=0A= - -- connect menu=0A= - frameSetMenuBar f m=0A= - evtHandlerOnMenuCommand f wxID_ABOUT (onAbout f)=0A= - evtHandlerOnMenuCommand f wxID_EXIT (onQuit f)=0A= -=0A= - -- show it=0A= - windowShow f=0A= - windowRaise f=0A= - return ()=0A= - where=0A= - onAbout f=0A= - =3D3D do messageDialog f "About 'Hello World'" "This is a = wxHaskell sa=3D=0A= mple" (wxOK + wxICON_INFORMATION)=0A= - return ()=0A= -=0A= - onQuit f=0A= - =3D3D do windowClose f True {- force close -}=0A= - return ()=0A= +=0A= rmfile ./samples/wxh/HelloWorld.hs=0A= hunk ./samples/wxh/ImageViewer.hs 1=0A= -{-----------------------------------------------------------------------= --=3D=0A= -------=0A= - A utility to view images=0A= -------------------------------------------------------------------------= --=3D=0A= ------}=0A= -module Main where=0A= -=0A= -import Char( toLower )=0A= -import Graphics.UI.WXH=0A= -=0A= -defaultWidth,defaultHeight :: Int=0A= -defaultWidth =3D3D 300=0A= -defaultHeight =3D3D 300=0A= -=0A= -main=0A= - =3D3D run imageViewer=0A= -=0A= -imageViewer=0A= - =3D3D do -- variable that holds the current bitmap=0A= - vbitmap <- varCreate Nothing=0A= -=0A= - -- create file menu: we use standard Id's but could also use any = ot=3D=0A= her identifier, like 1 or 27.=0A= - fm <- menuCreate "" 0=0A= - menuAppend fm wxID_OPEN "&Open..\tCtrl+O" "Open image" False=0A= - menuAppend fm wxID_CLOSE "&Close\tCtrl+C" "Close image" False=0A= - menuAppendSeparator fm=0A= - menuAppend fm wxID_ABOUT "&About.." "About ImageViewer" False {- = no=3D=0A= t checkable -}=0A= - menuAppend fm wxID_EXIT "&Quit\tCtrl+Q" "Quit the viewer" = False=0A= -=0A= - -- disable close=0A= - menuEnable fm wxID_CLOSE False=0A= -=0A= - -- create menu bar=0A= - m <- menuBarCreate 0=0A= - menuBarAppend m fm "&File"=0A= -=0A= - -- create top frame=0A= - f <- frameCreateTopFrame "Image Viewer"=0A= - windowSetClientSize f (sz defaultWidth defaultHeight)=0A= -=0A= - -- coolness: set a custom icon=0A= - frameSetIconFromFile f "ImageViewer.ico"=0A= -=0A= - -- put a scrolled window inside the frame to paint the image on=0A= - -- note that 'wxNO_FULL_REPAINT_ON_RESIZE' is needed to prevent = fl=3D=0A= icker on resize.=0A= - s <- scrolledWindowCreate f idAny rectNull (wxHSCROLL + = wxVSCROLL +=3D=0A= wxNO_FULL_REPAINT_ON_RESIZE + wxCLIP_CHILDREN)=0A= -=0A= - -- set paint event handler:=0A= - windowOnPaint s False {- double buffer? -} (onPaint vbitmap)=0A= -=0A= - -- connect menu=0A= - frameSetMenuBar f m=0A= - evtHandlerOnMenuCommand f wxID_OPEN (onOpen f vbitmap fm s)=0A= - evtHandlerOnMenuCommand f wxID_CLOSE (onClose f vbitmap fm s)=0A= - evtHandlerOnMenuCommand f wxID_ABOUT (onAbout f)=0A= - evtHandlerOnMenuCommand f wxID_EXIT (onQuit f)=0A= - windowAddOnDelete f (close f vbitmap)=0A= - -- show it=0A= - windowShow f=0A= - windowRaise f=0A= -=0A= - return ()=0A= - where=0A= - onAbout f=0A= - =3D3D infoDialog f "About 'Image Viewer'" "This is a wxHaskell = demo"=0A= -=0A= - onQuit f=0A= - =3D3D do windowClose f True {- force close -}=0A= - return ()=0A= -=0A= - onOpen f vbitmap fm s=0A= - =3D3D do mbfname <- fileOpenDialog f True True "Open image" = imageFiles=3D=0A= "" ""=0A= - case mbfname of=0A= - Nothing=0A= - -> return ()=0A= - Just fname=0A= - -> do bm <- bitmapCreateFromFile fname -- can fail with = ex=3D=0A= ception=0A= - close f vbitmap=0A= - varSet vbitmap (Just bm)=0A= - menuEnable fm wxID_CLOSE True=0A= - -- and than reset the scrollbars and resize around = th=3D=0A= e picture=0A= - w <- bitmapGetWidth bm=0A= - h <- bitmapGetHeight bm=0A= - oldsz <- windowGetClientSize f=0A= - let newsz =3D3D (sizeMin (sz w h) oldsz)=0A= - windowSetClientSize f newsz=0A= - scrolledWindowSetScrollbars s 1 1 w h 0 0 False=0A= - -- and repaint explicitly (to delete previous = stuff)=0A= - withClientDC s (\dc -> onPaint vbitmap dc = (rectFromSi=3D=0A= ze newsz) [])=0A= - `catch` (\err -> return ())=0A= - where=0A= - imageFiles=0A= - =3D3D [("Image files",["*.bmp","*.jpg","*.gif","*.png"])=0A= - ,("Portable Network Graphics (*.png)",["*.png"])=0A= - ,("BMP files (*.bmp)",["*.bmp"])=0A= - ,("JPG files (*.jpg)",["*.jpg"])=0A= - ,("GIF files (*.gif)",["*.gif"])=0A= - ]=0A= -=0A= -=0A= - onClose f vbitmap fm s=0A= - =3D3D do close f vbitmap=0A= - menuEnable fm wxID_CLOSE False=0A= - -- explicitly delete the old bitmap=0A= - withClientDC s dcClear=0A= - -- and than reset the scrollbars=0A= - scrolledWindowSetScrollbars s 1 1 0 0 0 0 False=0A= -=0A= - close f vbitmap=0A= - =3D3D do mbBitmap <- varSwap vbitmap Nothing=0A= - case mbBitmap of=0A= - Nothing -> return ()=0A= - Just bm -> bitmapDelete bm=0A= -=0A= - onPaint vbitmap dc viewRect updateAreas=0A= - =3D3D do -- clear the canvas=0A= - dcClear dc=0A= - mbBitmap <- varGet vbitmap=0A= - case mbBitmap of=0A= - Nothing -> return ()=0A= - Just bm -> do dcDrawBitmap dc bm pointZero False {- use = mask?=3D=0A= -}=0A= - return ()=0A= +=0A= rmfile ./samples/wxh/ImageViewer.hs=0A= binary ./samples/wxh/ImageViewer.ico=0A= oldhex=0A= *0000010001003030ff0000000000a80e0000160000002800000030000000600000000100= 08=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000080808000800000010= 10=3D=0A= 1000=0A= *181818001810000010100000211810005249420010100800312810002928100031302900= 42=3D=0A= 4139=0A= *00393839005a595a006b696b007371730029282900393829005a5142004a4121004a4118= 00=3D=0A= 6359=0A= *4200423818004a49310063594a004238290039301800393831004a494a007b797b006361= 63=3D=0A= 0031=0A= *303100524929004a412900525139005a59390042382100424131008486840063615a0029= 28=3D=0A= 1800=0A= *424129004a3818005a513900635131004a4929005a4929007b7152007b714a0052492100= 6b=3D=0A= 614a=0A= *0073715a006b695200393821008c8e8c00adaead00a5a6a5009496940063614a00636142= 00=3D=0A= 5249=0A= *31004a41310031282100080800002120180073613100847152008c796300424121005251= 31=3D=0A= 0052=0A= *51420073716300cecfce00c6c7c60021201000636139006b613900948663002920180084= 79=3D=0A= 5a00=0A= *6b6942007369520063513900d6d7d600b5b6b500736139007369420073714a008c866b00= 8c=3D=0A= 8e6b=0A= *0073694a0039381800dedfde007b7973008c8663005a5942006b6142006b6131008c8e73= 00=3D=0A= 4a49=0A= *3900e7e7e700bdbebd009c9e9c006b69630084795200312818008486630084866b007b79= 5a=3D=0A= 004a=0A= *494200635931005a51210052515200f7f7f700efefef005a512900313010008c8e63007b= 79=3D=0A= 5200=0A= *ffffff0029282100737152005a593100525129006b694a0084794a004241420073693900= 8c=3D=0A= 865a=0A= *0063593900313018006361520031302100948e63007b7142007b715a007b716b006b695a= 00=3D=0A= 5249=0A= *390021202100181810000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000001010000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000002000000000001030304010001000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000005060708090a0b0c0d0e0f0f10111111101200= 00=3D=0A= 0000=0A= *0000000000000000000000000000000000000000000000000013141516171718191a1b1c= 1d=3D=0A= 1e1f=0A= *1f1f1f1f1120210100000000000000000000000000000000000000000000041d0c222317= 24=3D=0A= 1525=0A= *17161717261c13270c11282828281f1f1004000000000000000000000000000000000000= 00=3D=0A= 0120=0A= *292a2b162c2d172e2f1730313233343536372738393a3b382828111e0000000000000000= 00=3D=0A= 0000=0A= *000000000000001f28123c3d343e223f404142071443444517464748494a4a4a4b393828= 1f=3D=0A= 2000=0A= *00000000000000000000000000000003201f4c4d4e314f480000000000005051523d5353= 54=3D=0A= 1b4b=0A= *5555554a4b3a281f11010000000000000000000000000000035628465758595300000000= 00=3D=0A= 0000=0A= *00135a5b5c225d191f5e5e55554a4b563b1f10030000000000000000000000000020553b= 5f=3D=0A= 6051=0A= *516100011200000000004262633d25366465665e5e55554a4b67681f2001000000000000= 00=3D=0A= 0000=0A= *000000115556696a574e6b0028670e0000000042365b6c646d6e6f665e5e5e55554a6756= 3a=3D=0A= 1f04=0A= *00000000000000000000000000384b137071583472737472000000000975584e225d7627= 4b=3D=0A= 665e=0A= *5e5e554a4b673968030000000000000000000000000000381d616e77786779741e000000= 00=3D=0A= 7a7b=0A= *597c7d2f15373a66665e5e554a4b671f040000000000000000000000000000000110217e= 4d=3D=0A= 5a73=0A= *79660f000000002d7f327b346125126666665e5e554a3980040000000000000000000000= 00=3D=0A= 0000=0A= *0000000121130a3c67555e200000003f81608283253c480f66665e5e5567682103000000= 00=3D=0A= 0000=0A= *00000000000000000000000000001248841f3b3a8586272f878857588961247a4b5e5e4a= 39=3D=0A= 3838=0A= *2101000000000000000000000000000000000000000000000006198a8b3f4761336a824e= 75=3D=0A= 2225=0A= *0d3b6768281f111112030000000000000000000000000000000000000000000000000000= 2a=3D=0A= 5d37=0A= *238c1c2b1a2426377a722811111111208d04000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *00000000000000008e233f375d24246f8d20111111111172040000000000000000000000= 00=3D=0A= 0000=0A= *00000000000000000000000000000000000000094c376f211e111111101e120100000000= 00=3D=0A= 0000=0A= *0000000000000000000000000000000000000000000000000000000000000000038d0400= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000000000000000= 00=3D=0A= 0000=0A= *000000000000000000000000000000000000000000000000000000000000=0A= newhex=0A= *=0A= rmfile ./samples/wxh/ImageViewer.ico=0A= hunk ./samples/wxh/Minimal.hs 1=0A= -module Main where=0A= -=0A= -import Graphics.UI.WXH=0A= -=0A= -main :: IO ()=0A= -main=0A= - =3D3D run gui=0A= -=0A= -gui :: IO ()=0A= -gui=0A= - =3D3D do frame <- frameCreateTopFrame "Hello World"=0A= - windowShow frame=0A= - windowRaise frame=0A= - return ()=0A= +=0A= rmfile ./samples/wxh/Minimal.hs=0A= hunk ./samples/wxh/Paint.hs 1=0A= -{-----------------------------------------------------------------------= --=3D=0A= -------=0A= - Copyright 2003, Daan Leijen=0A= - Paint demo.=0A= -------------------------------------------------------------------------= --=3D=0A= ------}=0A= -module Main where=0A= -=0A= -import Graphics.UI.WXH=0A= -=0A= -main :: IO ()=0A= -main=0A= - =3D3D run gui=0A= -=0A= -gui :: IO ()=0A= -gui=0A= - =3D3D do -- create top frame=0A= - f <- frameCreateTopFrame "Paint demo"=0A= -=0A= - -- for good measure: put a scrolled window inside the frame=0A= - -- note that 'wxNO_FULL_REPAINT_ON_RESIZE' is needed to prevent = fl=3D=0A= icker on resize.=0A= - s <- scrolledWindowCreate f idAny rectNull (wxHSCROLL + = wxVSCROLL +=3D=0A= wxNO_FULL_REPAINT_ON_RESIZE + wxCLIP_CHILDREN)=0A= -=0A= - -- virtual size is 20*40 =3D3D 800 pixels=0A= - scrolledWindowSetScrollbars s 20 20 40 40 0 0 False=0A= -=0A= - -- to show the effect of double-buffering, we track the mouse = with =3D=0A= a small disc.=0A= - mouseXY <- varCreate (pt 0 0)=0A= - windowOnMouse s True {- get motion events -} (onMouse s mouseXY)=0A= -=0A= - -- set paint event handler:=0A= - windowOnPaint s True {- double buffer? -} (onPaint mouseXY)=0A= -=0A= - -- show the frame=0A= - windowShow f=0A= - windowRaise f=0A= - return ()=0A= - where=0A= - -- update the mouse position and force a repaint=0A= - onMouse w mouseXY mouse=0A= - =3D3D do varSet mouseXY (mousePos mouse)=0A= - windowRefresh w False {- erase background -}=0A= -=0A= - -- do some painting.=0A= - onPaint mouseXY dc viewRect updateAreas=0A= - =3D3D -- first create some brushes and pens.=0A= - withBrushStyle (BrushStyle (BrushHatch HatchCross) red) $ = \brushRe=3D=0A= dHatch ->=0A= - withBrushStyle (BrushStyle BrushSolid red) $ \brushRed ->=0A= - withBrushStyle (BrushStyle BrushSolid white) $ \brushWhite ->=0A= - withPenStyle (penColored blue 5) $ \penMedBlue ->=0A= - do -- clear the canvas=0A= - dcClear dc=0A= -=0A= - dcSetBrush dc brushWhite=0A= - dcDrawRectangle dc (rect (pt 20 20) (sz 500 500))=0A= -=0A= - dcSetBrush dc brushRedHatch=0A= - dcDrawCircle dc (pt 100 100) 50=0A= -=0A= - dcSetPen dc penMedBlue=0A= - dcDrawRectangle dc (rect (pt 200 200) (sz 50 50))=0A= -=0A= - dcSetBrush dc brushRed=0A= - dcDrawEllipticArc dc (rect (pt 100 200) (sz 50 100)) 45 135=0A= -=0A= - -- draw the mouse bullet=0A= - xy <- varGet mouseXY=0A= - dcDrawCircle dc xy 10=0A= -=0A= - drawPolygon dc [(pt 200 400),(pt 300 300),(pt 400 400)]=0A= - dcDrawRotatedText dc "Polygon" (pt 200 370) 45=0A= -=0A= - -- fonts=0A= - dcWithFontStyle dc fontSwiss{ _fontSize =3D3D 12, = _fontWeight =3D3D=3D=0A= WeightBold } $=0A= - do dcDrawText dc "Swiss 12pt bold" (pt 50 270)=0A= - dcWithFontStyle dc fontDefault{ _fontFamily =3D3D = FontScript,=3D=0A= _fontSize =3D3D 16} $=0A= - dcDrawText dc "Hand writing 16pt" (pt 50 290)=0A= - dcDrawText dc "Swiss 12pt bold" (pt 50 310)=0A= -=0A= - (Size w h) <- getTextExtent dc "label"=0A= - dcDrawRectangle dc (rect (pt 450 350) (sz (w+10) (h+10)))=0A= - dcDrawText dc "label" (pt 455 355)=0A= -=0A= - -- cap styles=0A= - dcWithPenStyle dc (penDefault{ _penWidth =3D3D 20, _penCap = =3D3D Ca=3D=0A= pRound }) $=0A= - dcDrawLine dc (pt 400 100) (pt 500 100)=0A= -=0A= - dcWithPenStyle dc (penDefault{ _penWidth =3D3D 20, _penCap = =3D3D Ca=3D=0A= pProjecting }) $=0A= - dcDrawLine dc (pt 400 150) (pt 500 150)=0A= -=0A= - dcWithPenStyle dc (penDefault{ _penWidth =3D3D 20, _penCap = =3D3D Ca=3D=0A= pButt }) $=0A= - dcDrawLine dc (pt 400 200) (pt 500 200)=0A= -=0A= - dcSetBrush dc nullBrush=0A= - dcDrawEllipse dc (rect (pt 200 100) (sz 100 50))=0A= +=0A= rmfile ./samples/wxh/Paint.hs=0A= rmdir ./samples/wxh=0A= }=0A= =0A= [Remove old wxc project files between 2.6.0 - 2.6.3=0A= shelarcy <she...@gm...>**20070821043754] {=0A= hunk ./wxc/wxc-2.6.0.dsp 1=0A= -# Microsoft Developer Studio Project File - Name=3D3D"wxc" - Package = Owner=3D=0A= =3D3D<4>=3D0D=0A= -# Microsoft Developer Studio Generated Build File, Format Version = 6.00=3D0D=0A= -# ** DO NOT EDIT **=3D0D=0A= -=3D0D=0A= -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102=3D0D=0A= -=3D0D=0A= -CFG=3D3Dwxc - Win32 Debug=3D0D=0A= -!MESSAGE This is not a valid makefile. To build this project using = NMAKE,=3D=0A= =3D0D=0A= -!MESSAGE use the Export Makefile command and run=3D0D=0A= -!MESSAGE =3D0D=0A= -!MESSAGE NMAKE /f "wxc-2.6.0.mak".=3D0D=0A= -!MESSAGE =3D0D=0A= -!MESSAGE You can specify a configuration when running NMAKE=3D0D=0A= -!MESSAGE by defining the macro CFG on the command line. For = example:=3D0D=0A= -!MESSAGE =3D0D=0A= -!MESSAGE NMAKE /f "wxc-2.6.0.mak" CFG=3D3D"wxc - Win32 Debug"=3D0D=0A= -!MESSAGE =3D0D=0A= -!MESSAGE Possible choices for configuration are:=3D0D=0A= -!MESSAGE =3D0D=0A= -!MESSAGE "wxc - Win32 Release" (based on "Win32 (x86) Dynamic-Link = Library=3D=0A= ")=3D0D=0A= -!MESSAGE "wxc - Win32 Debug" (based on "Win32 (x86) Dynamic-Link = Library")=3D=0A= =3D0D=0A= -!MESSAGE =3D0D=0A= -=3D0D=0A= -# Begin Project=3D0D=0A= -# PROP AllowPerConfigDependencies 0=3D0D=0A= -# PROP Scc_ProjName ""=3D0D=0A= -# PROP Scc_LocalPath ""=3D0D=0A= -CPP=3D3Dcl.exe=3D0D=0A= -MTL=3D3Dmidl.exe=3D0D=0A= -RSC=3D3Drc.exe=3D0D=0A= -=3D0D=0A= -!IF "$(CFG)" =3D3D=3D3D "wxc - Win32 Release"=3D0D=0A= -=3D0D=0A= -# PROP BASE Use_MFC 0=3D0D=0A= -# PROP BASE Use_Debug_Libraries 0=3D0D=0A= -# PROP BASE Output_Dir "Release"=3D0D=0A= -# PROP BASE Intermediate_Dir "Release"=3D0D=0A= -# PROP BASE Target_Dir ""=3D0D=0A= -# PROP Use_MFC 0=3D0D=0A= -# PROP Use_Debug_Libraries 0=3D0D=0A= -# PROP Output_Dir "..\out\wxc"=3D0D=0A= -# PROP Intermediate_Dir "..\out\wxc\release"=3D0D=0A= -# PROP Ignore_Export_Lib 0=3D0D=0A= -# PROP Target_Dir ""=3D0D=0A= -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D = "_WINDOWS=3D=0A= " /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /YX /FD /c=3D0D=0A= -# ADD CPP /nologo /MT /W3 /GX /O2 /I = "..\..\wxWidgets-2.6.0\lib\vc_lib\msw=3D=0A= " /I "include" /I "src\ewxw" /I "..\..\wxWidgets-2.6.0\include" /D = "NDEBUG"=3D=0A= /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /D = WINVE=3D=0A= R=3D3D0x400 /D "_MT" /D wxUSE_GUI=3D3D1 /D BUILD_WXC=3D3D1 /D "_DLL" /YX = /FD /c=3D=0A= =3D0D=0A= -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32=3D0D=0A= -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32=3D0D=0A= -# ADD BASE RSC /l 0x413 /d "NDEBUG"=3D0D=0A= -# ADD RSC /l 0x409 /i "..\..\wxWidgets-2.6.0\include" /d "NDEBUG"=3D0D=0A= -BSC32=3D3Dbscmake.exe=3D0D=0A= -# ADD BASE BSC32 /nologo=3D0D=0A= -# ADD BSC32 /nologo=3D0D=0A= -LINK32=3D3Dlink.exe=3D0D=0A= -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib = comdlg32.=3D=0A= lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib = odb=3D=0A= ccp32.lib /nologo /dll /machine:I386=3D0D=0A= -# ADD LINK32 wxzlib.lib wxregex.lib wxpng.lib wxjpeg.lib wxtiff.lib = wxexpa=3D=0A= t.lib wxbase26.lib wxbase26_net.lib wxbase26_odbc.lib wxbase26_xml.lib = wxms=3D=0A= w26_adv.lib wxmsw26_core.lib wxmsw26_dbgrid.lib wxmsw26_gl.lib = wxmsw26_html=3D=0A= .lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib = advapi32.l=3D=0A= ib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib = comc=3D=0A= tl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll = /machin=3D=0A= e:I386 /nodefaultlib:"LIBCMT" /out:"..\out\wxc\wxc-msw2.4.2-0.9.4.dll" = /lib=3D=0A= path:"..\..\wxWidgets-2.6.0\lib\vc_lib"=3D0D=0A= -# Begin Special Build Tool=3D0D=0A= -SOURCE=3D3D"$(InputPath)"=3D0D=0A= -PostBuild_Cmds=3D3Decho Generating mingw32 import library ... = ..\bin\reimp .=3D=0A= .\out\wxc\wxc-msw2.4.2-0.9.4.lib move libwxc-msw2.4.2-0.9.4.a ..\out\wxc = mo=3D=0A= ve wxc-msw2.4.2-0.9.4.def ..\out\wxc echo Done.=3D0D=0A= -# End Special Build Tool=3D0D=0A= -=3D0D=0A= -!ELSEIF "$(CFG)" =3D3D=3D3D "wxc - Win32 Debug"=3D0D=0A= -=3D0D=0A= -# PROP BASE Use_MFC 0=3D0D=0A= -# PROP BASE Use_Debug_Libraries 1=3D0D=0A= -# PROP BASE Output_Dir "Debug"=3D0D=0A= -# PROP BASE Intermediate_Dir "Debug"=3D0D=0A= -# PROP BASE Target_Dir ""=3D0D=0A= -# PROP Use_MFC 0=3D0D=0A= -# PROP Use_Debug_Libraries 1=3D0D=0A= -# PROP Output_Dir "..\out\wxc"=3D0D=0A= -# PROP Intermediate_Dir "..\out\wxc\debug"=3D0D=0A= -# PROP Ignore_Export_Lib 0=3D0D=0A= -# PROP Target_Dir ""=3D0D=0A= -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" = /D =3D=0A= "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /YX /FD /GZ /c=3D0D=0A= -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I = "..\..\wxWidgets-2.6.0\lib\v=3D=0A= c_lib\mswd" /I "include" /I "src\ewxw" /I = "..\..\wxWidgets-2.6.0\include" /=3D=0A= D "_DEBUG" /D "__WXDEBUG__" /D WXDEBUG=3D3D1 /D "WIN32" /D "_WINDOWS" /D = "_MB=3D=0A= CS" /D "_USRDLL" /D "WXC_EXPORTS" /D WINVER=3D3D0x400 /D "_MT" /D = wxUSE_GUI=3D=0A= =3D3D1 /D BUILD_WXC=3D3D1 /D "_DLL" /YX /FD /GZ /c=3D0D=0A= -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32=3D0D=0A= -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32=3D0D=0A= -# ADD BASE RSC /l 0x413 /d "_DEBUG"=3D0D=0A= -# ADD RSC /l 0x409 /i "..\..\wxWidgets-2.6.0\include" /d "_DEBUG"=3D0D=0A= -BSC32=3D3Dbscmake.exe=3D0D=0A= -# ADD BASE BSC32 /nologo=3D0D=0A= -# ADD BSC32 /nologo=3D0D=0A= -LINK32=3D3Dlink.exe=3D0D=0A= -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib = comdlg32.=3D=0A= lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib = odb=3D=0A= ccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept=3D0D=0A= -# ADD LINK32 wxmsw26d_core.lib wxmsw26d_adv.lib wxmsw26d_dbgrid.lib = wxmsw2=3D=0A= 6d_gl.lib wxmsw26d_html.lib wxbase26d.lib wxbase26d_net.lib = wxbase26d_odbc.=3D=0A= lib wxbase26d_xml.lib wxzlibd.lib wxregexd.lib wxpngd.lib wxjpegd.lib = wxtif=3D=0A= fd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib winspool.lib = comdlg32=3D=0A= .lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib = od=3D=0A= bccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib = /nolo=3D=0A= go /dll /debug /machine:I386 /nodefaultlib:"LIBCMTD" = /out:"..\out\wxc\wxcd-=3D=0A= msw2.4.2-0.9.4.dll" /pdbtype:sept = /libpath:"..\..\wxWidgets-2.6.0\lib\vc_li=3D=0A= b"=3D0D=0A= -# Begin Special Build Tool=3D0D=0A= -SOURCE=3D3D"$(InputPath)"=3D0D=0A= -PostBuild_Cmds=3D3Decho Generating mingw32 import library ... = ..\bin\reimp .=3D=0A= .\out\wxc\wxcd-msw2.4.2-0.9.4.lib move libwxcd-msw2.4.2-0.9.4.a = ..\out\wxc =3D=0A= move wxcd-msw2.4.2-0.9.4.def ..\out\wxc echo Done.=3D0D=0A= -# End Special Build Tool=3D0D=0A= -=3D0D=0A= -!ENDIF =3D0D=0A= -=3D0D=0A= -# Begin Target=3D0D=0A= -=3D0D=0A= -# Name "wxc - Win32 Release"=3D0D=0A= -# Name "wxc - Win32 Debug"=3D0D=0A= -# Begin Group "Header Files"=3D0D=0A= -=3D0D=0A= -# PROP Default_Filter "h;hpp;hxx;hm;inl"=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\include\db.h=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\include\ewxw_def.h=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\include\glcanvas.h=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\include\managed.h=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\include\wave.h=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\include\wrapper.h=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\include\wxc.h=3D0D=0A= -# End Source File=3D0D=0A= -# End Group=3D0D=0A= -# Begin Group "Resource Files"=3D0D=0A= -=3D0D=0A= -# PROP Default_Filter = "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"=3D=0A= =3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\wxc.rc=3D0D=0A= -# End Source File=3D0D=0A= -# End Group=3D0D=0A= -# Begin Group "Source Files"=3D0D=0A= -=3D0D=0A= -# PROP Default_Filter "*.cpp"=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\apppath.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\db.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\eljevent.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\eljmime.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw_main.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\extra.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\glcanvas.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\image.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\managed.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\treectrl.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\wave.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\wrapper.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# End Group=3D0D=0A= -# Begin Group "ewxw"=3D0D=0A= -=3D0D=0A= -# PROP Default_Filter ""=3D0D=0A= -# Begin Group "ewxw sources"=3D0D=0A= -=3D0D=0A= -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljaccelerator.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljartprov.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljbitmap.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljbrush.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljbusyinfo.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljbutton.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljcalendarctrl.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljcaret.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljcheckbox.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljchecklistbox.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljchoice.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljclipboard.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljcoldata.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljcolour.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljcolourdlg.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljcombobox.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljconfigbase.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljcontrol.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljctxhelp.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljcursor.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljdataformat.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljdatetime.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljdc.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljdialog.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljdialup.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljdirdlg.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljdnd.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljdrawing.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljfiledialog.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljfilehist.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljfindrepldlg.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljfont.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljfontdata.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljfontdlg.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljframe.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljgauge.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljgrid.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljhelpcontroller.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljicnbndl.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljicon.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljimage.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljimagelist.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljipc.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljlayoutconstraints.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljlistbox.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljlistctrl.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljlocale.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljlog.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljmask.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljmdi.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljmenu.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljmenubar.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljmessagedialog.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljminiframe.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljnotebook.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljpalette.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljpanel.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljpen.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljprintdlg.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljprinting.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljprocess.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljradiobox.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljradiobutton.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljregion.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljregioniter.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljsash.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljscintilla.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljscrollbar.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljscrolledwindow.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljsingleinst.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljsizer.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljslider.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljspinctrl.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljsplitterwindow.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljstaticbox.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljstaticline.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljstatictext.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljstatusbar.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljsystemsettings.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljtextctrl.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljtglbtn.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljthread.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljtimer.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljtipwnd.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljtoolbar.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljvalidator.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljwindow.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljwizard.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\Scintilla.h=3D0D=0A= -# End Source File=3D0D=0A= -# End Group=3D0D=0A= -# Begin Group "ewxw headers"=3D0D=0A= -=3D0D=0A= -# PROP Default_Filter "*.h"=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\include\ewxw\wxc_glue.h=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\include\ewxw\wxc_types.h=3D0D=0A= -# End Source File=3D0D=0A= -# End Group=3D0D=0A= -# End Group=3D0D=0A= -# End Target=3D0D=0A= -# End Project=3D0D=0A= rmfile ./wxc/wxc-2.6.0.dsp=0A= hunk ./wxc/wxc-2.6.0.dsw 1=0A= -Microsoft Developer Studio Workspace File, Format Version 6.00=3D0D=0A= -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!=3D0D=0A= -=3D0D=0A= -########################################################################= ##=3D=0A= #####=3D0D=0A= -=3D0D=0A= -Project: "wxc"=3D3D".\wxc-2.6.0.dsp" - Package Owner=3D3D<4>=3D0D=0A= -=3D0D=0A= -Package=3D3D<5>=3D0D=0A= -{{{=3D0D=0A= -}}}=3D0D=0A= -=3D0D=0A= -Package=3D3D<4>=3D0D=0A= -{{{=3D0D=0A= -}}}=3D0D=0A= -=3D0D=0A= -########################################################################= ##=3D=0A= #####=3D0D=0A= -=3D0D=0A= -Global:=3D0D=0A= -=3D0D=0A= -Package=3D3D<5>=3D0D=0A= -{{{=3D0D=0A= -}}}=3D0D=0A= -=3D0D=0A= -Package=3D3D<3>=3D0D=0A= -{{{=3D0D=0A= -}}}=3D0D=0A= -=3D0D=0A= -########################################################################= ##=3D=0A= #####=3D0D=0A= -=3D0D=0A= rmfile ./wxc/wxc-2.6.0.dsw=0A= hunk ./wxc/wxcu-2.6.2.dsp 1=0A= -# Microsoft Developer Studio Project File - Name=3D3D"wxc" - Package = Owner=3D=0A= =3D3D<4>=3D0D=0A= -# Microsoft Developer Studio Generated Build File, Format Version = 6.00=3D0D=0A= -# ** DO NOT EDIT **=3D0D=0A= -=3D0D=0A= -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102=3D0D=0A= -=3D0D=0A= -CFG=3D3Dwxc - Win32 Debug=3D0D=0A= -!MESSAGE This is not a valid makefile. To build this project using = NMAKE,=3D=0A= =3D0D=0A= -!MESSAGE use the Export Makefile command and run=3D0D=0A= -!MESSAGE =3D0D=0A= -!MESSAGE NMAKE /f "wxc-2.6.0.mak".=3D0D=0A= -!MESSAGE =3D0D=0A= -!MESSAGE You can specify a configuration when running NMAKE=3D0D=0A= -!MESSAGE by defining the macro CFG on the command line. For = example:=3D0D=0A= -!MESSAGE =3D0D=0A= -!MESSAGE NMAKE /f "wxc-2.6.0.mak" CFG=3D3D"wxc - Win32 Debug"=3D0D=0A= -!MESSAGE =3D0D=0A= -!MESSAGE Possible choices for configuration are:=3D0D=0A= -!MESSAGE =3D0D=0A= -!MESSAGE "wxc - Win32 Release" (based on "Win32 (x86) Dynamic-Link = Library=3D=0A= ")=3D0D=0A= -!MESSAGE "wxc - Win32 Debug" (based on "Win32 (x86) Dynamic-Link = Library")=3D=0A= =3D0D=0A= -!MESSAGE =3D0D=0A= -=3D0D=0A= -# Begin Project=3D0D=0A= -# PROP AllowPerConfigDependencies 0=3D0D=0A= -# PROP Scc_ProjName ""=3D0D=0A= -# PROP Scc_LocalPath ""=3D0D=0A= -CPP=3D3Dcl.exe=3D0D=0A= -MTL=3D3Dmidl.exe=3D0D=0A= -RSC=3D3Drc.exe=3D0D=0A= -=3D0D=0A= -!IF "$(CFG)" =3D3D=3D3D "wxc - Win32 Release"=3D0D=0A= -=3D0D=0A= -# PROP BASE Use_MFC 0=3D0D=0A= -# PROP BASE Use_Debug_Libraries 0=3D0D=0A= -# PROP BASE Output_Dir "Release"=3D0D=0A= -# PROP BASE Intermediate_Dir "Release"=3D0D=0A= -# PROP BASE Target_Dir ""=3D0D=0A= -# PROP Use_MFC 0=3D0D=0A= -# PROP Use_Debug_Libraries 0=3D0D=0A= -# PROP Output_Dir "..\out\wxc"=3D0D=0A= -# PROP Intermediate_Dir "..\out\wxc\release"=3D0D=0A= -# PROP Ignore_Export_Lib 0=3D0D=0A= -# PROP Target_Dir ""=3D0D=0A= -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D = "_WINDOWS=3D=0A= " /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /YX /FD /c=3D0D=0A= -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\wxWidgets-2.6.2\lib\mswu" = /I "=3D=0A= include" /I "src\ewxw" /I "..\..\wxWidgets-2.6.2\include" /D "NDEBUG" /D = "W=3D=0A= IN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /D = WINVER=3D3D0x=3D=0A= 400 /D "_MT" /D wxUSE_GUI=3D3D1 /D wxUSE_UNICODE=3D3D1 /D = BUILD_WXC=3D3D1 /D "_DL=3D=0A= L" /YX /FD /c=3D0D=0A= -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32=3D0D=0A= -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32=3D0D=0A= -# ADD BASE RSC /l 0x413 /d "NDEBUG"=3D0D=0A= -# ADD RSC /l 0x409 /i "..\..\wxWidgets-2.6.2\include" /d "NDEBUG"=3D0D=0A= -BSC32=3D3Dbscmake.exe=3D0D=0A= -# ADD BASE BSC32 /nologo=3D0D=0A= -# ADD BSC32 /nologo=3D0D=0A= -LINK32=3D3Dlink.exe=3D0D=0A= -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib = comdlg32.=3D=0A= lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib = odb=3D=0A= ccp32.lib /nologo /dll /machine:I386=3D0D=0A= -# ADD LINK32 zlib.lib regexu.lib png.lib jpeg.lib tiff.lib expat.lib = wxmsw=3D=0A= u.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib = advapi32.=3D=0A= lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib = com=3D=0A= ctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll = /machi=3D=0A= ne:I386 /nodefaultlib:"LIBCMT" /out:"..\out\wxc\wxc-msw2.6.3-0.10.1.dll" = /l=3D=0A= ibpath:"..\..\wxWidgets-2.6.2\lib"=3D0D=0A= -# Begin Special Build Tool=3D0D=0A= -SOURCE=3D3D"$(InputPath)"=3D0D=0A= -PostBuild_Cmds=3D3Decho Generating mingw32 import library ... = ..\bin\reimp .=3D=0A= .\out\wxc\wxc-msw2.6.3-0.10.1.lib move libwxc-msw2.6.3-0.10.1.a = ..\out\wxc =3D=0A= move wxc-msw2.6.3-0.10.1.def ..\out\wxc echo Done.=3D0D=0A= -# End Special Build Tool=3D0D=0A= -=3D0D=0A= -!ELSEIF "$(CFG)" =3D3D=3D3D "wxc - Win32 Debug"=3D0D=0A= -=3D0D=0A= -# PROP BASE Use_MFC 0=3D0D=0A= -# PROP BASE Use_Debug_Libraries 1=3D0D=0A= -# PROP BASE Output_Dir "Debug"=3D0D=0A= -# PROP BASE Intermediate_Dir "Debug"=3D0D=0A= -# PROP BASE Target_Dir ""=3D0D=0A= -# PROP Use_MFC 0=3D0D=0A= -# PROP Use_Debug_Libraries 1=3D0D=0A= -# PROP Output_Dir "..\out\wxc"=3D0D=0A= -# PROP Intermediate_Dir "..\out\wxc\debug"=3D0D=0A= -# PROP Ignore_Export_Lib 0=3D0D=0A= -# PROP Target_Dir ""=3D0D=0A= -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" = /D =3D=0A= "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /YX /FD /GZ /c=3D0D=0A= -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I = "..\..\wxWidgets-2.6.2\lib\m=3D=0A= swud" /I "include" /I "src\ewxw" /I "..\..\wxWidgets-2.6.2\include" /D = "_DE=3D=0A= BUG" /D "__WXDEBUG__" /D WXDEBUG=3D3D1 /D "WIN32" /D "_WINDOWS" /D = "_MBCS" /D=3D=0A= "_USRDLL" /D "WXC_EXPORTS" /D WINVER=3D3D0x400 /D "_MT" /D = wxUSE_GUI=3D3D1 /D =3D=0A= BUILD_WXC=3D3D1 /D wxUSE_UNICODE=3D3D1 /D "_DLL" /YX /FD /GZ /c=3D0D=0A= -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32=3D0D=0A= -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32=3D0D=0A= -# ADD BASE RSC /l 0x413 /d "_DEBUG"=3D0D=0A= -# ADD RSC /l 0x409 /i "..\..\wxWidgets-2.6.2\include" /d "_DEBUG"=3D0D=0A= -BSC32=3D3Dbscmake.exe=3D0D=0A= -# ADD BASE BSC32 /nologo=3D0D=0A= -# ADD BSC32 /nologo=3D0D=0A= -LINK32=3D3Dlink.exe=3D0D=0A= -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib = comdlg32.=3D=0A= lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib = odb=3D=0A= ccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept=3D0D=0A= -# ADD LINK32 zlibd.lib regexud.lib pngd.lib jpegd.lib tiffd.lib = expatd.lib=3D=0A= wxmswud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib = ad=3D=0A= vapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib = odbccp32.=3D=0A= lib comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo = /dll=3D=0A= /debug /machine:I386 /nodefaultlib:"LIBCMTD" = /out:"..\out\wxc\wxcd-msw2.6.=3D=0A= 3-0.10.1.dll" /pdbtype:sept /libpath:"..\..\wxWidgets-2.6.2\lib"=3D0D=0A= -# Begin Special Build Tool=3D0D=0A= -SOURCE=3D3D"$(InputPath)"=3D0D=0A= -PostBuild_Cmds=3D3Decho Generating mingw32 import library ... = ..\bin\reimp .=3D=0A= .\out\wxc\wxcd-msw2.6.3-0.10.1.lib move libwxcd-msw2.6.3-0.10.1.a = ..\out\wx=3D=0A= c move wxcd-msw2.6.3-0.10.1.def ..\out\wxc echo Done.=3D0D=0A= -# End Special Build Tool=3D0D=0A= -=3D0D=0A= -!ENDIF =3D0D=0A= -=3D0D=0A= -# Begin Target=3D0D=0A= -=3D0D=0A= -# Name "wxc - Win32 Release"=3D0D=0A= -# Name "wxc - Win32 Debug"=3D0D=0A= -# Begin Group "Header Files"=3D0D=0A= -=3D0D=0A= -# PROP Default_Filter "h;hpp;hxx;hm;inl"=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\include\db.h=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\include\ewxw_def.h=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\include\glcanvas.h=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\include\managed.h=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\include\wave.h=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\include\previewframe.h=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\include\printout.h=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\include\textstream.h=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\include\wrapper.h=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\include\wxc.h=3D0D=0A= -# End Source File=3D0D=0A= -# End Group=3D0D=0A= -# Begin Group "Resource Files"=3D0D=0A= -=3D0D=0A= -# PROP Default_Filter = "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"=3D=0A= =3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\wxc.rc=3D0D=0A= -# End Source File=3D0D=0A= -# End Group=3D0D=0A= -# Begin Group "Source Files"=3D0D=0A= -=3D0D=0A= -# PROP Default_Filter "*.cpp"=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\apppath.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\db.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\eljevent.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\eljmime.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw_main.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\extra.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\glcanvas.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\image.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\managed.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\previewframe.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\printout.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\textstream.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\treectrl.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\wave.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\wrapper.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# End Group=3D0D=0A= -# Begin Group "ewxw"=3D0D=0A= -=3D0D=0A= -# PROP Default_Filter ""=3D0D=0A= -# Begin Group "ewxw sources"=3D0D=0A= -=3D0D=0A= -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljaccelerator.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljartprov.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljbitmap.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljbrush.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljbusyinfo.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin Source File=3D0D=0A= -=3D0D=0A= -SOURCE=3D3D.\src\ewxw\eljbutton.cpp=3D0D=0A= -# End Source File=3D0D=0A= -# Begin So... [truncated message content] |
|
From: shelarcy <she...@gm...> - 2007-08-21 04:10:37
|
Hi Jeremy, On Mon, 20 Aug 2007 23:48:38 +0900, Jeremy O'Donoghue <jer...@gm...> wrote: > 1) Build wxC wrapper for wxWidgets. Building this is really quite > dependent on how > wxWidgets itself was built, which is OK on Unix (wx-config tells > you), but subject > to much pain and guesswork on Windows. > STC support is built at this time. If STC is not present in the > wxWidgets build, > the wxSTC functions are all empty (but present). I think we can solve this problem by modifying wxc-*.dsw. If we write "Project Dependency" on dsw file, Visual C++ build dependency before build wxc. (But we must use "Unicode **" instead of "**". See attached wxcu-2.6.4.dsw and doc-fix.dpatch.) It look fine for me, so I planed to remove --with-contrib and requiring to install contrib library as 2. option in this thread. http://thread.gmane.org/gmane.comp.lang.haskell.wxhaskell.general/199/focus=249 The problem is that we can't use nmake, because building on Windows deeply depends on Visual C++ project files. But we can generate Visual C++ project (.dsp) file instead of make.nmake. I also attached GenVCProject.hs that is Visual C++ project file generator. (That code is messy now, but we can refactor it. And It is easier to modifying .dsp file by using that.) > (note > that this would probably preclude Linux users from using the wxWidgets > provided by their package manager as the chances would be pretty high > that it would be incorrectly configured). I have a question about that, so I send previous mail. Best Regards, -- shelarcy <shelarcy hotmail.co.jp> http://page.freett.com/shelarcy/ |
|
From: <ne...@ci...> - 2007-08-20 19:04:34
|
※ 下記のＵＲＬからご確認出来ます。 http://www.10wn.com/h/?bank38 ▼ 三智子さま ▼ 橋本 ゆうこ ２名の女性の方から、謝礼の提示がありました。 -------------------- ┌─────────────────────── │ 配信停止はコチラまで。 │ DeliveryStop │ in...@mj... │ │【配信停止手続きの際は】 │必ず件名に「配信停止」とお書き下さい。 │件名に「配信停止」と記載されていない場合は処理が行えません。 │尚、停止には数日間ほどお時間をいただく場合がございます。 │停止まで数日、数回メールが送信されることがございますが、 │何卒ご了承ください。 └─────────────────────── |
|
From: shelarcy <she...@gm...> - 2007-08-20 17:48:14
|
Hi Jeremy, On Tue, 21 Aug 2007 00:42:26 +0900, Jeremy O'Donoghue <jer...@gm...> wrote: > On 16/08/07, Eric Y. Kow <eri...@gm...> wrote: >> > 2. Support contrib libraries in default configuration. >> > Merit >> > - The reverse side of 1.'s Demerit. >> > Demerit >> > - User must build and install contrib libraries, before building >> > wxHaskell. So they can meet building problem. But we can solve >> > it by updating building Guide (And I'm doing that). > > This really only works as an option if we decide that users must build > wxWidgets from source *before* they can build wxHaskell. Really? I think that nowadays wxWidgets packager worried about wxPython. And wxPython depends on contribs. http://www.wxpython.org/builddoc.php So macports' wxWidgets also support contribs. http://svn.macports.org/repository/macports/trunk/dports/graphics/wxWidgets/Portfile http://svn.macports.org/repository/macports/trunk/dports/python/py-wxpython/Portfile And according to below Packages' information, libwxgtk-dev package depends on wx-common package and wx-common replaces libwxgtk2.4-contrib-dev package. http://apt.tt-solutions.com/debian/dists/etch/main/binary-i386/Packages So I want to know about wxWidgets package's condition. > It's likely to be irritating to Linux users who are used to "apt-get > install wxWidgets" as their usual approach to installing libraries. Is this right? Any packages system's wxWidgets doesn't have contrib? Or any package system doesn't choose version that supports contrib? Best Regards, -- shelarcy <shelarcy hotmail.co.jp> http://page.freett.com/shelarcy/ |
|
From: Jeremy O'D. <jer...@gm...> - 2007-08-20 15:42:27
|
Hmm, Somehow I missed this when I sent out a mail on almost the same subject just now... On 16/08/07, Eric Y. Kow <eri...@gm...> wrote: > > 2. Support contrib libraries in default configuration. > > Merit > > - The reverse side of 1.'s Demerit. > > Demerit > > - User must build and install contrib libraries, before building > > wxHaskell. So they can meet building problem. But we can solve > > it by updating building Guide (And I'm doing that). This really only works as an option if we decide that users must build wxWidgets from source *before* they can build wxHaskell. > You seem to be saying that this is the simpler choice as far as the code > goes. I also get the impression that it is the most straightforwardly > extensible, so I suppose this is what I would support. It is certainly the simplest option in terms of maintaining wxHaskell, but I think it means that we need to provide compiled binary packages for wxWidgets on all supported platforms, since it is not particularly straightforward to build wxWidgets appropriately for use with wxHaskell (especially under the latest versions of Visual Studio - Microsoft have replaced DLL hell with manifest hell. Grr...) It's likely to be irritating to Linux users who are used to "apt-get install wxWidgets" as their usual approach to installing libraries. I've detailed what would probably be needed to cleanly support contrib in the other mail. In short, it's a directory structure (and Haskell modules) per contrib module. I'd prefer to do it in as clean a manner as possible, but I admit that it's far from easy to get right. Regards Jeremy |
|
From: Jeremy O'D. <jer...@gm...> - 2007-08-20 15:02:59
|
Hi all,
I'm tearing my hair out trying to think of the best way forward for
modularizing parts of wxHaskell.
The problem currently shows itself mainly with STC, although over time
I'd expect to see this more often.
Currently, the build system works (hand-wavingly) as follows:
1) Build wxC wrapper for wxWidgets. Building this is really quite
dependent on how
wxWidgets itself was built, which is OK on Unix (wx-config tells
you), but subject
to much pain and guesswork on Windows.
STC support is built at this time. If STC is not present in the
wxWidgets build,
the wxSTC functions are all empty (but present).
2) Build wxdirect
3) Run wxdirect over wxC to generate Haskell bindings. This means that empty
Haskell bindings are produced for the empty functions wrapping wxSTC (if it
isn't built on wxWidgets).
4) Build and install wxcore
5) Build and install wx. This, again, contains hooks for the (possibly
not functional)
STC.
This sort-of hangs together while we only have one 'contrib' module to
worry about, but it would become a maintenance nightmare if there were
ever to be more (of them (e.g. if I ever finish the build system, I'd
like to take a look at XRC support).
I'd prefer that there be an 'approved' way for people to add support
for additional wx functionalities without deep build system hacking.
The problem is that everything I think will mean considerable changes
to the way contributed modules are supported.
This is what I'm thinking:
Add a new 'contrib' directory for optional wxHaskell functionality.
This would contain one directory per contributed module.
Each contrib module would look something like the following:
module_name
|- Makefile
|--- wxc
| |- Makefile
| |- src
| |- include
|
|--- wxcore
| |- Makefile
| |- src - Graphics - UI - WxCore
|
|--- wx
|- Setup.hs
|- module_name.cabal
|- src - Graphics - UI - Wx
In the end, each contributed module would need to provide three
things: a C language wrapper for the wxWidgets functionality in
question (wxc); support for a basic Haskell wrapper over the C
(wxcore), and (optionally) a higher-level Haskell functional wrapper
(wx).
The build system would be more or less a plug-in template in each
case, with the contributor only needing to change the names of the
provided files.
The contributed module would appear as two Haskell modules, e.g.
WxSTCCore and WxSTC after installation.
I'd like to invite comments before I do all of this, as it's quite a
lot of work, and it will change a lot about the way STC (as the first
contrib module) is compiled. It will, however, mean that future
contributions will be easier as people would need only to work in a
single directory structure.
I think the only viable alternative is to very carefully and
explicitly state how wxWidgets must be built to support wxHaskell
(this would realistically mean only one supported configuration per
platform), and make *very* sure we provide binary installers for
wxWidgets with such a configuration as part of our distribution (note
that this would probably preclude Linux users from using the wxWidgets
provided by their package manager as the chances would be pretty high
that it would be incorrectly configured).
Regards
Jeremy
|
|
From: Eric K. <eri...@lo...> - 2007-08-19 21:01:03
|
Sun Aug 19 22:59:54 CEST 2007 Eric Kow <eri...@lo...> * Remove auto-generated stc files. Otherwise, you get annoying new changes in the working directory. |
|
From: Eric Y. K. <eri...@gm...> - 2007-08-19 20:57:38
|
Ok, it's been a week and nobody has objected to my proposal. So, starting from now on, I am giving myself the permission not to review patches. In exchange, I'll try to push them in in a more timely manner, assuming the patches were submitted in good faith. Thanks, --=20 Eric Kow http://www.loria.fr/~kow PGP Key ID: 08AC04F9 Merci de corriger mon fran=E7ais. |
|
From: Eric Y. K. <eri...@gm...> - 2007-08-19 20:53:20
|
Had a quick look, nothing thorough. Seems ok. The execClipBoardData comment should probably be clarified a bit. Anyway, pushing this in too. --=20 Eric Kow http://www.loria.fr/~kow PGP Key ID: 08AC04F9 Merci de corriger mon fran=E7ais. |
|
From: Eric Y. K. <eri...@gm...> - 2007-08-19 20:44:32
|
Looks fine to me. This might be a bit disruptive, but I've modified your patch metadata, breaking up short patch name in two lines. Please unpull your version of the patch before pulling from the official repository. Sorry for the trouble. --=20 Eric Kow http://www.loria.fr/~kow PGP Key ID: 08AC04F9 Merci de corriger mon fran=E7ais. |
|
From: shelarcy <she...@gm...> - 2007-08-17 04:38:57
|
Hi Eric, On Fri, 17 Aug 2007 05:05:54 +0900, Eric Y. Kow <eri...@gm...> wrote: > Out of curiosity, what's the motivation behind this patch? Please see this patch's complete name. > * Use Data.Time.getCurrentTime instead of (System.)Time.getClockTime to > avoid build failure by generated non-UTF8 String This is my Windows environment problem that I wrote almost one year ago. In Sat, 02 Sep 2006 16:56:24 +0900, shelarcy <she...@gm...> wrote: > $ make > ghc -c wxcore/src/Graphics/UI/WXCore/WxcClassTypes.hs -o out/wx/imports/Graphics > /UI/WXCore/WxcClassTypes.o -iout/wx/imports -odir out/wx/imports -hidir out/wx/i > mports -fvia-C -package-name wxcore -Iwxc/include > > wxcore/src/Graphics/UI/WXCore/WxcClassTypes.hs:1:0: > lexical error at character '\65279' > make: *** [out/wx/imports/Graphics/UI/WXCore/WxcClassTypes.o] Error 1 > > This is a known problem except Ascii, Latin-1 and EUC user. > If show System.Time.ClockTime, we can show string that passed by OS. > Windows show local encoding String, although using Unicode internally. > > By this effect, sometimes code generator cause problem. So I have > to change from shift_jis to utf-8 a few generated files. > > $ cd wxcore/src/Graphics/UI/WXCore/ > $ mv WxcClassTypes.hs WxcClassTypes.hs.orig > $ iconv -f shift_jis -t utf-8 WxcClassTypes.orig > WxcClassTypes.hs Compiling WxcClasses* also cause this problem. So I don't test and develop wxHaskell smoothly. I have a headache from that. Best Regards, -- shelarcy <shelarcy hotmail.co.jp> http://page.freett.com/shelarcy/ |
|
From: Eric Y. K. <eri...@gm...> - 2007-08-16 20:08:08
|
> 2. Support contrib libraries in default configuration. > Merit > - The reverse side of 1.'s Demerit. > Demerit > - User must build and install contrib libraries, before building > wxHaskell. So they can meet building problem. But we can solve > it by updating building Guide (And I'm doing that). You seem to be saying that this is the simpler choice as far as the code goes. I also get the impression that it is the most straightforwardly extensible, so I suppose this is what I would support. --=20 Eric Kow http://www.loria.fr/~kow PGP Key ID: 08AC04F9 Merci de corriger mon fran=E7ais. |
|
From: Eric Y. K. <eri...@gm...> - 2007-08-16 20:05:59
|
I'll have a look over the weekend Out of curiosity, what's the motivation behind this patch? --=20 Eric Kow http://www.loria.fr/~kow PGP Key ID: 08AC04F9 Merci de corriger mon fran=E7ais. |
|
From: shelarcy <she...@gm...> - 2007-08-16 10:56:09
|
I'm sorry for I am confused Window with Control. On Thu, 16 Aug 2007 14:37:22 +0900, shelarcy <she...@gm...> wrote: > If you want to drop files for a Control, this is very easy task. > fileDropTarget set target control and event handler. > > fileDropTarget :: Window a -> (Point -> [String] -> IO ()) -> IO () > Point is dropped posiotion of that, and [String] is dropped files' > pathes. It and other dropTarget functions specify Window, not Control. Best Regards, -- shelarcy <shelarcy hotmail.co.jp> http://page.freett.com/shelarcy/ |
|
From: shelarcy <she...@gm...> - 2007-08-16 08:38:56
|
Hi, On Tue, 24 Jul 2007 13:57:50 +0900, Eric Y. Kow <eri...@gm...> wrote: >> Some people try to build wxHaskell, but sadly this is not easy task. >> Because wxHaskell site's Building Guide is out of date. >> Okay, we have another imformation on Haskell.org, but this is not >> easy to reach there. > > We have full control of the wxhaskell homepage (it's in the darcs repo), > so couldn't we at least update the official build instructions? Now I almost finished to work with adding my interesting features. So, I'm strating to update the build instructions. But ... I changed my mind that wxStyledTextCtrl's --with-stc option isn't reasonable. Because I found wxc already has some contrib libraries layer (e.g. gizmos is wrapped by eljgizmos, svg wrapped by eljdcsvg.cpp ...), and you can install all contrib libraries by using make install at once in contrib/src directory, instead of installing per libraries. So I want to change building process. But ... we have two option. 1. Change --with-stc to --with-contrib - this is conservative way. Merit - Building process is simpler. But we already has complexy by supporing GHC 6.6.x or higher. So we don't expect much. Demerit - We need to add #ifdef compilation flag when we want to support other contrib libraries. It's messy work. - Users must check supporting feature on their wxHaskell, When they want to use contrib libraries. And If there isn't, they must build wxHaskell again. 2. Support contrib libraries in default configuration. Merit - The reverse side of 1.'s Demerit. Demerit - User must build and install contrib libraries, before building wxHaskell. So they can meet building problem. But we can solve it by updating building Guide (And I'm doing that). I already provided patch 1. to Windows platform by this patch. http://www.mail-archive.com/wxh...@li.../msg00198/darcs73b086 > Sat Aug 11 22:28:34 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2007 shelarcy <shelarc= > y...@gm...> > * Support builing without STC library for wxWidgets 2.6.4 Becuase current we can't build wxHaskell with wxWidgets 2.6.4 by current Visual Studio project. (I'm sorry for forgotten to notice Visual C++ issue.) http://www.haskell.org/pipermail/haskell-cafe/2007-July/029439.html And If we choose 2., I withdraw this patch. Best Regards, -- shelarcy <shelarcy hotmail.co.jp> http://page.freett.com/shelarcy/ |
|
From: shelarcy <she...@gm...> - 2007-08-16 05:37:36
|
Hi Eric, On Mon, 06 Aug 2007 04:42:35 +0900, Eric Y. Kow <eri...@gm...> wrote: > On Fri, Aug 03, 2007 at 12:53:43 +0900, shelarcy wrote: >> And if there is already someones work, please let me know it. >> Because if it's good enough, I want to stop duplicate work >> and make patch sooner by using it. > > I think you should go ahead and submit this as a patch. Okay, I sent patch for that. http://article.gmane.org/gmane.comp.lang.haskell.wxhaskell.general/246 Its patch also includes clipboard support, because wxWidgets uses same Type as drag & drop for this purpose. > Note that I > haven't had a chance to play around with it yet. There are no difficult to use drag & drop. If you want to drop files for a Control, this is very easy task. fileDropTarget set target control and event handler. fileDropTarget :: Window a -> (Point -> [String] -> IO ()) -> IO () Point is dropped posiotion of that, and [String] is dropped files' pathes. So you can set file drop target and event like this. fileDropTarget sw (\pt file -> do infoDialog sw (show pt) (show file)) If you dragging-on files to non-target control, you can see cursor that means you can't drop files to target control. If you dragging-on files to target control, you can see cursor that has reversal meaning. If you want to drop something that can map DataObject (text data, bitmap data, and so on), first you must set drop source and drop target, then do dragAndDrop in dragging event as below. set sw [on drag := \pt -> dragger sw f] dragger win wout = do textdata <- textDataObjectCreate "" drop <- dropTarget wout textdata textdata' <- textDataObjectCreate "text" src <- dropSource textdata' win dragAndDrop src Default (\_ -> return ()) txt <- textDataObjectGetText textdata infoDialog wout "resultText" txt textdata has null String in creation time. But this String is changed by drop sources' textdata' after drop event is endded. So, print txt shows "text" (I don't know the correct way to use textDropTarget, so I use dropTarget in this sample. If you want to use textDropTarget, you can just replace dropTarget ... but I thins this is not correct way). And clipboard function changes DataObject same as drop source doing. execClipBoardData cl (\clp -> do textdata'' <- textDataObjectCreate " " clipboardGetData clp textdata'' txt <- textDataObjectGetText textdata'' infoDialog wout "clipboard data" txt) Using Drag & Drop and ClipBoard aren't difficult. But I don't have enogh experience with those features yet. So please use, and send me feedbacks for that. Best Regards, -- shelarcy <shelarcy hotmail.co.jp> http://page.freett.com/shelarcy/ |
|
From: shelarcy <she...@gm...> - 2007-08-16 02:46:13
|
DarcsURL: http://darcs.haskell.org/wxhaskell=0A= MIME-Version: 1.0=0A= Content-Type: multipart/mixed; boundary=3D"=3D_"=0A= =0A= --=3D_=0A= Content-Type: text/plain=0A= Content-Transfer-Encoding: quoted-printable=0A= =0A= Mon Aug 13 15:25:17 =3D93=3D8C=3D8B=3D9E (=3D95W=3D8F=3D80=3D8E=3D9E) = 2007 shelarcy <shelarc=3D=0A= y...@gm...>=0A= * Use Data.Time.getCurrentTime instead of (System.)Time.getClockTime = to a=3D=0A= void build failure by generated non-UTF8 String=0A= =0A= --=3D_=0A= Content-Type: text/x-darcs-patch; = name=3D"use-data_time_getcurrenttime-instead-of-_system__time_getclocktim= e-to-avoid-build-failure-by-generated-non_utf8-string.dpatch"=0A= Content-Transfer-Encoding: quoted-printable=0A= Content-Description: A darcs patch for your repository!=0A= =0A= =0A= New patches:=0A= =0A= [Use Data.Time.getCurrentTime instead of (System.)Time.getClockTime to = avoi=3D=0A= d build failure by generated non-UTF8 String=0A= shelarcy <she...@gm...>**20070813062517] {=0A= hunk ./configure 619=0A= +# Test if we can include the time package explicitly=0A= +$hcpkg -s time > /dev/null 2> /dev/null=0A= +case $? in=0A= + 0) pkgtime=3D3D"-package time";;=0A= + *) pkgtime=3D3D"";;=0A= +esac=0A= +=0A= hunk ./configure 791=0A= +PKG-TIME=3D3D$pkgtime=0A= hunk ./makefile 432=0A= - $(HC) $(HCFLAGS) $(PKG-PARSEC) -o $@ $^=0A= + $(HC) $(HCFLAGS) $(PKG-PARSEC) $(PKG-TIME) -o $@ $^=0A= hunk ./makefile 436=0A= - @$(call compile-hs,$@,$<,$(HCFLAGS) = $(PKG-PARSEC),$(WXD-OUTDIR),-i$(WXD-S=3D=0A= RCDIR))=0A= + @$(call compile-hs,$@,$<,$(HCFLAGS) $(PKG-PARSEC) = $(PKG-TIME),$(WXD-OUTDI=3D=0A= R),-i$(WXD-SRCDIR))=0A= hunk ./wxdirect/src/CompileClassTypes.hs 17=0A= -import Time( getClockTime)=0A= +import Data.Time( getCurrentTime)=0A= hunk ./wxdirect/src/CompileClassTypes.hs 28=0A= - =3D3D do time <- getClockTime=0A= + =3D3D do time <- getCurrentTime=0A= hunk ./wxdirect/src/CompileClasses.hs 20=0A= -import Time( getClockTime)=0A= +import Data.Time( getCurrentTime )=0A= hunk ./wxdirect/src/CompileClasses.hs 36=0A= - time <- getClockTime=0A= + time <- getCurrentTime=0A= hunk ./wxdirect/src/CompileHeader.hs 19=0A= -import Time( getClockTime)=0A= +import Data.Time( getCurrentTime)=0A= hunk ./wxdirect/src/CompileHeader.hs 35=0A= - time <- getClockTime=0A= + time <- getCurrentTime=0A= hunk ./wxdirect/src/HaskellNames.hs 22=0A= -import Time( getClockTime )=0A= +import Data.Time( getCurrentTime )=0A= hunk ./wxdirect/src/HaskellNames.hs 149=0A= - =3D3D do time <- getClockTime=0A= + =3D3D do time <- getCurrentTime=0A= }=0A= =0A= Context:=0A= =0A= [Add (Multi-)MediaCtrl Support=0A= shelarcy <she...@gm...>**20070811123742] =3D=0A= =0A= [Rework wxToolkit and isDefined by fixing *defs' char array to wxChar = array=0A= shelarcy <she...@gm...>**20070806121930] =3D=0A= =0A= [Change some str* functions or wcs* functions to wxStr* functions=0A= shelarcy <she...@gm...>**20070805112624] =3D=0A= =0A= [Remove unused wxh directory files=0A= shelarcy <she...@gm...>**20070803123528] =3D=0A= =0A= [Remove unused wxWidgets 2.5.x's VC project=0A= shelarcy <she...@gm...>**20070803120930] =3D=0A= =0A= [Add VC project for wxWidgets 2.6.4=0A= shelarcy <she...@gm...>**20070803120733] =3D=0A= =0A= [Fix broken wxc-2.4 Visual Studio Project=0A= shelarcy <she...@ho...>**20070723214850] =3D=0A= =0A= [polyline-64bit-compatibility-fix=0A= ar...@cs...**20070313080116=0A= Fixes a problem with the polyline function on a 64-bit platform.=0A= The wxDC_DrawLines function now properly indexes into the array=0A= with points.=0A= ] =3D=0A= =0A= [fix-polygon-behaviour-64=0A= ar...@cs...**20070202154517=0A= Fixed issue 'Strange polygon behaviour on 64-bit machines'=0A= reported by Chris Mears at 14 Dec 2006.=0A= =3D=0A= =0A= Problem: the arrays inspected by the wxDC_Polygon function=0A= are assumed to contain 32-bits ints. On 64-bit machines=0A= these are actually 64-bits ints.=0A= =3D=0A= =0A= Fix: (a bit of a hack...) the code now assumes that the=0A= arrays contain intptr_t values. This type represents ints=0A= of the same number of bits as the Haskell ints (on 32-bit=0A= and 64-bit machines). The code now dereferences each element=0A= in the array correctly, but still truncates the possibly=0A= 64-bit value to a 32-bit value. This is not a problem=0A= in practice.=0A= ] =3D=0A= =0A= [Announce new maintainers, darcs (homepage).=0A= Eric Kow <eri...@lo...>**20070120231403] =3D=0A= =0A= [Add miscellaneous other images (homepage).=0A= Eric Kow <eri...@lo...>**20070120224435] =3D=0A= =0A= [Add application screenshots (homepage).=0A= Eric Kow <eri...@lo...>**20070120224104] =3D=0A= =0A= [Add images used in quick start (homepage).=0A= Eric Kow <eri...@lo...>**20070120223650] =3D=0A= =0A= [Add images used for samples (homepage).=0A= Eric Kow <eri...@lo...>**20070120223301] =3D=0A= =0A= [Add images directory (and wxhaskell logo).=0A= Eric Kow <eri...@lo...>**20070120222724] =3D=0A= =0A= [Remove counter code from homepage.=0A= Eric Kow <eri...@lo...>**20070120221619=0A= =3D=0A= =0A= This counter has an pop-up ads, which is rather obnoxious.=0A= =3D=0A= =0A= ] =3D=0A= =0A= [Add wxhaskell homepage files (main html, css only).=0A= Eric Kow <eri...@lo...>**20070120221304=0A= =3D=0A= =0A= I took the liberty of running dos2unix on these.=0A= =3D=0A= =0A= ] =3D=0A= =0A= [Add some wxhaskell-specifile boring file regexps.=0A= Eric Kow <eri...@lo...>**20070120221235] =3D=0A= =0A= [Use a custom boring file. (Right now just the darcs default)=0A= Eric Kow <eri...@lo...>**20070120221223] =3D=0A= =0A= [Add an etc/ directory for misc use.=0A= Eric Kow <eri...@lo...>**20070120212146] =3D=0A= =0A= [Modify wx-install so it doesn't accidentally recompile things.=0A= Eric Kow <eri...@lo...>**20070120225914=0A= =3D=0A= =0A= ] =3D=0A= =0A= [Merge wxStyledTextCntrl (Scintilla edit control wrapper) support from = Hast=3D=0A= e project=0A= shelarcy <she...@ca...>**20070111090641] =3D=0A= =0A= [Added #ifndef compilation flag around <inttypes.h> to avoid building = probl=3D=0A= em under Visual C++ (VC). (VC doesn't have <inttypes.h>.)=0A= she...@ca...**20061207005946] =3D=0A= =0A= [Correct previous patch for db.cpp=0A= she...@ca...**20061207004327] =3D=0A= =0A= [Add an eyeball test for Unicode strings.=0A= Eric Kow <eri...@lo...>**20061129042230] =3D=0A= =0A= [Use intptr_t to avoid assumption that integers are 32 bit.=0A= Arie Middelkoop <ar...@cs...>**20061125125628=0A= =3D=0A= =0A= Compiling wxHaskell on a 64bits platform fails, because there=0A= are some assumptions in the code that assume that integers are=0A= 32bits. For example, there are a couple of assignments of a=0A= pointer to an int.=0A= =3D=0A= =0A= This patch fixes these problems. Sometimes, after assigning a=0A= pointer to an integer, the int was used as a boolean value. In=0A= those cases, instead of returning a pointer p, I changed the=0A= code to return p !=3D3D NULL. In two other cases, a pointer is stored=0A= inside the int and in these cases I changed the type of the=0A= int to intptr_t, of which it is guaranteed that a pointer can be=0A= assigned to it and recovered from it.=0A= =3D=0A= =0A= Requires <inttypes.h>.=0A= =3D=0A= =0A= ] =3D=0A= =0A= [Added the -fPIC compiler flag to CXX options in the makefile.=0A= Arie Middelkoop <ar...@cs...>**20061115121006=0A= =3D=0A= =0A= Apparantly, my platform (gentoo x86_64 linux) required that .o files = are "=3D=0A= relocatable" when there =3D=0A= =0A= are linked into a dynamic library.=0A= =3D=0A= =0A= (It might be an idea to use libtool to hide this kind of = platform-specific=3D=0A= details)=0A= =3D=0A= =0A= ] =3D=0A= =0A= [Tweak wx build target to depend on wxcore-clean.=0A= Eric Kow <eri...@lo...>**20061115002142=0A= =3D=0A= =0A= This avoids weird build errors with GHC 6.6 like=0A= wx/src/Graphics/UI/WX/Types.hs:94:0:=0A= Bad interface file: out/wx/imports/Graphics/UI/WXCore/Types.hi=0A= Something is amiss; requested module=0A= =3D=0A= =0A= ] =3D=0A= =0A= [Update Windows/VC++ build for 0.10.1 (from jer...@gm...).=0A= Eric Kow <eri...@lo...>**20061029082957=0A= =3D=0A= =0A= ] =3D=0A= =0A= [Separate make/make install for wxcore and wx.=0A= Eric Kow <eri...@lo...>**20061027201218=0A= =3D=0A= =0A= Now the user has to type=0A= make=0A= (sudo) make install=0A= make wx=0A= (sudo) make wx-install=0A= =3D=0A= =0A= This is a tweak of Shelarcy's patch for making wxhaskell compile on GHC = 6.=3D=0A= 6.=0A= The intention is to avoid the surprising behaviour of wxcore being = install=3D=0A= ed=0A= when the user types 'make'.=0A= =3D=0A= =0A= ] =3D=0A= =0A= [Add shelarcy patch for compile with GHC-6.6=0A= jer...@gm...**20061027102208] =3D=0A= =0A= [Add support for toolbar divider and other toolbar options (from = shelarcy@g=3D=0A= mail.com)=0A= jer...@gm...**20061023095411] =3D=0A= =0A= [Add support for toolbar divider (for she...@gm...)=0A= jer...@gm...**20061023094720] =3D=0A= =0A= [Add support for list item mask (from she...@gm...)=0A= jer...@gm...**20061023094528] =3D=0A= =0A= [Add support for Calendar events (from sha...@gm...)=0A= jer...@gm...**20061023094412] =3D=0A= =0A= [Add support for wxWidgets version >=3D3D 2.5 (Sound API, db API)=0A= jer...@gm...**20061023094049] =3D=0A= =0A= [Shelarcy patch: fix typos in wxHaskell samples/contrib=0A= jer...@gm...**20060830114937] =3D=0A= =0A= [(OS X) Skip intermediate step of compiling master.o.=0A= Eric Kow <eri...@lo...>**20060813212620=0A= =3D=0A= =0A= Removing this step (which compiles master.o, and combines it with other=0A= stuff to get the real library we want) avoids weird error messages like=0A= =3D=0A= =0A= ld: out/wxc/master.o undefined symbol 36218 (__ZdaPv) can't be a weak=0A= definition=0A= =3D=0A= =0A= It's quite possible that this breaks something else, though...=0A= =3D=0A= =0A= ] =3D=0A= =0A= [Update VC++ project file to reflect new wxWidgets version support = (unteste=3D=0A= d)=0A= jer...@gm...**20060817170205] =3D=0A= =0A= [Update VC++ project file to reflect updated DLL version supporting = wxWidge=3D=0A= ts 2.6.3=0A= jer...@gm...**20060817170011] =3D=0A= =0A= [Update revision numbers and wxversion guesses for Windows / VC++ = (jeremy.o=3D=0A= don...@gm...)=0A= jer...@gm...**20060817165704] =3D=0A= =0A= [Shelarcy patch (VC project for wxWindows 2.6.3)=0A= jer...@gm...**20060816134707] =3D=0A= =0A= [Shelarcy patch (WxcTypes.hs)=0A= jer...@gm...**20060816115419] =3D=0A= =0A= [Shelarcy patch (eljdialup.cpp)=0A= jer...@gm...**20060816114418] =3D=0A= =0A= [Shelarcy patch (db.cpp)=0A= jer...@gm...**20060816113728] =3D=0A= =0A= [(wxc, Unicode) Files for compiling unicode version under Visual Studio.=0A= shelarcy <she...@ca...>**20060813212315=0A= =3D=0A= =0A= This is Eric Kow recording on Shelarcy's behalf. This corresponds to = vers=3D=0A= ion=0A= 08 of my Unicode patch.=0A= =3D=0A= =0A= ] =3D=0A= =0A= [Add a small makefile for compiling the samples.=0A= Eric Kow <eri...@lo...>**20060813211705=0A= =3D=0A= =0A= (This comes from version 08 of my Unicode patch).=0A= =3D=0A= =0A= ] =3D=0A= =0A= [(wxcore, Unicode) Add/use ability to interact with C wchar_t.=0A= Eric Kow <eri...@lo...>**20060813211211=0A= =3D=0A= =0A= This corresponds to the wxcore part of my Unicode patch, version 08=0A= modulo trailing whitespace.=0A= =3D=0A= =0A= I believe this would require for wxWidgets and wxhaskell to be compiled = wi=3D=0A= th=0A= Unicode enabled.=0A= =3D=0A= =0A= ] =3D=0A= =0A= [(wxdirect, Unicode) Use the Haskell types for C wchar_t and friends.=0A= Eric Kow <eri...@lo...>**20060813210420=0A= =3D=0A= =0A= I believe this would require that wxWidgets be compiled with Unicode=0A= enabled.=0A= =3D=0A= =0A= ] =3D=0A= =0A= [(wxc, Unicode) Use wxChar instead of char.=0A= Eric Kow <eri...@lo...>**20060813205557=0A= =3D=0A= =0A= wxChar is a C preprocessor macro that selects for char under=0A= --disable-unicode, and for wchar_t under --enable-unicode.=0A= =3D=0A= =0A= This corresponds to version 08 of my Unicode patch, but only the parts=0A= which affect wxc.=0A= =3D=0A= =0A= ] =3D=0A= =0A= [[wxhaskell-from-cvs @ 2005-05-08 08:12:51 by dleijen]=0A= dleijen**20050508081251=0A= updated change log=0A= ] =3D=0A= =0A= [[wxhaskell-from-cvs @ 2005-05-08 07:24:23 by dleijen]=0A= dleijen**20050508072423=0A= Compile wx via -fvia-C to fix crash with ghci on windows=0A= ] =3D=0A= =0A= [TAG wxhakell-0-9-4=0A= Unknown tagger**20060712042545] =3D=0A= =0A= Patch bundle hash:=0A= 5d4a5ec1d58e064bd7d8af9ef9ba15b5077f00c9=0A= =0A= --=3D_--=0A= =0A= .=0A= =0A= |
|
From: shelarcy <she...@gm...> - 2007-08-16 02:38:12
|
DarcsURL: http://darcs.haskell.org/wxhaskell=0A= MIME-Version: 1.0=0A= Content-Type: multipart/mixed; boundary=3D"=3D_"=0A= =0A= --=3D_=0A= Content-Type: text/plain=0A= Content-Transfer-Encoding: quoted-printable=0A= =0A= Thu Aug 16 02:51:37 =3D93=3D8C=3D8B=3D9E (=3D95W=3D8F=3D80=3D8E=3D9E) = 2007 shelarcy <shelarc=3D=0A= y...@gm...>=0A= * Add Drag & Drop and ClipBoard Support=0A= =0A= --=3D_=0A= Content-Type: text/x-darcs-patch; = name=3D"add-drag-_-drop-and-clipboard-support.dpatch"=0A= Content-Transfer-Encoding: quoted-printable=0A= Content-Description: A darcs patch for your repository!=0A= =0A= =0A= New patches:=0A= =0A= [Add Drag & Drop and ClipBoard Support=0A= shelarcy <she...@gm...>**20070815175137] {=0A= hunk ./configure 862=0A= + Graphics.UI.WXCore.DragAndDrop,=0A= hunk ./makefile 89=0A= + Graphics/UI/WXCore/Image \=0A= + Graphics/UI/WXCore/DragAndDrop \=0A= hunk ./makefile 97=0A= - Graphics/UI/WXCore/Image \=0A= hunk ./makefile 123=0A= + Graphics/UI/WXCore/DragAndDrop \=0A= hunk ./makefile 150=0A= - treectrl image apppath db glcanvas wave managed \=0A= + treectrl image apppath db dragimage glcanvas wave managed \=0A= hunk ./wxc/eiffel/wxc_defs.e 175=0A= +=3D0D=0A= +=3D0D=0A= +wxDRAG_COPYONLY: INTEGER is 0=3D0D=0A= +wxDRAG_ALLOWMOVE: INTEGER is 1=3D0D=0A= +wxDRAG_DEFALUTMOVE: INTEGER is 3=3D0D=0A= addfile ./wxc/include/dragimage.h=0A= hunk ./wxc/include/dragimage.h 1=0A= +/*----------------------------------------------------------------------= --=3D=0A= -----=3D0D=0A= + DragImage=3D0D=0A= +------------------------------------------------------------------------= --=3D=0A= ---*/=3D0D=0A= +TClassDefExtend(wxGenericDragImage,wxDragImage);=3D0D=0A= +=3D0D=0A= +TClass(wxDragImage) wxDragImage_Create( TClass(wxBitmap) image, int x, = in=3D=0A= t y );=3D0D=0A= +TClass(wxDragImage) wxDragIcon( TClass(wxIcon) icon, int x, int y = );=3D0D=0A= +TClass(wxDragImage) wxDragString( TClass(wxString) test, int x, int y = );=3D=0A= =3D0D=0A= +TClass(wxDragImage) wxDragTreeItem( TClass(wxTreeCtrl) treeCtrl, = TClass(w=3D=0A= xTreeItemId) id );=3D0D=0A= +TClass(wxDragImage) wxDragListItem( TClass(wxListCtrl) treeCtrl, long = id =3D=0A= );=3D0D=0A= +TClass(wxGenericDragImage) wxGenericDragImage_Create( TClass(wxCursor) = cu=3D=0A= rsor, int x, int y );=3D0D=0A= +TClass(wxGenericDragImage) wxGenericDragIcon( TClass(wxIcon) icon, int = x,=3D=0A= int y );=3D0D=0A= +TClass(wxGenericDragImage) wxGenericDragString( TClass(wxString) test, = in=3D=0A= t x, int y );=3D0D=0A= +TClass(wxGenericDragImage) wxGenericDragTreeItem( TClass(wxTreeCtrl) = tree=3D=0A= Ctrl, TClass(wxTreeItemId) id );=3D0D=0A= +TClass(wxGenericDragImage) wxGenericDragListItem( TClass(wxListCtrl) = tree=3D=0A= Ctrl, long id );=3D0D=0A= +void wxDragImage_Delete(TSelf(wxDragImage) self);=3D0D=0A= +TBool wxDragImage_BeginDragFullScreen(TSelf(wxDragImage) self, int = x_pos,=3D=0A= int y_pos, TClass(wxWindow) window, TBool fullScreen, TClass(wxRect) = rect)=3D=0A= ;=3D0D=0A= +TBool wxDragImage_BeginDrag(TSelf(wxDragImage) self, int x, int y, = TClass=3D=0A= (wxWindow) window, TClass(wxWindow) boundingWindow );=3D0D=0A= +TBool wxGenericDragImage_DoDrawImage(TSelf(wxGenericDragImage) self, = TCla=3D=0A= ss(wxDC) dc, int x, int y );=3D0D=0A= +void wxDragImage_EndDrag(TSelf(wxDragImage) self );=3D0D=0A= +void wxGenericDragImage_GetImageRect(TSelf(wxGenericDragImage) self, = int =3D=0A= x_pos, int y_pos, int* x, int* y, int* w, int* h );=3D0D=0A= +TBool wxDragImage_Hide(TSelf(wxDragImage) self );=3D0D=0A= +TBool wxDragImage_Move(TSelf(wxDragImage) self, int x, int y );=3D0D=0A= +TBool wxDragImage_Show(TSelf(wxDragImage) self );=3D0D=0A= +TBool = wxGenericDragImage_UpdateBackingFromWindow(TSelf(wxGenericDragImage=3D=0A= ) self, TClass(wxDC) windowDC, TClass(wxMemoryDC) destDC, int x, int y, = int=3D=0A= w, int h, int xdest, int ydest, int width, int height );=3D0D=0A= hunk ./wxc/include/ewxw/wxc_glue.h 1072=0A= -int wxClipboard_AddData( TSelf(wxClipboard) _obj, void* data = );=3D0D=0A= +int wxClipboard_AddData( TSelf(wxClipboard) _obj, = TClass(wxDataObje=3D=0A= ct) data );=3D0D=0A= hunk ./wxc/include/ewxw/wxc_glue.h 1077=0A= -int wxClipboard_GetData( TSelf(wxClipboard) _obj, void* data = );=3D0D=0A= +int wxClipboard_GetData( TSelf(wxClipboard) _obj, = TClass(wxDataObje=3D=0A= ct) data );=3D0D=0A= hunk ./wxc/include/ewxw/wxc_glue.h 1079=0A= -TBool wxClipboard_IsSupported( TSelf(wxClipboard) _obj, void* = format =3D=0A= );=3D0D=0A= +TBool wxClipboard_IsSupported( TSelf(wxClipboard) _obj, = TClass(wxData=3D=0A= Format) format );=3D0D=0A= hunk ./wxc/include/ewxw/wxc_glue.h 1081=0A= -int wxClipboard_SetData( TSelf(wxClipboard) _obj, void* data = );=3D0D=0A= +int wxClipboard_SetData( TSelf(wxClipboard) _obj, = TClass(wxDataObje=3D=0A= ct) data );=3D0D=0A= hunk ./wxc/include/ewxw/wxc_glue.h 1294=0A= +TClass(wxCursor) Cursor_CreateFromImage( TClass(wxImage) image );=3D0D=0A= +TClass(wxCursor) Cursor_CreateLoad( TStringVoid name, long type, = TSize(wi=3D=0A= dth,height) );=3D0D=0A= hunk ./wxc/include/ewxw/wxc_glue.h 1649=0A= -TClass(wxDropSource) DropSource_Create( void* data, TClass(wxWindow) = win, =3D=0A= void* copy, void* move, void* none );=3D0D=0A= +TClass(wxDropSource) DropSource_Create( TClass(wxDataObject) data, = TClass(=3D=0A= wxWindow) win, void* copy, void* move, void* none );=3D0D=0A= hunk ./wxc/include/ewxw/wxc_glue.h 1784=0A= -TClass(wxFileDataObject) FileDataObject_Create( TClass(wxList) _lst, = int _=3D=0A= cnt );=3D0D=0A= +TClass(wxFileDataObject) FileDataObject_Create( TArrayString(_cnt, = _lst) )=3D=0A= ;=3D0D=0A= hunk ./wxc/include/ewxw/wxc_glue.h 1786=0A= -int FileDataObject_GetFilenames( TSelf(wxFileDataObject) _obj, = TCla=3D=0A= ss(wxList) _lst );=3D0D=0A= +TArrayLen FileDataObject_GetFilenames( TSelf(wxFileDataObject) = _obj=3D=0A= , TArrayStringOutVoid _lst );=3D0D=0A= hunk ./wxc/include/ewxw/wxc_glue.h 4279=0A= +size_t TextDataObject_GetTextLength( TSelf(TextDataObject) _obj );=3D0D=0A= +TStringLen TextDataObject_GetText( TSelf(TextDataObject) _obj, = TStri=3D=0A= ngOutVoid _buf );=3D0D=0A= +void TextDataObject_SetText( TSelf(TextDataObject) _obj, TString = tex=3D=0A= t );=3D0D=0A= hunk ./wxc/include/wxc.h 23=0A= +#include "dragimage.h"=0A= addfile ./wxc/src/dragimage.cpp=0A= hunk ./wxc/src/dragimage.cpp 1=0A= +#include "wrapper.h"=0A= +#include <wx/dragimag.h>=0A= +#include <wx/generic/dragimgg.h>=0A= +=0A= +extern "C" {=0A= +/*----------------------------------------------------------------------= --=3D=0A= -----=0A= + DragImage=0A= +------------------------------------------------------------------------= --=3D=0A= ---*/=0A= +EWXWEXPORT(wxDragImage*,wxDragImage_Create)( const wxBitmap* image, int = x,=3D=0A= int y )=0A= +{=0A= + return new wxDragImage(*image, wxNullCursor, wxPoint(x, y));=0A= +}=0A= +=0A= +EWXWEXPORT(wxDragImage*,wxDragIcon)( const wxIcon* icon, int x, int y )=0A= +{=0A= + return new wxDragImage(*icon, wxNullCursor, wxPoint(x, y));=0A= +}=0A= +=0A= +EWXWEXPORT(wxDragImage*,wxDragString)( const wxString* text, int x, int = y =3D=0A= )=0A= +{=0A= + return new wxDragImage(*text, wxNullCursor, wxPoint(x, y));=0A= +}=0A= +=0A= +EWXWEXPORT(wxDragImage*,wxDragTreeItem)( const wxTreeCtrl* treeCtrl, = wxTre=3D=0A= eItemId* id )=0A= +{=0A= + return new wxDragImage(*treeCtrl, *id);=0A= +}=0A= +=0A= +EWXWEXPORT(wxDragImage*,wxDragListItem)( const wxListCtrl* listCtrl, = long =3D=0A= id )=0A= +{=0A= + return new wxDragImage(*listCtrl, id);=0A= +}=0A= +=0A= +EWXWEXPORT(wxGenericDragImage*,wxGenericDragImage_Create)( const = wxCursor*=3D=0A= cursor, int x, int y )=0A= +{=0A= + return new wxGenericDragImage(*cursor, wxPoint(x, y));=0A= +}=0A= +=0A= +EWXWEXPORT(wxGenericDragImage*,wxGenericDragIcon)( const wxIcon* icon, = int=3D=0A= x, int y )=0A= +{=0A= + return new wxGenericDragImage(*icon, wxNullCursor, wxPoint(x, y));=0A= +}=0A= +=0A= +EWXWEXPORT(wxGenericDragImage*,wxGenericDragString)( const wxString* = text,=3D=0A= int x, int y )=0A= +{=0A= + return new wxGenericDragImage(*text, wxNullCursor, wxPoint(x, y));=0A= +}=0A= +=0A= +EWXWEXPORT(wxGenericDragImage*,wxGenericDragTreeItem)( const = wxTreeCtrl* t=3D=0A= reeCtrl, wxTreeItemId* id )=0A= +{=0A= + return new wxGenericDragImage(*treeCtrl, *id);=0A= +}=0A= +=0A= +EWXWEXPORT(wxGenericDragImage*,wxGenericDragListItem)( const = wxListCtrl* l=3D=0A= istCtrl, long id )=0A= +{=0A= + return new wxGenericDragImage(*listCtrl, id);=0A= +}=0A= +=0A= +EWXWEXPORT(void,wxDragImage_Delete)(wxDragImage* self) =3D=0A= =0A= +{=0A= + if (self) delete self;=0A= +}=0A= +=0A= +EWXWEXPORT(bool,wxDragImage_BeginDragFullScreen)( wxDragImage* self, = int x=3D=0A= _pos, int y_pos,=0A= + wxWindow* window, = bool f=3D=0A= ullScreen,=0A= + wxRect* rect)=0A= +{=0A= + return self->BeginDrag(wxPoint(x_pos, y_pos), window, fullScreen, = rect);=0A= +}=0A= +=0A= +EWXWEXPORT(bool,wxDragImage_BeginDrag)( wxDragImage* self, int x, int y,=0A= + wxWindow* window, wxWindow* = boundi=3D=0A= ngWindow)=0A= +{=0A= + return self->BeginDrag(wxPoint(x, y), window, boundingWindow);=0A= +}=0A= +=0A= +EWXWEXPORT(bool,wxGenericDragImage_DoDrawImage)( wxGenericDragImage* = self,=3D=0A= wxDC* dc, int x, int y)=0A= +{=0A= + return self->DoDrawImage(*dc, wxPoint(x, y));=0A= +}=0A= +=0A= +EWXWEXPORT(bool,wxDragImage_EndDrag)( wxDragImage* self)=0A= +{=0A= + return self->EndDrag();=0A= +}=0A= +=0A= +EWXWEXPORT(void,wxGenericDragImage_GetImageRect)( wxGenericDragImage* = self=3D=0A= , int x_pos, int y_pos,=0A= + int* x, int* y, int* = w, =3D=0A= int* h)=0A= +{=0A= + wxRect rc =3D3D self->GetImageRect(wxPoint(x_pos, y_pos));=0A= + *x =3D3D rc.x;=0A= + *y =3D3D rc.y;=0A= + *w =3D3D rc.width;=0A= + *h =3D3D rc.height;=0A= +}=0A= +=0A= +EWXWEXPORT(bool,wxDragImage_Hide)( wxDragImage* self)=0A= +{=0A= + return self->Hide();=0A= +}=0A= +=0A= +EWXWEXPORT(bool,wxDragImage_Move)( wxDragImage* self, int x, int y)=0A= +{=0A= + return self->Move(wxPoint(x, y));=0A= +}=0A= +=0A= +EWXWEXPORT(bool,wxDragImage_Show)( wxDragImage* self)=0A= +{=0A= + return self->Show();=0A= +}=0A= +=0A= +EWXWEXPORT(bool,wxGenericDragImage_UpdateBackingFromWindow)( = wxGenericDrag=3D=0A= Image* self, wxDC* windowDC, wxMemoryDC* destDC,=0A= + int x, int = y,=3D=0A= int w, int h,=0A= + int xdest, = in=3D=0A= t ydest, int width, int height)=0A= +{=0A= + return self->UpdateBackingFromWindow(*windowDC, *destDC,=0A= + wxRect(x, y, w, h),=0A= + wxRect(xdest, ydest, width, = height)=3D=0A= );=0A= +}=0A= +=0A= +}=0A= +=0A= +=0A= hunk ./wxc/src/ewxw/eljclipboard.cpp 31=0A= -EWXWEXPORT(int, wxClipboard_SetData)(void* _obj, void* data)=3D0D=0A= +EWXWEXPORT(int, wxClipboard_SetData)(void* _obj, wxDataObject* = data)=3D0D=0A= hunk ./wxc/src/ewxw/eljclipboard.cpp 33=0A= - return (int)((wxClipboard*)_obj)->SetData((wxDataObject*)data);=3D0D=0A= + return (int)((wxClipboard*)_obj)->SetData(data);=3D0D=0A= hunk ./wxc/src/ewxw/eljclipboard.cpp 36=0A= -EWXWEXPORT(int, wxClipboard_AddData)(void* _obj, void* data)=3D0D=0A= +EWXWEXPORT(int, wxClipboard_AddData)(void* _obj, wxDataObject* = data)=3D0D=0A= hunk ./wxc/src/ewxw/eljclipboard.cpp 38=0A= - return (int)((wxClipboard*)_obj)->AddData((wxDataObject*)data);=3D0D=0A= + return (int)((wxClipboard*)_obj)->AddData(data);=3D0D=0A= hunk ./wxc/src/ewxw/eljclipboard.cpp 41=0A= -EWXWEXPORT(int, wxClipboard_IsSupported)(void* _obj, void* format)=3D0D=0A= +EWXWEXPORT(int, wxClipboard_IsSupported)(void* _obj, wxDataFormat* = format)=3D=0A= =3D0D=0A= hunk ./wxc/src/ewxw/eljclipboard.cpp 43=0A= - return = (int)((wxClipboard*)_obj)->IsSupported(*((wxDataFormat*)format));=3D=0A= =3D0D=0A= + return (int)((wxClipboard*)_obj)->IsSupported(*format);=3D0D=0A= hunk ./wxc/src/ewxw/eljclipboard.cpp 46=0A= -EWXWEXPORT(int, wxClipboard_GetData)(void* _obj, void* data)=3D0D=0A= +EWXWEXPORT(int, wxClipboard_GetData)(void* _obj, wxDataObject* = data)=3D0D=0A= hunk ./wxc/src/ewxw/eljclipboard.cpp 48=0A= - return (int)((wxClipboard*)_obj)->GetData(*((wxDataObject*)data));=3D0D=0A= + return (int)((wxClipboard*)_obj)->GetData(*data);=3D0D=0A= hunk ./wxc/src/ewxw/eljcursor.cpp 10=0A= +=3D0D=0A= +EWXWEXPORT(void*, Cursor_CreateFromImage)(wxImage* image)=3D0D=0A= +{=3D0D=0A= + return (void*) new wxCursor(*image);=3D0D=0A= +}=3D0D=0A= +=3D0D=0A= +EWXWEXPORT(void*, Cursor_CreateLoad) (const wxString* name, long type, = int=3D=0A= width, int height)=3D0D=0A= +{=3D0D=0A= + return (void*) new wxCursor(*name, type, width, height);=3D0D=0A= +}=3D0D=0A= hunk ./wxc/src/ewxw/eljdnd.cpp 178=0A= -EWXWEXPORT(void*, FileDataObject_Create)(void* _lst, int _cnt)=3D0D=0A= +EWXWEXPORT(size_t, TextDataObject_GetTextLength)(void* _obj)=3D0D=0A= +{=3D0D=0A= + return ((wxTextDataObject*)_obj)->GetTextLength();=3D0D=0A= +}=3D0D=0A= +=3D0D=0A= +EWXWEXPORT(int, TextDataObject_GetText)(void* _obj, void* _buf)=3D0D=0A= +{=3D0D=0A= + wxString result =3D3D((wxTextDataObject*)_obj)->GetText();=3D0D=0A= + return copyStrToBuf(_buf, result);=3D0D=0A= +}=3D0D=0A= +=3D0D=0A= +EWXWEXPORT(void, TextDataObject_SetText)(void* _obj, const wxString* = strTe=3D=0A= xt)=3D0D=0A= +{=3D0D=0A= + ((wxTextDataObject*)_obj)->SetText(*strText);=3D0D=0A= +}=3D0D=0A= +=3D0D=0A= +EWXWEXPORT(void*, FileDataObject_Create)(int _cnt, void* _lst )=3D0D=0A= hunk ./wxc/src/ewxw/eljdnd.cpp 253=0A= -EWXWEXPORT(void*, DropSource_Create)(void* data, void* win, void* copy, = vo=3D=0A= id* move, void* none)=3D0D=0A= +EWXWEXPORT(void*, DropSource_Create)(wxDataObject* data, void* win, = void* =3D=0A= copy, void* move, void* none)=3D0D=0A= hunk ./wxc/src/ewxw/eljdnd.cpp 256=0A= - return (void*) new wxDropSource(*((wxDataObject*)data), = (wxWindow*)win, *=3D=0A= ((wxCursor*)copy), *((wxCursor*)move), *((wxCursor*)none));=3D0D=0A= + return (void*) new wxDropSource(*data, (wxWindow*)win, = *((wxCursor*)copy)=3D=0A= , *((wxCursor*)move), *((wxCursor*)none));=3D0D=0A= hunk ./wxc/src/ewxw/eljdnd.cpp 258=0A= - return (void*) new wxDropSource(*((wxDataObject*)data), = (wxWindow*)win, *=3D=0A= ((wxIcon*)copy), *((wxIcon*)move), *((wxIcon*)none));=3D0D=0A= + return (void*) new wxDropSource(*data, (wxWindow*)win, = *((wxIcon*)copy), =3D=0A= *((wxIcon*)move), *((wxIcon*)none));=3D0D=0A= hunk ./wxc/wxc-2.4.dsp 107=0A= +SOURCE=3D3D.\include\dragimage.h=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= hunk ./wxc/wxc-2.4.dsp 177=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\dragimage.cpp=3D0D=0A= +# End Source File=3D0D=0A= hunk ./wxc/wxcu-2.6.4.dsp 109=0A= +SOURCE=3D3D.\include\dragimage.h=3D0D=0A= +# End Source File=3D0D=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= hunk ./wxc/wxcu-2.6.4.dsp 179=0A= +# Begin Source File=3D0D=0A= +=3D0D=0A= +SOURCE=3D3D.\src\dragimage.cpp=3D0D=0A= +# End Source File=3D0D=0A= hunk ./wxcore/src/Graphics/UI/WXCore.hs 33=0A= + , module Graphics.UI.WXCore.DragAndDrop=0A= hunk ./wxcore/src/Graphics/UI/WXCore.hs 64=0A= +import Graphics.UI.WXCore.DragAndDrop=0A= hunk ./wxcore/src/Graphics/UI/WXCore/Controls.hs 23=0A= + , execClipBoardData=0A= hunk ./wxcore/src/Graphics/UI/WXCore/Controls.hs 118=0A= - =3D=0A= =0A= +=0A= +=0A= +-- | Use a 'clipboardSetData' or 'clipboardGetData' in this function. = But =3D=0A= don't=0A= +-- use long computation in this function. Because this function = encloses t=3D=0A= he=0A= +-- computation with 'clipboardOpen' and 'clipboardClose', and wxHaskell = us=3D=0A= es=0A= +-- Global clipboard on your environment. So, long computation causes = probl=3D=0A= em.=0A= +execClipBoardData :: Clipboard a -> (Clipboard a -> IO b) -> IO b=0A= +execClipBoardData cl event =3D3D bracket_ (clipboardOpen cl) = (clipboardClose=3D=0A= cl) (event cl)=0A= +=0A= addfile ./wxcore/src/Graphics/UI/WXCore/DragAndDrop.hs=0A= hunk ./wxcore/src/Graphics/UI/WXCore/DragAndDrop.hs 1=0A= +{-# OPTIONS -fglasgow-exts #-}=0A= +{-----------------------------------------------------------------------= --=3D=0A= ----------------=0A= + Module : DragAndDrop=0A= + Copyright : (c) shelarcy 2007=0A= + License : wxWidgets=0A= +=0A= + Maintainer : she...@gm...=0A= + Stability : provisional=0A= + Portability : portable=0A= +=0A= + Drag & Drop events.=0A= +------------------------------------------------------------------------= --=3D=0A= ---------------}=0A= +module Graphics.UI.WXCore.DragAndDrop (=0A= + -- * Drop Targets=0A= + dropTarget=0A= + -- * Create Drop Soruces=0A= + , dropSource=0A= + , dropSourceWithCursor=0A= + , dropSourceWithCursorByString=0A= + , dropSourceWithIcon=0A= +=0A= + -- * Set event handlers=0A= + -- ** Drop Target events=0A= + , DragResult (..)=0A= + , dropTargetOnData=0A= + , dropTargetOnDrop=0A= + , dropTargetOnEnter=0A= + , dropTargetOnDragOver=0A= + , dropTargetOnLeave=0A= + =3D=0A= =0A= + -- ** On DragAndDropEvent=0A= + , DragMode (..)=0A= + , dragAndDrop=0A= + =3D=0A= =0A= + -- ** Special handler for Drop File event=0A= + , fileDropTarget=0A= + -- ** Special handler for Drop Text event =3D=0A= =0A= + , textDropTarget=0A= + ) where=0A= +=0A= +import Graphics.UI.WXCore.Defines=0A= +import Graphics.UI.WXCore.Image=0A= +import Graphics.UI.WXCore.WxcDefs=0A= +import Graphics.UI.WXCore.WxcObject=0A= +import Graphics.UI.WXCore.WxcTypes=0A= +import Graphics.UI.WXCore.WxcClassTypes=0A= +import Graphics.UI.WXCore.WxcClassesAL=0A= +import Graphics.UI.WXCore.WxcClassesMZ=0A= +=0A= +import Foreign.Ptr=0A= +import Foreign.C.String=0A= +import Foreign.Marshal.Array=0A= +import Foreign.Marshal.Utils=0A= +=0A= +=0A= +{-----------------------------------------------------------------------= --=3D=0A= -------=0A= + Drop Target=0A= +------------------------------------------------------------------------= --=3D=0A= ------}=0A= +-- | Set a drop target window and 'DataObject' that is associated with = dro=3D=0A= p event.=0A= +dropTarget :: Window a -> DataObject b -> IO (WXCDropTarget ())=0A= +dropTarget window wxdata =3D3D do=0A= + drop <- wxcDropTargetCreate nullPtr=0A= + dropTargetSetDataObject drop wxdata=0A= + windowSetDropTarget window drop=0A= + return drop=0A= +=0A= +{-----------------------------------------------------------------------= --=3D=0A= ----------------=0A= + Drag and Drop events=0A= +------------------------------------------------------------------------= --=3D=0A= ---------------}=0A= +-- | Drag results=0A= +data DragResult=0A= + =3D3D DragError=0A= + | DragNone=0A= + | DragCopy=0A= + | DragMove=0A= + | DragLink=0A= + | DragCancel=0A= + | DragUnknown=0A= + deriving (Eq,Show)=0A= +=0A= +dragResults :: [(Int, DragResult)]=0A= +dragResults=0A= + =3D3D [(wxDRAG_ERROR ,DragError)=0A= + ,(wxDRAG_NONE ,DragNone)=0A= + ,(wxDRAG_COPY ,DragCopy)=0A= + ,(wxDRAG_MOVE ,DragMove)=0A= + ,(wxDRAG_LINK ,DragLink)=0A= + ,(wxDRAG_CANCEL ,DragCancel)]=0A= +=0A= +fromDragResult :: DragResult -> Int=0A= +fromDragResult drag=0A= + =3D3D case drag of=0A= + DragError -> wxDRAG_ERROR=0A= + DragNone -> wxDRAG_NONE=0A= + DragCopy -> wxDRAG_COPY=0A= + DragMove -> wxDRAG_MOVE=0A= + DragLink -> wxDRAG_LINK=0A= + DragCancel -> wxDRAG_CANCEL=0A= + DragUnknown -> wxDRAG_ERROR=0A= +=0A= +toDragResult :: Int -> DragResult=0A= +toDragResult drag=0A= + =3D3D case lookup drag dragResults of=0A= + Just x -> x=0A= + Nothing -> DragError=0A= +=0A= +-- | Set an event handler that is called when the drop target can be = fille=3D=0A= d with data.=0A= +-- This function require to use 'dropTargetGetData' in your event = handler =3D=0A= to fill data.=0A= +dropTargetOnData :: DropTarget a -> (Point -> DragResult -> IO = DragResult)=3D=0A= -> IO ()=0A= +dropTargetOnData drop event =3D3D do=0A= + funPtr <- dragThreeFuncHandler event=0A= + wxcDropTargetSetOnData (objectCast drop) (toCFunPtr funPtr)=0A= +=0A= +-- | Set an event handler for an drop command in a drop target.=0A= +dropTargetOnDrop :: DropTarget a -> (Point -> IO Bool) -> IO ()=0A= +dropTargetOnDrop drop event =3D3D do=0A= + funPtr <- dragTwoFuncHandler event=0A= + wxcDropTargetSetOnDrop (objectCast drop) (toCFunPtr funPtr)=0A= +=0A= +-- | Set an event handler for an enter command in a drop target.=0A= +dropTargetOnEnter :: DropTarget a -> (Point -> DragResult -> IO = DragResult=3D=0A= ) -> IO ()=0A= +dropTargetOnEnter drop event =3D3D do=0A= + funPtr <- dragThreeFuncHandler event=0A= + wxcDropTargetSetOnEnter (objectCast drop) (toCFunPtr funPtr)=0A= +=0A= +-- | Set an event handler for a drag over command in a drop target.=0A= +dropTargetOnDragOver :: DropTarget a -> (Point -> DragResult -> IO = DragRes=3D=0A= ult) -> IO ()=0A= +dropTargetOnDragOver drop event =3D3D do=0A= + funPtr <- dragThreeFuncHandler event=0A= + wxcDropTargetSetOnDragOver (objectCast drop) (toCFunPtr funPtr)=0A= +=0A= +-- | Set an event handler for a leave command in a drop target.=0A= +dropTargetOnLeave :: DropTarget a -> (IO ()) -> IO ()=0A= +dropTargetOnLeave drop event =3D3D do=0A= + funPtr <- dragZeroFuncHandler event=0A= + wxcDropTargetSetOnLeave (objectCast drop) (toCFunPtr funPtr)=0A= +=0A= +dragZeroFuncHandler event =3D3D=0A= + dragZeroFunc $ \obj -> do=0A= + event=0A= +=0A= +dragTwoFuncHandler event =3D3D=0A= + dragTwoFunc $ \obj x y -> do=0A= + result <- event (point (fromIntegral x) (fromIntegral y))=0A= + return $ fromBool result=0A= +=0A= +dragThreeFuncHandler event =3D3D=0A= + dragThreeFunc $ \obj x y pre -> do=0A= + result <- event (point (fromIntegral x) (fromIntegral y)) = (toDragResul=3D=0A= t $ fromIntegral pre)=0A= + return $ fromIntegral $ fromDragResult result=0A= +=0A= +-- | Set an event handler for a drag & drop command between drag source = wi=3D=0A= ndow and drop=0A= +-- target. You must set 'dropTarget' before use this action.=0A= +-- And If you use 'fileDropTarget' or 'textDropTarget', you need not = use t=3D=0A= his.=0A= +dragAndDrop :: DropSource a -> DragMode -> (DragResult -> IO ()) -> IO = ()=0A= +dragAndDrop drSrc flag event =3D3D do=0A= + result <- dropSourceDoDragDrop drSrc (fromDragMode flag)=0A= + case lookup result dragResults of=0A= + Just x -> event x=0A= + Nothing -> return ()=0A= +=0A= +-- | Create 'DropSource'. Then 'dragAndDrop' replace target\'s = 'DataObject=3D=0A= ' by this 'DataObject'.=0A= +dropSource :: DataObject a -> Window b -> IO (DropSource ())=0A= +dropSource wxdata win =3D3D=0A= + withObjectPtr nullIcon $ \icon ->=0A= + withObjectPtr nullIcon $ \icon ->=0A= + withObjectPtr nullIcon $ \icon ->=0A= + dropSourceCreate wxdata win icon icon icon=0A= +=0A= +-- | On Windows or Mac OS X platform, you must choose this function or = 'dr=3D=0A= opSourceWithCursorByString',=0A= +-- if you want to use Custom Cursor for Drag & Drop event. = 'dropSourceWith=3D=0A= Icon' doesn't work these=0A= +-- platform, and this function doesn't work other platforms.=0A= +dropSourceWithCursor :: DataObject a -> Window b -> Cursor c -> Cursor = c -=3D=0A= > Cursor c -> IO (DropSource ())=0A= +dropSourceWithCursor wxdata win copy move none =3D3D=0A= + withObjectPtr copy $ \dndCopy ->=0A= + withObjectPtr move $ \dndMove ->=0A= + withObjectPtr none $ \dndNone ->=0A= + dropSourceCreate wxdata win dndCopy dndMove dndNone=0A= +=0A= +dropSourceWithIcon :: DataObject a -> Window b -> Icon c -> Icon c -> = Icon=3D=0A= c -> IO (DropSource ())=0A= +dropSourceWithIcon wxdata win copy move none =3D3D=0A= + withObjectPtr copy $ \dndCopy ->=0A= + withObjectPtr move $ \dndMove ->=0A= + withObjectPtr none $ \dndNone ->=0A= + dropSourceCreate wxdata win dndCopy dndMove dndNone=0A= +=0A= +dropSourceWithCursorByString :: DataObject a -> Window b -> String -> = Stri=3D=0A= ng -> String -> IO (DropSource ())=0A= +dropSourceWithCursorByString wxdata win copy move none =3D3D=0A= + case wxToolkit of=0A= + WxMSW -> do=0A= + dndCopy <- cursorCreateFromFile copy=0A= + dndMove <- cursorCreateFromFile move=0A= + dndNone <- cursorCreateFromFile none=0A= + dropSourceWithCursor wxdata win dndCopy dndMove dndNone=0A= + WxMac -> do=0A= + dndCopy <- cursorCreateFromFile copy=0A= + dndMove <- cursorCreateFromFile move=0A= + dndNone <- cursorCreateFromFile none=0A= + dropSourceWithCursor wxdata win dndCopy dndMove dndNone=0A= + _ -> do=0A= + dndCopy <- iconCreateFromFile copy sizeNull=0A= + dndMove <- iconCreateFromFile move sizeNull=0A= + dndNone <- iconCreateFromFile none sizeNull=0A= + dropSourceWithIcon wxdata win dndCopy dndMove dndNone=0A= +=0A= +=0A= +-- | Set an event handler that is called when text is dropped in target = wi=3D=0A= ndow.=0A= +textDropTarget :: Window a -> TextDataObject b -> (Point -> String -> = IO (=3D=0A= )) -> IO ()=0A= +textDropTarget window textData event =3D3D do=0A= + funPtr <- dropTextHandler event=0A= + textDrop <- wxcTextDropTargetCreate nullPtr (toCFunPtr funPtr)=0A= + dropTargetSetDataObject textDrop textData=0A= + windowSetDropTarget window textDrop=0A= +=0A= +dropTextHandler event =3D3D=0A= + wrapTextDropHandler $ \obj x y cstr -> do=0A= + str <- peekCWString cstr=0A= + event (point (fromIntegral x) (fromIntegral y)) str=0A= +=0A= +-- | Set an event handler that is called when files are dropped in = target =3D=0A= window.=0A= +fileDropTarget :: Window a -> (Point -> [String] -> IO ()) -> IO ()=0A= +fileDropTarget window event =3D3D do=0A= + funPtr <- dropFileHandler event=0A= + fileDrop <- wxcFileDropTargetCreate nullPtr (toCFunPtr funPtr)=0A= + windowSetDropTarget window fileDrop=0A= +=0A= +dropFileHandler event =3D3D=0A= + wrapFileDropHandler $ \obj x y carr size -> do=0A= + arr <- peekArray (fromIntegral size) carr=0A= + files <- mapM peekCWString arr=0A= + event (point (fromIntegral x) (fromIntegral y)) files=0A= +=0A= +data DragMode =3D3D CopyOnly | AllowMove | Default=0A= + deriving (Eq,Show)=0A= + -- deriving (Eq,Show,Read,Typeable)=0A= +=0A= +fromDragMode :: DragMode -> Int=0A= +fromDragMode mode=0A= + =3D3D case mode of=0A= + CopyOnly -> wxDRAG_COPYONLY=0A= + AllowMove -> wxDRAG_ALLOWMOVE=0A= + Default -> wxDRAG_DEFALUTMOVE=0A= +=0A= +foreign import ccall "wrapper" dragZeroFunc :: (Ptr obj -> IO ()) -> IO = (F=3D=0A= unPtr (Ptr obj -> IO ()))=0A= +foreign import ccall "wrapper" dragTwoFunc :: (Ptr obj -> CInt -> CInt = -> =3D=0A= IO CInt) -> IO (FunPtr (Ptr obj -> CInt -> CInt -> IO CInt))=0A= +foreign import ccall "wrapper" dragThreeFunc :: (Ptr obj -> CInt -> = CInt -=3D=0A= > CInt -> IO CInt) -> IO (FunPtr (Ptr obj -> CInt -> CInt -> CInt -> IO = CIn=3D=0A= t))=0A= +foreign import ccall "wrapper" wrapTextDropHandler :: (Ptr obj -> CInt = -> =3D=0A= CInt -> Ptr CWchar -> IO ()) -> IO (FunPtr (Ptr obj -> CInt -> CInt -> = Ptr =3D=0A= CWchar -> IO ()))=0A= +foreign import ccall "wrapper" wrapFileDropHandler :: (Ptr obj -> CInt = -> =3D=0A= CInt -> Ptr (Ptr CWchar) -> CInt -> IO ()) -> IO (FunPtr (Ptr obj -> = CInt -=3D=0A= > CInt -> Ptr (Ptr CWchar) -> CInt -> IO ()))=0A= hunk ./wxcore/src/Graphics/UI/WXCore/Image.hs 21=0A= + -- ** Cursors=0A= + , withCursorFromFile=0A= + , cursorCreateFromFile=0A= hunk ./wxcore/src/Graphics/UI/WXCore/Image.hs 127=0A= +{-----------------------------------------------------------------------= --=3D=0A= ----------------=0A= + Cursors=0A= +------------------------------------------------------------------------= --=3D=0A= ---------------}=0A= +-- | Load an cursor (see 'cursorCreateFromFile') and automatically = delete =3D=0A= it=0A= +-- after use.=0A= +withCursorFromFile :: FilePath -> (Cursor () -> IO a) -> IO a=0A= +withCursorFromFile fname f=0A= + =3D3D bracket (cursorCreateFromFile fname)=0A= + (cursorDelete)=0A= + f=0A= +=0A= +-- | Load an cursor from an icon file (ico,xbm,xpm,gif).=0A= +-- For a reason, this function is incomatible with 'iconCreateFromFile'.=0A= +cursorCreateFromFile :: String -> IO (Cursor ())=0A= +cursorCreateFromFile fname =3D3D imageCreateFromFile fname >>=3D3D = cursorCreat=3D=0A= eFromImage=0A= +=0A= }=0A= =0A= Context:=0A= =0A= [Add (Multi-)MediaCtrl Support=0A= shelarcy <she...@gm...>**20070811123742] =3D=0A= =0A= [Rework wxToolkit and isDefined by fixing *defs' char array to wxChar = array=0A= shelarcy <she...@gm...>**20070806121930] =3D=0A= =0A= [Change some str* functions or wcs* functions to wxStr* functions=0A= shelarcy <she...@gm...>**20070805112624] =3D=0A= =0A= [Remove unused wxh directory files=0A= shelarcy <she...@gm...>**20070803123528] =3D=0A= =0A= [Remove unused wxWidgets 2.5.x's VC project=0A= shelarcy <she...@gm...>**20070803120930] =3D=0A= =0A= [Add VC project for wxWidgets 2.6.4=0A= shelarcy <she...@gm...>**20070803120733] =3D=0A= =0A= [Fix broken wxc-2.4 Visual Studio Project=0A= shelarcy <she...@ho...>**20070723214850] =3D=0A= =0A= [polyline-64bit-compatibility-fix=0A= ar...@cs...**20070313080116=0A= Fixes a problem with the polyline function on a 64-bit platform.=0A= The wxDC_DrawLines function now properly indexes into the array=0A= with points.=0A= ] =3D=0A= =0A= [fix-polygon-behaviour-64=0A= ar...@cs...**20070202154517=0A= Fixed issue 'Strange polygon behaviour on 64-bit machines'=0A= reported by Chris Mears at 14 Dec 2006.=0A= =3D=0A= =0A= Problem: the arrays inspected by the wxDC_Polygon function=0A= are assumed to contain 32-bits ints. On 64-bit machines=0A= these are actually 64-bits ints.=0A= =3D=0A= =0A= Fix: (a bit of a hack...) the code now assumes that the=0A= arrays contain intptr_t values. This type represents ints=0A= of the same number of bits as the Haskell ints (on 32-bit=0A= and 64-bit machines). The code now dereferences each element=0A= in the array correctly, but still truncates the possibly=0A= 64-bit value to a 32-bit value. This is not a problem=0A= in practice.=0A= ] =3D=0A= =0A= [Announce new maintainers, darcs (homepage).=0A= Eric Kow <eri...@lo...>**20070120231403] =3D=0A= =0A= [Add miscellaneous other images (homepage).=0A= Eric Kow <eri...@lo...>**20070120224435] =3D=0A= =0A= [Add application screenshots (homepage).=0A= Eric Kow <eri...@lo...>**20070120224104] =3D=0A= =0A= [Add images used in quick start (homepage).=0A= Eric Kow <eri...@lo...>**20070120223650] =3D=0A= =0A= [Add images used for samples (homepage).=0A= Eric Kow <eri...@lo...>**20070120223301] =3D=0A= =0A= [Add images directory (and wxhaskell logo).=0A= Eric Kow <eri...@lo...>**20070120222724] =3D=0A= =0A= [Remove counter code from homepage.=0A= Eric Kow <eri...@lo...>**20070120221619=0A= =3D=0A= =0A= This counter has an pop-up ads, which is rather obnoxious.=0A= =3D=0A= =0A= ] =3D=0A= =0A= [Add wxhaskell homepage files (main html, css only).=0A= Eric Kow <eri...@lo...>**20070120221304=0A= =3D=0A= =0A= I took the liberty of running dos2unix on these.=0A= =3D=0A= =0A= ] =3D=0A= =0A= [Add some wxhaskell-specifile boring file regexps.=0A= Eric Kow <eri...@lo...>**20070120221235] =3D=0A= =0A= [Use a custom boring file. (Right now just the darcs default)=0A= Eric Kow <eri...@lo...>**20070120221223] =3D=0A= =0A= [Add an etc/ directory for misc use.=0A= Eric Kow <eri...@lo...>**20070120212146] =3D=0A= =0A= [Modify wx-install so it doesn't accidentally recompile things.=0A= Eric Kow <eri...@lo...>**20070120225914=0A= =3D=0A= =0A= ] =3D=0A= =0A= [Merge wxStyledTextCntrl (Scintilla edit control wrapper) support from = Hast=3D=0A= e project=0A= shelarcy <she...@ca...>**20070111090641] =3D=0A= =0A= [Added #ifndef compilation flag around <inttypes.h> to avoid building = probl=3D=0A= em under Visual C++ (VC). (VC doesn't have <inttypes.h>.)=0A= she...@ca...**20061207005946] =3D=0A= =0A= [Correct previous patch for db.cpp=0A= she...@ca...**20061207004327] =3D=0A= =0A= [Add an eyeball test for Unicode strings.=0A= Eric Kow <eri...@lo...>**20061129042230] =3D=0A= =0A= [Use intptr_t to avoid assumption that integers are 32 bit.=0A= Arie Middelkoop <ar...@cs...>**20061125125628=0A= =3D=0A= =0A= Compiling wxHaskell on a 64bits platform fails, because there=0A= are some assumptions in the code that assume that integers are=0A= 32bits. For example, there are a couple of assignments of a=0A= pointer to an int.=0A= =3D=0A= =0A= This patch fixes these problems. Sometimes, after assigning a=0A= pointer to an integer, the int was used as a boolean value. In=0A= those cases, instead of returning a pointer p, I changed the=0A= code to return p !=3D3D NULL. In two other cases, a pointer is stored=0A= inside the int and in these cases I changed the type of the=0A= int to intptr_t, of which it is guaranteed that a pointer can be=0A= assigned to it and recovered from it.=0A= =3D=0A= =0A= Requires <inttypes.h>.=0A= =3D=0A= =0A= ] =3D=0A= =0A= [Added the -fPIC compiler flag to CXX options in the makefile.=0A= Arie Middelkoop <ar...@cs...>**20061115121006=0A= =3D=0A= =0A= Apparantly, my platform (gentoo x86_64 linux) required that .o files = are "=3D=0A= relocatable" when there =3D=0A= =0A= are linked into a dynamic library.=0A= =3D=0A= =0A= (It might be an idea to use libtool to hide this kind of = platform-specific=3D=0A= details)=0A= =3D=0A= =0A= ] =3D=0A= =0A= [Tweak wx build target to depend on wxcore-clean.=0A= Eric Kow <eri...@lo...>**20061115002142=0A= =3D=0A= =0A= This avoids weird build errors with GHC 6.6 like=0A= wx/src/Graphics/UI/WX/Types.hs:94:0:=0A= Bad interface file: out/wx/imports/Graphics/UI/WXCore/Types.hi=0A= Something is amiss; requested module=0A= =3D=0A= =0A= ] =3D=0A= =0A= [Update Windows/VC++ build for 0.10.1 (from jer...@gm...).=0A= Eric Kow <eri...@lo...>**20061029082957=0A= =3D=0A= =0A= ] =3D=0A= =0A= [Separate make/make install for wxcore and wx.=0A= Eric Kow <eri...@lo...>**20061027201218=0A= =3D=0A= =0A= Now the user has to type=0A= make=0A= (sudo) make install=0A= make wx=0A= (sudo) make wx-install=0A= =3D=0A= =0A= This is a tweak of Shelarcy's patch for making wxhaskell compile on GHC = 6.=3D=0A= 6.=0A= The intention is to avoid the surprising behaviour of wxcore being = install=3D=0A= ed=0A= when the user types 'make'.=0A= =3D=0A= =0A= ] =3D=0A= =0A= [Add shelarcy patch for compile with GHC-6.6=0A= jer...@gm...**20061027102208] =3D=0A= =0A= [Add support for toolbar divider and other toolbar options (from = shelarcy@g=3D=0A= mail.com)=0A= jer...@gm...**20061023095411] =3D=0A= =0A= [Add support for toolbar divider (for she...@gm...)=0A= jer...@gm...**20061023094720] =3D=0A= =0A= [Add support for list item mask (from she...@gm...)=0A= jer...@gm...**20061023094528] =3D=0A= =0A= [Add support for Calendar events (from sha...@gm...)=0A= jer...@gm...**20061023094412] =3D=0A= =0A= [Add support for wxWidgets version >=3D3D 2.5 (Sound API, db API)=0A= jer...@gm...**20061023094049] =3D=0A= =0A= [Shelarcy patch: fix typos in wxHaskell samples/contrib=0A= jer...@gm...**20060830114937] =3D=0A= =0A= [(OS X) Skip intermediate step of compiling master.o.=0A= Eric Kow <eri...@lo...>**20060813212620=0A= =3D=0A= =0A= Removing this step (which compiles master.o, and combines it with other=0A= stuff to get the real library we want) avoids weird error messages like=0A= =3D=0A= =0A= ld: out/wxc/master.o undefined symbol 36218 (__ZdaPv) can't be a weak=0A= definition=0A= =3D=0A= =0A= It's quite possible that this breaks something else, though...=0A= =3D=0A= =0A= ] =3D=0A= =0A= [Update VC++ project file to reflect new wxWidgets version support = (unteste=3D=0A= d)=0A= jer...@gm...**20060817170205] =3D=0A= =0A= [Update VC++ project file to reflect updated DLL version supporting = wxWidge=3D=0A= ts 2.6.3=0A= jer...@gm...**20060817170011] =3D=0A= =0A= [Update revision numbers and wxversion guesses for Windows / VC++ = (jeremy.o=3D=0A= don...@gm...)=0A= jer...@gm...**20060817165704] =3D=0A= =0A= [Shelarcy patch (VC project for wxWindows 2.6.3)=0A= jer...@gm...**20060816134707] =3D=0A= =0A= [Shelarcy patch (WxcTypes.hs)=0A= jer...@gm...**20060816115419] =3D=0A= =0A= [Shelarcy patch (eljdialup.cpp)=0A= jer...@gm...**20060816114418] =3D=0A= =0A= [Shelarcy patch (db.cpp)=0A= jer...@gm...**20060816113728] =3D=0A= =0A= [(wxc, Unicode) Files for compiling unicode version under Visual Studio.=0A= shelarcy <she...@ca...>**20060813212315=0A= =3D=0A= =0A= This is Eric Kow recording on Shelarcy's behalf. This corresponds to = vers=3D=0A= ion=0A= 08 of my Unicode patch.=0A= =3D=0A= =0A= ] =3D=0A= =0A= [Add a small makefile for compiling the samples.=0A= Eric Kow <eri...@lo...>**20060813211705=0A= =3D=0A= =0A= (This comes from version 08 of my Unicode patch).=0A= =3D=0A= =0A= ] =3D=0A= =0A= [(wxcore, Unicode) Add/use ability to interact with C wchar_t.=0A= Eric Kow <eri...@lo...>**20060813211211=0A= =3D=0A= =0A= This corresponds to the wxcore part of my Unicode patch, version 08=0A= modulo trailing whitespace.=0A= =3D=0A= =0A= I believe this would require for wxWidgets and wxhaskell to be compiled = wi=3D=0A= th=0A= Unicode enabled.=0A= =3D=0A= =0A= ] =3D=0A= =0A= [(wxdirect, Unicode) Use the Haskell types for C wchar_t and friends.=0A= Eric Kow <eri...@lo...>**20060813210420=0A= =3D=0A= =0A= I believe this would require that wxWidgets be compiled with Unicode=0A= enabled.=0A= =3D=0A= =0A= ] =3D=0A= =0A= [(wxc, Unicode) Use wxChar instead of char.=0A= Eric Kow <eri...@lo...>**20060813205557=0A= =3D=0A= =0A= wxChar is a C preprocessor macro that selects for char under=0A= --disable-unicode, and for wchar_t under --enable-unicode.=0A= =3D=0A= =0A= This corresponds to version 08 of my Unicode patch, but only the parts=0A= which affect wxc.=0A= =3D=0A= =0A= ] =3D=0A= =0A= [[wxhaskell-from-cvs @ 2005-05-08 08:12:51 by dleijen]=0A= dleijen**20050508081251=0A= updated change log=0A= ] =3D=0A= =0A= [[wxhaskell-from-cvs @ 2005-05-08 07:24:23 by dleijen]=0A= dleijen**20050508072423=0A= Compile wx via -fvia-C to fix crash with ghci on windows=0A= ] =3D=0A= =0A= [TAG wxhakell-0-9-4=0A= Unknown tagger**20060712042545] =3D=0A= =0A= Patch bundle hash:=0A= 50df8fe807ca580ddfd0c12a48b25c7ed20796ad=0A= =0A= --=3D_--=0A= =0A= .=0A= =0A= |
|
From: Eric Y. K. <eri...@gm...> - 2007-08-12 15:54:18
|
Folks, Just wanted to give you a heads-up that I shall soon be passing into a much more liberal and reactive style of darcs repo maintainence. Before the idea was that I would systematically push in any patch that one of the other developers (Jeremy, shelarcy, etc) said was ok (or that I personally thought was the case). But the case is likely that we all have other responsabilities than wxhaskell. Thus patch review defaulted to me, who is not fully competent for the job. Since * My patch review probably isn't helping very much * I do not really have the time to do this seriously * It's just slowing down development more than anything else I propose a switch to a more liberal style of repository oversight: any patches submitted in good faith (i.e. that do not do anything obviously evil) will go in on the day I get them, without more than a cursory glance. If you have any objections -- you think patches should be reviewed more vigorously than that -- please volunteer for the job. Many thanks! --=20 Eric Kow http://www.loria.fr/~kow PGP Key ID: 08AC04F9 Merci de corriger mon fran=E7ais. |
|
From: Eric Y. K. <eri...@gm...> - 2007-08-12 15:46:16
|
I've had a very quick look and will be pushing this in. --=20 Eric Kow http://www.loria.fr/~kow PGP Key ID: 08AC04F9 Merci de corriger mon fran=E7ais. |
132 messages has been excluded from this view by a project administrator.
