From 31276cb5e77fcddaea54e0ba2f30da5e5d74747c Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Sun, 9 May 1999 10:54:11 +0000 Subject: [PATCH] Applied FreeBSD patch augmented beta version to 4 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2370 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/gtk/copy_src | 30 ++++++++++++++++++++---------- docs/gtk/install.txt | 3 ++- docs/gtk/readme.txt | 2 +- docs/symbols.txt | Bin 1682 -> 1414 bytes include/wx/version.h | 2 +- include/wx/wxchar.h | 20 ++++++++++++++------ wxGTK.spec | 4 ++-- 7 files changed, 40 insertions(+), 21 deletions(-) diff --git a/distrib/gtk/copy_src b/distrib/gtk/copy_src index b03bd0453e..486c8c1c2a 100755 --- a/distrib/gtk/copy_src +++ b/distrib/gtk/copy_src @@ -378,16 +378,16 @@ cp *.h ~/wxgtk_dist/wxGTK/samples/db cp *.xpm ~/wxgtk_dist/wxGTK/samples/db cd .. -#echo DDE sample.. -# -#cd dde -#mkdir ~/wxgtk_dist/wxGTK/samples/dde -#cp Makefile ~/wxgtk_dist/wxGTK/samples/dde -#cp Makefile.in ~/wxgtk_dist/wxGTK/samples/dde -#cp *.cpp ~/wxgtk_dist/wxGTK/samples/dde -#cp *.h ~/wxgtk_dist/wxGTK/samples/dde -#cp *.xpm ~/wxgtk_dist/wxGTK/samples/dde -#cd .. +echo DDE sample.. + +cd dde +mkdir ~/wxgtk_dist/wxGTK/samples/dde +cp Makefile ~/wxgtk_dist/wxGTK/samples/dde +cp Makefile.in ~/wxgtk_dist/wxGTK/samples/dde +cp *.cpp ~/wxgtk_dist/wxGTK/samples/dde +cp *.h ~/wxgtk_dist/wxGTK/samples/dde +cp *.xpm ~/wxgtk_dist/wxGTK/samples/dde +cd .. echo Dialogs sample.. @@ -635,6 +635,16 @@ cp *.cpp ~/wxgtk_dist/wxGTK/samples/sashtest cp *.h ~/wxgtk_dist/wxGTK/samples/sashtest cd .. +echo Scroll sample.. + +cd sashtest +mkdir ~/wxgtk_dist/wxGTK/samples/scroll +cp Makefile ~/wxgtk_dist/wxGTK/samples/scroll +cp Makefile.in ~/wxgtk_dist/wxGTK/samples/scroll +cp *.cpp ~/wxgtk_dist/wxGTK/samples/scroll +cp *.h ~/wxgtk_dist/wxGTK/samples/scroll +cd .. + echo Splitter sample.. cd splitter diff --git a/docs/gtk/install.txt b/docs/gtk/install.txt index f856cd7d34..433006db2e 100644 --- a/docs/gtk/install.txt +++ b/docs/gtk/install.txt @@ -210,7 +210,8 @@ are --without-wxresources Disables the use of *.wxr type resources. - --without-threads Disables threads. + --without-threads Disables threads. Will also + disable sockets. --without-sockets Disables sockets. diff --git a/docs/gtk/readme.txt b/docs/gtk/readme.txt index cdf339cce4..b63774e4b2 100644 --- a/docs/gtk/readme.txt +++ b/docs/gtk/readme.txt @@ -1,5 +1,5 @@ - Welcome to wxWindows/Gtk 2.1 snapshot 3, + Welcome to wxWindows/Gtk 2.1 snapshot 4, you have downloaded version 2.1 of the GTK+ 1.2 port of the wxWindows GUI library. This is a developers release diff --git a/docs/symbols.txt b/docs/symbols.txt index e23aa1d02348a179cb5678b9fbdbae4a1efae4f2..1b2865d1cf8cd49680309865a622ac07acf3b1e9 100644 GIT binary patch delta 717 zcmX|9OODe(5LHHmMI$5@pphVpl3)RvjAzKO%3?&vc06VrJMt&atXfUnnOO2CvK@u6 znH>kfC*THLfD3R1PQeW*w@rFsSJ!*5s=BJaKmGRP=d?FqEHrJ+2|dQ3IXpW+7-vzw zFG>Bi_wl79T#Y&y0O?mFpmUSdzk9FhzrEA?`H5PuPV@_ZBOuR`0~mo>LY!_Bk&3Jm z5v=n9M#?4dLI4I_8vZR~^|MEVhl8jTpqMlhdlZXu2q@#FfU@F61r^4O#5&Fd?Bi-9 z)e0ewC(4VIuQmvjV?r3anFmY8(C`-Sht|0B7Sgax`#)xw(i2#|Yc});#wMO7eTy0P zpwS2R@v$IF^LAP5cRGe+QP*s3YRzw`)KM9bF^&3^8M>{z)RKVXP33>;>Ux`usCl}L z6H$~8V{(2x%`*%;kR5JIFtXh_P6Hdh>J&)PJ{j}*u|#=mg~rhdCQ9ud6NS9a4^yT}iP1(SK3@ z>Yvts`hz!Q|E1d>Nb{%}&hdSnK}dc5cy=2uHGL8oa_gGUuH^S(46oxgw7}cTF%&{B d!w}w&A&s**zd%+ zTmwr&V1D|_@4#~4YWSn042cf>E}qqk9ke)>^FeIojohU@uI;PNdm^^uJ~STKD))WN z|0~a=NE0|YRy^KDO!4EY7(n2a$2?I?p};BGfin|Wvp@}W@f098X&!~(bES9&m|BpE zWva@mt_v(PsW=ODEn;xeBr1kL^uMi{9r&Hg+~)Fo%z}+bI96moK0B8_qdHUiv~V%E z{}r>JmscpZmydnOK84b$X&r_?F%Pi9ojOZhiUgbTWAyv)?w=`ro?&Lm=W!lj%rVYo zTj=sDZ&jy~^0HfWpTQf`#glP>3r1=GKEk0CN*@i!pp&sRUK&&FQPXB$>Z6~RU@S~h z4m9i)Yz*?nYX3Oh&e0A;4bpfkA{;b}1%c7o8J05kZvnbQ{xpk%q*Ma&Y# zgYr^`0n=sLt}$(9(X&=)dA4hf8V-P+ComdyT(8yA)A;_rGpPn>M7xn5r(v&g%8B0l zH1f@^tK)I};7-~pmP_`+Z{eF*hg|n>$3OY?8$#~qFQDHT0FNXGq-8wfO!8AwZ~p)r CjBkJd diff --git a/include/wx/version.h b/include/wx/version.h index 7478110eb5..6cb9ff1ef0 100644 --- a/include/wx/version.h +++ b/include/wx/version.h @@ -18,7 +18,7 @@ #define wxRELEASE_NUMBER 0 #define wxVERSION_STRING "wxWindows 2.1.0" #define wxVERSION_NUMBER (wxMAJOR_VERSION * 1000) + (wxMINOR_VERSION * 100) + wxRELEASE_NUMBER -#define wxBETA_NUMBER 3 +#define wxBETA_NUMBER 4 #define wxVERSION_FLOAT wxMAJOR_VERSION + (wxMINOR_VERSION/10.0) + (wxRELEASE_NUMBER/100.0) + (wxBETA_NUMBER/10000.0) #endif diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h index c7a3dbdc6f..48aeb4dc2f 100644 --- a/include/wx/wxchar.h +++ b/include/wx/wxchar.h @@ -186,7 +186,7 @@ typedef _TUCHAR wxUChar; #if defined(__VISUALC__) && (__VISUALC__ < 900) #define wxUSE_WCHAR_T 0 // wchar_t is not available for MSVC++ 1.5 #elif defined(__UNIX__) - #if defined(HAVE_WCSTR_H) || defined(HAVE_WCHAR_H) + #if defined(HAVE_WCSTR_H) || defined(HAVE_WCHAR_H) || defined(__FreeBSD__) #define wxUSE_WCHAR_T 1 #else #define wxUSE_WCHAR_T 0 @@ -200,11 +200,16 @@ typedef _TUCHAR wxUChar; #endif//wxUSE_UNICODE #if wxUSE_WCHAR_T -#ifdef HAVE_WCSTR_H -#include -#else -#include -#endif + #ifdef HAVE_WCSTR_H + #include + #else + #ifndef __FreeBSD__ + #include + #else + #include + #define wxNEED_WCSLEN + #endif + #endif #endif // check whether we are doing Unicode @@ -288,6 +293,9 @@ typedef unsigned char wxUChar; #define wxUChar unsigned char #endif +#ifdef __FreeBSD__ + #undef _T +#endif #define _T(x) x // ctype.h functions diff --git a/wxGTK.spec b/wxGTK.spec index 1acd949613..cdf096bff9 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -1,7 +1,7 @@ # Note that this is NOT a relocatable package %define pref /usr %define ver 2.1.0 -%define rel 3 +%define rel 4 Summary: The GTK+ 1.2 port of the wxWindows library Name: wxGTK @@ -9,7 +9,7 @@ Version: %{ver} Release: %{rel} Copyright: wxWindows Licence Group: X11/Libraries -Source: ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/wxGTK-2.1.0-b3.tgz +Source: ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/wxGTK-2.1.0-b4.tgz URL: http://wesley.informatik.uni-freiburg.de/~wxxt/docs.html Packager: Robert Roebling Requires: gtk+ >= 1.2.1 -- 2.45.2