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

diff --git a/distrib/gtk/copy_src b/distrib/gtk/copy_src
index b03bd0453e75788bddb7a1004caf7354619f632d..486c8c1c2af7691cb6e316834e56e00962ebadae 100755 (executable)
--- 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 f856cd7d34d8e5cbe9786d39eff801868b0a0d10..433006db2e674e6ed5239cc9f560d6984fc81c61 100644 (file)
--- 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 cdf339cce4dda6c5c5b54057ecb5736077a510b8..b63774e4b253ca355283e874441b311e5c3c47c9 100644 (file)
--- 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 (file)
Binary files a/docs/symbols.txt and b/docs/symbols.txt differ

diff --git a/include/wx/version.h b/include/wx/version.h
index 7478110eb58fe0cd1f7aaa0131a599e42d6c4926..6cb9ff1ef0f376a15c457dc3ccd5538f218400fe 100644 (file)
--- 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 c7a3dbdc6f2de65b564a5f5976196482854b70c1..48aeb4dc2f9a5ccc6a83f17274af055703dd81b7 100644 (file)
--- 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 <wcstr.h>
-#else
-#include <wchar.h>
-#endif
+ #ifdef HAVE_WCSTR_H
+  #include <wcstr.h>
+ #else
+  #ifndef __FreeBSD__
+   #include <wchar.h>
+  #else
+   #include <stdlib.h>
+   #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 1acd949613a38be4a2932241474a2a61cafc4b4e..cdf096bff91490c2bc83a1000805fde05f2fe5a6 100644 (file)
--- 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 <roebling@ruf.uni-freiburg.de>
 Requires: gtk+ >= 1.2.1