Merge pull request #113 from schloegl/master

upgrade to wxwidgets 2.9.4 and fix built for x86_64 target

index.html

@@ -2113,7 +2113,7 @@ USE_OSGPLUGIN(<plugin2>)
     </tr>
     <tr>
         <td id="wxwidgets-package">wxwidgets</td>
-        <td id="wxwidgets-version">2.8.12</td>
+        <td id="wxwidgets-version">2.9.4</td>
         <td id="wxwidgets-website"><a href="http://www.wxwidgets.org/">wxWidgets</a></td>
     </tr>
     <tr>

src/wxwidgets-1-fixes.patch

@@ -0,0 +1,11 @@
+--- ./src/msw/textctrl.cpp	2013-01-02 21:47:03.000000000 +0100
++++ ./src/msw/textctrl.cpp	2013-01-02 21:46:53.000000000 +0100
+@@ -992,7 +992,7 @@
+ 
+     EDITSTREAM eds;
+     wxZeroMemory(eds);
+-    eds.dwCookie = (DWORD)&data;
++    eds.dwCookie = (DWORD_PTR)&data;
+     eds.pfnCallback = wxRichEditStreamOut;
+ 
+     ::SendMessage

src/wxwidgets.mk

@@ -3,9 +3,9 @@
 
 PKG             := wxwidgets
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 39552f3e49341197fea8373824ec609c757e890b
-$(PKG)_SUBDIR   := wxMSW-$($(PKG)_VERSION)
-$(PKG)_FILE     := wxMSW-$($(PKG)_VERSION).tar.bz2
+$(PKG)_CHECKSUM := 5a34ddf19d37c741f74652ee847df9568a8b81e1
+$(PKG)_SUBDIR   := wxWidgets-$($(PKG)_VERSION)
+$(PKG)_FILE     := wxWidgets-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/wxwindows/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc libiconv libpng jpeg tiff sdl zlib expat