Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Apr 13, 2012
  1. Bump version to 0.90 for wxWidgets 2.9 support.

    authored
    Ignore-this: 7e343352397703f721b2cddf41ddd1da
    
    To allow for reasonably long co-existance of wxHaskell branches supporting
    wxWidgets 2.8.x and wxWidgets 2.9.x, I have bumped the version for wxWidgets 2.9
    quite considerably.
    
    This will allow natural evolution of the wxWidgets 2.8 supporting codeline
    without excessively constraining version number bumps.
    
    It is assumed that the wxWidgets 2.8 supporting versions have been branched
    into new directories (some loss of history, unfortunately, but it's the
    price for not creating a new repository).
    
    darcs-hash:20120413103524-75908-8baf3c107facdf367c7264e83ea3e6d6035bbac4.gz
  2. Branch wxHaskell supporting wxWidgets 2.8 only.

    authored
    Ignore-this: 68e184ae86a315c3c4338b20850a778
    
    darcs-hash:20120413102422-75908-c8c7af8ba2d72958ddaccce7abba35aea5aad2b3.gz
Commits on Apr 3, 2012
  1. Last missed patches.

    authored
    Ignore-this: 14a684c8eda33fe3f77bd2af2bba6f72
    
    Bump version dependencies on wxcore.
    Fix a some undefined event cases in eljevent.cpp.
    
    darcs-hash:20120403192212-75908-eba30ce450fca807feba7fa038f96205525aa3d3.gz
Commits on Mar 25, 2012
  1. Update samples for wxWudgets 2.9

    authored
    Ignore-this: 20444b06d03a9fb28374e6a9789ce02c
    
    Update the OpenGL samples so that they work!
    Add Dave Tapley's PropertyGrid sample
    
    darcs-hash:20120325115218-75908-35f02d48a3ff8b389fa7d1cf5efdecc81391f967.gz
  2. Add PropertyGrid support to wx.

    authored
    Ignore-this: 3e3d67521604f3d789ba4217ede16879
    
    darcs-hash:20120325114758-75908-4192a6fbf5c370c3458fbb3b76bab23c94ea395f.gz
  3. Missed PropertyGrid support reinstated.

    authored
    Ignore-this: ead0b358bb7638a3cce5facacb791af8
    
    darcs-hash:20120325114435-75908-a04fdfb33461236c10fb42bbbe2a2d79d05db3c6.gz
  4. OpenGL Support.

    authored
    Ignore-this: 7db5626d1959563a1dba5911fe895ed2
    
    This includes the following patches from Dave Tapley's branch:
    
    Wed Dec 14 17:09:34 GMT 2011  dukedave@gmail.com
      * Merge in patch to return OpenGL support
      This resolves conflicts primarily between the patches:
    
      "Reinstate OpenGL support for wxWidgets 2.9."
      "Use wx-config to generate all used libraries"
    
      and
    
      "Move compilation of C++ code to new wxc project and use a shared library for it"
      "Missed modified files in previous patch"
    
    Wed Nov 16 09:42:39 GMT 2011  jeremy.odonoghue@gmail.com
      * Reinstate OpenGL support for wxWidgets 2.9.
    
      OpenGL support compiles and links (at least for wxWidgets 2.9 on Ubuntu
      against Dave Tapley's repo), but sample code doesn't work yet - investigating
      whether this is due to wx API changes or a problem in wxcore OpenGL support.
    
    darcs-hash:20120325114246-75908-e1fb5bcb9e5df55431cc5c789f166c62ae9d24cc.gz
  5. PropertyGrid support.

    authored
    Ignore-this: fba1166bac06e76782638a974d64147e
    
    Merge PropertyGrid support from Dave Tapley's branch. This contains items
    from the following patches:
    
    Sat Nov 12 20:46:48 GMT 2011  dukedave@gmail.com
      * Wrap wxPGProperty_SetHelpString
    
    Fri Nov 11 18:23:11 GMT 2011  dukedave@gmail.com
      * Wrapped wxPropertyGrid DisableProperty and added usage to sample
    
    Tue Oct  4 00:33:05 BST 2011  dukedave@gmail.com
      * Make PropertyGrid sample more user friendly
    
    Mon Oct  3 23:38:07 BST 2011  dukedave@gmail.com
      * Make the PropertyGrid example a little bigger
    
    Mon Oct  3 23:37:44 BST 2011  dukedave@gmail.com
      * Wrapped wxPropertyCategory
    
    Mon Oct  3 22:47:48 BST 2011  dukedave@gmail.com
      * Clean up the wxPropertyGrid sample
    
    Sat Oct  1 22:25:15 BST 2011  dukedave@gmail.com
      * Print out the parse error when one is encountered running wxdirect
    
    Sat Oct  1 22:24:32 BST 2011  dukedave@gmail.com
      * Wrap extra PGProperty subclasses
    
    Fri Sep 30 02:49:11 BST 2011  dukedave@gmail.com
      * Set label, name and value when creating PGProperty subclasses
      Ideally I'd keep the default PGProperty constructors and wrap the Set.. functions,
      however I tried this and SetValue doesn't play nicely (throwing a run-time assertion
      about the value being a user defined one, which is confusing).
    
    Thu Sep 29 23:40:35 BST 2011  dukedave@gmail.com
      * Updated PropertyGrid sample
    
    Thu Sep 29 22:45:28 BST 2011  dukedave@gmail.com
      * Wrapped extra code for wxPropertyGrid, some refactoring
    
    Thu Sep 22 22:22:30 BST 2011  dukedave@gmail.com
      * Fix for Prelude.chr error using wxString in wx-2.9
      This is a fix for the problem reported here:
      http://sourceforge.net/mailarchive/message.php?msg_id=28116578
    
    Thu Sep 22 22:21:57 BST 2011  dukedave@gmail.com
      * Clearer logging for the PropertyGrid sample code
    
    Thu Sep 22 22:20:46 BST 2011  dukedave@gmail.com
      * Added wxEVT_PG_CHANGED and test code
    
    Thu Sep 22 22:13:11 BST 2011  dukedave@gmail.com
      * Fix segfault with wxPGProperty caused returning local wxString
      The initial implementation of wxPGProperty was causing a segfault,
      after comparing my approach to that used by existing methods I noticed
      that they all return wxString* (i.e. a pointer and not a copy) and use
      pattern [1], after modifying wxPGProperty to do the same the segfault
      went away.
    
      [1]
          wxString *result = new wxString();
          *result = self->FuncWhichReturnswxString();
          return result;
    Tue Aug 30 23:42:08 BST 2011  dukedave@gmail.com
      * Added wxStringProperty and wxPropertyGrid_Append
      I'm also updated the PropertyGrid.hs sample, to create a couple of wxStringProperty's and
      wxPropertyGrid_Append them; and updated the highlighted call back to print the label name
      when an item is hovered over, unfortunately this causes a segfault presently.
    
    Fri Aug 26 06:25:25 BST 2011  dukedave@gmail.com
      * Added wxPropertyGridEvent_HasProperty, made PropertyGridHighlighted have a Maybe PGProperty
    
    Fri Aug 26 01:01:27 BST 2011  dukedave@gmail.com
      * Wrapping wxPropertyGrid
    
    darcs-hash:20120325113657-75908-a48d980c5b338054e3855404c2b960ee8cce7d53.gz
  6. Misc patches removing wxWidgets < 2.9 support

    authored
    Ignore-this: e5dff79eb4725668e456b6e40cd1b79
    
    Minor tidy up of source code to remove support for wxWidgets 2.8 (mainly
    #ifdefs, but some type safety changes brought in with wxWidgets 2.9)
    
    darcs-hash:20120325113337-75908-31aa55322f6b9267d29151b29a04b924fcb3881e.gz
Commits on Mar 19, 2012
  1. Add the now manually maintained WxcDefs.hs.

    authored
    Ignore-this: 1f7219d1b5d810c1f861f586d41fd75
    
    This patch brings in changes from the following changes in Dave Tapley's
    wxWidgets 2.9 fork of the mainline:
    
    * wxcore: No more Eiffel
    
      Just use the autogenerated (and now manually maintained) Haskell
      module instead.
      (eric.kow@gmail.com Tue Nov 3 2011)
    
    darcs-hash:20120319192645-75908-80148547b53b7b3b5b76f09bf7b9b84061e954b5.gz
  2. Add PropertyGrid support to Events.hs

    authored
    Ignore-this: 447bc057c961fe93de13c715f3fbfe4f
    
    This incorporates changes from the following patches in Dave Tapley's
    repo:
    
    * Fix segfault with wxPGProperty caused returning local wxString
      The initial implementation of wxPGProperty was causing a segfault,
      after comparing my approach with that used by the existing methods
      I noticed that they all return wxString* (i.e. a pointer and not a
      copy) and use pattern [1], after modifying wxPGProperty to do the
      same the segfault went away.
    
      [1]
          wxString* result = new wxString();
          *result = self->FuncWhichReturnswxString()
          return result;
      (dukedave@gmail.com Fri Sep 23 2011)
    * Added wxStringProperty and wxPropertyGrid_Append
      I've also updated the PropertyGrid.hs sample, to create a couple of
      wxStringProperty's and wxPropertyGrid_Append them; and updated the
      highlighted call back to print the label name when an item is hovered
      over, unfortunately this causes a segfault presently.
      (dukedave@gmail.com Wed Aug 31 2011)
    * Added wxPropertyGridEvent_HasProperty, made PropertyGridHighlighted have
      a Maybe PGProperty
      (dukedave@gmail.com Fri Aug 26 2011)
    * Wrapping wxPropertyGrid
      (dukedave@gmail.com Fri Aug 26 2011)
    
    darcs-hash:20120319191305-75908-9cccfc338e4f15c7778af7a45a5a8fc226ac34b5.gz
Commits on Mar 18, 2012
  1. Enable wxc library to be fund on OS X Lion.

    authored
    Ignore-this: 3ac42cdee1742611b90c275896c40ed6
    
    Merge patches from Eric Kow's OS X Lion support branch. Here we add absolute path
    to the wxc dylib install directory.
    
    darcs-hash:20120318154418-75908-e142d58ac6852d51e3d00a75ea8649be823835b5.gz
  2. Update wxcore build for separated wxc

    authored
    Ignore-this: f6a30cd378270717ad11aeda1c3973ce
    
    This patch brings in the changes needed to build wxcore with a separated wxc. It has
    been virtually impossible to separate out the individual patches from Dave Tapley's
    branch which make up this change, but as well as bumping the version to 0.15, at
    least the following are implicated:
    
    * Set wxcore Setup.hs to use System.FilePath instead of System.FilePath.Posix
      (jeremy.odonoghue@gmail.com Tue Jan 31 2012)
    * Make wxcore link with an rpath to wxc. This fixes the problem I described
      here http://comments.gmane.org/gmane.comp.lang.haskell.libraries/16807 and
      listed as "the only major remaining problem" here:
      http://www.mail-archive.com/wxhaskell-devel@lists.sourceforge.net/msg00722.html.
      (dukedave@gmail.com Tue Jan 3 2012))
    * Missed modified files in the previous patch. This is the second part of the patch
      "Move compilation of C++ code to new wxc project and use a shared library for it"
      Unfortunately I missed these important files modifications and darcs was waiting
      forever when I tried to unrecord or amend that patch.
      For further information please see email [wxhaskell-devel] Using a shared library
      for the C++ in wxhaskell. http://sourceforge.net/mailarchive/message,php?msg_id=28515489.
      (dukedave@gmail.com Wed Dec 14 2011)
    * Move compilation of C++ code to new wxc project and use a shared library for it.
      (dukedave@gmail.com Wed Dec 14 2011)
    * wxcore: no more Eiffel
      Just use the autogenerated (and now manually maintained) Haskell module instead
      wxEiffel seems to be a dead project at the time of this patch, so we're not
      exactly getting a cross-project refactor out of this. Haveing the Eiffel around
      just creates the impression of complexity for little gain.
      (eric.kow@gmail.com Thu Nov 3 2011)
    
    darcs-hash:20120318112715-75908-6f768323635d985dde10f88a428dace5b2aed2ea.gz
Commits on Mar 14, 2012
  1. No more Eiffel.

    authored
    Ignore-this: 99fa69b041a7dfe4601b3d545bb91d47
    
    Based on Eric Kow patch 3rd Nov 2011.
    
    "Just use the autogenerated (and now manually maintained) Haskell module
    instead."
    
    "wxEiffel seems to be a dead project at the time of this patch, so we're not
    exactly getting a cross-project reafctor out of this. Having the Eiffel around
    just creates the impression of complexity for little gain."
    
    Eric changed the cabal file in a later patch. I have done so here for completeness.
    
    darcs-hash:20120314231028-75908-d04ee10735ae0a8cb79cddff3e149dd43f5ca7a1.gz
  2. Fixed wxc build.

    authored
    Ignore-this: 305cffb93b886526562b24ed85af3cfb
    
    Removed problematic WebKit events (based on Eric Kow, Nov 3rd 2011)
    Fixed merge error in Setup.hs using the '-undefined' linker flag on OS X.
    
    darcs-hash:20120314230034-75908-f67f5c3fe61e328860df4a98ad4ca89171fb2ca5.gz
Commits on Mar 11, 2012
  1. Update wxdirect with removal of Eiffel.

    authored
    Ignore-this: 2310a3a161de4ca9860eed8b9dff5695
    
    Continue to take patches from Dave Tapely's darcsden branch and merge them
    to mainline.
    
    This includes at least the following changes from Dave's repo:
    
    Thu Nov  3 03:33:11 GMT 2011  Eric Kow <eric.kow@gmail.com>
      * wxdirect: Bump to 0.14
    
    Thu Nov  3 03:32:58 GMT 2011  Eric Kow <eric.kow@gmail.com>
      * wxdirect: Modernise exception handling.
    
    Thu Nov  3 03:30:31 GMT 2011  Eric Kow <eric.kow@gmail.com>
      * wxdirect: Strip away ability to deal with Eiffel files.
    
    Thu Oct  6 20:18:16 BST 2011  dukedave@gmail.com
      * Replace debugging version of writeFileLazy with release one
    
    Thu Oct  6 19:53:42 BST 2011  dukedave@gmail.com
      * Use writeFileLazy in wxdirect to reduce wxcore compile times
      Rather than having wxdirect write out newly generated .hs files every
      time it is run, we now only write the files if they have changed.
      By doing this we don't touch the files modified time unless we have to,
      and because the modified times haven't changed GHC won't rebuild them.
    
    Thu Oct  6 19:45:37 BST 2011  dukedave@gmail.com
      * Don't print version information in to .hs files produced by wxdirect
      As part of the changes to decrease the build time of wxHaskell, I'm going to
      modify all the writeFile calls in wxdirect such that they first check if
      their output is different from the current source file *before* they touch it.
      However if a version is written in to the file then the source will always
      be different; instead of writing an exception to this I motion that there is no
      need to be writing the version into the source anyway, I could find no reference
      to the version strings nor use of them.
    
    Wed Oct  5 19:14:15 BST 2011  dukedave@gmail.com
      * Don't print a "generated on" time in to .hs files produced by wxdirect
      As part of the changes to decrease the build time of wxHaskell, I'm going to
      modify all the writeFile calls in wxdirect such that they first check if
      their output is different from the current source file *before* they touch it.
      However if a date/time is written in to the file then the source will always
      be different; instead of writing an exception to this I motion that there is no
      need to be writing the date/time into the source anyway, that's what the file's
      meta-data is for.
    
    darcs-hash:20120311125104-75908-502d3089a405e502673e2da4871af4c05adadbbd.gz
  2. Branch wxc library out of wxcore.

    authored
    Ignore-this: cf47c90ff869758823e19fcfd3f1aa20
    
    Start of merging changes from Dave Tapley's repo for wxWidgets 2.9 support.
    Because the branches are so far out of sync, changes are mainly being merged manually.
    The following commit comments from Dave are included here:
    
    Mon Dec 19 21:56:17 GMT 2011  dukedave@gmail.com
      * Added missing stc_gen.cpp file to extra-source-files
      he file stc_gen.cpp is unique at the moment in that it is the only .cpp file which
      is included in another .cpp file, thus it isn't included in x-dll-sources (because it
      isn't a separate compilation unit), but it still needs to be put in an sdist tarball.
    
    on Dec 19 20:47:15 GMT 2011  dukedave@gmail.com
      * Added cpp files used in wxc to extra-source-files
      Installing from and sdist tarball would fail without this addition
      because the cpp files wouldn't be present in it.
      The duplicated list in wxc.cabal (for extra-source-files and x-dll-sources) is
      a bit unpleasant, but I feel it is important to make the distinction.
    
    Wed Dec 14 17:06:18 GMT 2011  dukedave@gmail.com
      * Update path given to wxdirect to reflect changes made in other patch
      The wxc C++ files were moved to another project in the patch:
      "Move compilation of C++ code to new wxc project and use a shared library for it"
    
    Wed Dec 14 07:11:35 GMT 2011  dukedave@gmail.com
      * Missed modified files in previous patch
      This is the secord part of the patch "Move compilation of C++ code to new wxc project and use a shared library for it"
      Unfortunately I missed these important files modifications, and darcs was waiting forever when I tried to unrecord or
      amend that patch.
      For further information please see email:
      [wxhaskell-devel] Using a shared library for the C++ in wxhaskell
      http://sourceforge.net/mailarchive/message.php?msg_id=28515489
    
    Wed Dec 14 06:54:17 GMT 2011  dukedave@gmail.com
      * Move compilation of C++ code to new wxc project and use a shared library for it
      This substantial architectural
    
    Wed Nov 16 09:42:39 GMT 2011  jeremy.odonoghue@gmail.com
      * Reinstate OpenGL support for wxWidgets 2.9.
    
      OpenGL support compiles and links (at least for wxWidgets 2.9 on Ubuntu
      against Dave Tapley's repo), but sample code doesn't work yet - investigating
      whether this is due to wx API changes or a problem in wxcore OpenGL support.
    
    darcs-hash:20120311122652-75908-8488b6ea785f73a27fba46c87f99e3ca366a588e.gz
Commits on Feb 4, 2012
  1. @shelarcy

    Comment out unused ver variable in wxcore/Setup.hs

    shelarcy authored
    Ignore-this: 76f5fe5d879a9d9dcaff109367ba9195
    wxcore/Setup.hs' ver variable isn't used. And this variable causes build error
    by my wx-config-win.
      http://sourceforge.net/mailarchive/message.php?msg_id=28649050
    So, I comment out this variable to fix my build problem.
    
    darcs-hash:20120204033507-c1071-cee0d442bcd17b0a5e1f0cae3dd7e0c34f4ad487.gz
  2. @shelarcy

    Bump patch versions for wx

    shelarcy authored
    Ignore-this: 28abe95dbafccc8c3584c4951b3d9998
    
    darcs-hash:20120204033406-c1071-82d3acccda5894f5fc0c5f6436d64bb126ec88f7.gz
  3. @shelarcy

    Bump patch versions for wxdirect

    shelarcy authored
    Ignore-this: 90dee7915b624b48a00feca736247f9a
    wxdirect 0.13.1.1 is already uploaded.
      http://hackage.haskell.org/package/wxdirect-0.13.1.1
    So, I bumped wxdirect version again.
    
    darcs-hash:20120204032955-c1071-408f9066d2a24c669e5ae4ee5a046b504c1b79c9.gz
  4. @shelarcy

    Add FlexibleInstances to fix builing with GHC 7.4.1

    shelarcy authored
    Ignore-this: d8f0c051e8187b82d73c077ecbe51193
    
    darcs-hash:20120204031822-c1071-40be15e3f6501d4cf3edbc1f90335802470c1574.gz
  5. @shelarcy

    Fix building wxcore and wxdirect with GHC 7.4.1

    shelarcy authored
    Ignore-this: 55cfd34d39f6aa7670f5eaac9c78315
    
    darcs-hash:20120204031337-c1071-7880f214e627beeab95e8f78eefc1760492e603e.gz
Commits on Jan 8, 2012
  1. Bump patch versions for wxcore and wxdirect after Shelarcy patches.

    authored
    Ignore-this: 8e2e35469bb9c888fe00dcd8f5d3c219
    
    Shelarcy (shelarcy@gmail.com) found a couple of small issues with our
    sdist configuration. These deserve bumpting the version numbers of
    wxdirect and wxcore.
    
    darcs-hash:20120108232652-75908-5cf2a6b07182b119372a67a2229cdd94d1ffe6fd.gz
  2. sdist bugfixes from Shalarcy (shelarcy@gmail.com)

    authored
    Ignore-this: cbcdd315813898a02d393e74d22a36c4
    
    darcs-hash:20120108232332-75908-b197835050837b47945098520846f90574b49ca2.gz
Commits on Jan 5, 2012
  1. Bugfixes for wxPack 2.8.12 on Windows 7 64 bit

    authored
    Ignore-this: 8e9fa4345c940c4e7552fee655117ea2
    
    darcs-hash:20120105165229-75908-fc56b3fd6d5947404049d53cfc5fa6e95367f522.gz
  2. OpenGL working on Ubuntu Dapper.

    authored
    Ignore-this: 1d2418de49a1bae8827315c11ed50dc3
    
    darcs-hash:20120105143000-75908-1b5085a663b3427278baa129f1e6ad0273346531.gz
  3. Changes to enable build under Linux (Ubuntu)

    authored
    Ignore-this: e3b584866beaef3905ad2a7cb3f2fce2
    
    darcs-hash:20120105142531-75908-75418232f91eb8fa24ccfdcdb8878cf7d416d702.gz
Commits on Jan 1, 2012
  1. Working for wxWidgets 2.8.12 on Windows 7.

    authored
    Ignore-this: 1ec0b058132651f3a7f9d4321ef38e59
    
    darcs-hash:20120101234845-75908-3ad6e2c8d1bde4da79d9abb2c913684e0adb7fe3.gz
Commits on Aug 13, 2011
  1. @mmakowski

    fix for colorDialog return value (3019730)

    mmakowski authored
    Ignore-this: ae6fc51d12e1a5761b1d3e9006b4f57b
    Two issues have been addressed:
    1. colorIsOk function in WxcTypes.hs was assuming that invalid colour will have rgba < 0, but rgba is a Word, i.e. non-negative;
    2. wxColour_IsOk function in eljcolour.cpp was returning a bool, but the foreign import in WxcTypes was expecting a CInt. This might work on platforms where sizeof(bool) == sizeof(int), but doesn't work e.g. on Windows under gcc, where sizeof(bool) == 1.
    
    darcs-hash:20110813143552-0ec8f-2e43591d4ac804187c05776f08282584c9a01fc5.gz
Commits on Jun 1, 2011
  1. Bugfix for assert error in SearchDynamicEventTable, reported by Eric …

    jeremy.odonoghue authored
    …on 12/3/2011.
    
    Ignore-this: ed42aec872b7ec3fb313ea1829f9241f
    
    darcs-hash:20110601151027-db604-1f1ccc815cdf236942e90fe07d9ee6de58ebcc81.gz
  2. Patches to reinstate wx2.8 operation.

    jeremy.odonoghue authored
    Ignore-this: f0c8fed1766317c59a510b58ca24f843
    
    darcs-hash:20110601083855-db604-fdac4210a5f55289cc2c655d910316d768a0660a.gz
Commits on May 27, 2011
  1. Fix warnings: replaced (deprecated) pragma OPTIONS -fglasgow-exts wit…

    jeremy.odonoghue authored
    …h appropriate LANGUAGE pragmas.
    
    Ignore-this: b973ecb74aa9cda89b5584ad7db0a758
    
    darcs-hash:20110527121713-db604-7280404baa2f46a888e9d6147357c020cda067ae.gz
  2. Bump wxcore and wx versions.

    jeremy.odonoghue authored
    Ignore-this: d47ec669c5ab992bd6e824af97e99c94
    
    darcs-hash:20110527121446-db604-cf777df8454e8a28969599e17dac662d9921d720.gz
  3. Additional libraries required by wxWidgets 2.9

    jeremy.odonoghue authored
    Ignore-this: bf173efad99a8d824b7d06955ae21511
    
    darcs-hash:20110527121335-db604-47f0ada1e1a6e75ae9e32659d4e6b19364494d2f.gz
  4. Update cabal license type to reflect that wxHaskell is licensed under…

    jeremy.odonoghue authored
    … the wxWidgets license, which has important differences from LGPL.
    
    Ignore-this: adbd3b7d180c917a9ac8a9732209b9cd
    
    darcs-hash:20110527121224-db604-281d7d9f73cc5956086da3782a204572d0fe37e3.gz
Something went wrong with that request. Please try again.