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
This commit is contained in:
Robert Roebling
1999-05-09 10:54:11 +00:00
parent 631cefffd4
commit 31276cb5e7
7 changed files with 40 additions and 21 deletions

View File

@@ -378,16 +378,16 @@ cp *.h ~/wxgtk_dist/wxGTK/samples/db
cp *.xpm ~/wxgtk_dist/wxGTK/samples/db cp *.xpm ~/wxgtk_dist/wxGTK/samples/db
cd .. cd ..
#echo DDE sample.. echo DDE sample..
#
#cd dde cd dde
#mkdir ~/wxgtk_dist/wxGTK/samples/dde mkdir ~/wxgtk_dist/wxGTK/samples/dde
#cp Makefile ~/wxgtk_dist/wxGTK/samples/dde cp Makefile ~/wxgtk_dist/wxGTK/samples/dde
#cp Makefile.in ~/wxgtk_dist/wxGTK/samples/dde cp Makefile.in ~/wxgtk_dist/wxGTK/samples/dde
#cp *.cpp ~/wxgtk_dist/wxGTK/samples/dde cp *.cpp ~/wxgtk_dist/wxGTK/samples/dde
#cp *.h ~/wxgtk_dist/wxGTK/samples/dde cp *.h ~/wxgtk_dist/wxGTK/samples/dde
#cp *.xpm ~/wxgtk_dist/wxGTK/samples/dde cp *.xpm ~/wxgtk_dist/wxGTK/samples/dde
#cd .. cd ..
echo Dialogs sample.. echo Dialogs sample..
@@ -635,6 +635,16 @@ cp *.cpp ~/wxgtk_dist/wxGTK/samples/sashtest
cp *.h ~/wxgtk_dist/wxGTK/samples/sashtest cp *.h ~/wxgtk_dist/wxGTK/samples/sashtest
cd .. 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.. echo Splitter sample..
cd splitter cd splitter

View File

@@ -210,7 +210,8 @@ are
--without-wxresources Disables the use of *.wxr type --without-wxresources Disables the use of *.wxr type
resources. resources.
--without-threads Disables threads. --without-threads Disables threads. Will also
disable sockets.
--without-sockets Disables sockets. --without-sockets Disables sockets.

View File

@@ -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 you have downloaded version 2.1 of the GTK+ 1.2 port of
the wxWindows GUI library. This is a developers release the wxWindows GUI library. This is a developers release

Binary file not shown.

View File

@@ -18,7 +18,7 @@
#define wxRELEASE_NUMBER 0 #define wxRELEASE_NUMBER 0
#define wxVERSION_STRING "wxWindows 2.1.0" #define wxVERSION_STRING "wxWindows 2.1.0"
#define wxVERSION_NUMBER (wxMAJOR_VERSION * 1000) + (wxMINOR_VERSION * 100) + wxRELEASE_NUMBER #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) #define wxVERSION_FLOAT wxMAJOR_VERSION + (wxMINOR_VERSION/10.0) + (wxRELEASE_NUMBER/100.0) + (wxBETA_NUMBER/10000.0)
#endif #endif

View File

@@ -186,7 +186,7 @@ typedef _TUCHAR wxUChar;
#if defined(__VISUALC__) && (__VISUALC__ < 900) #if defined(__VISUALC__) && (__VISUALC__ < 900)
#define wxUSE_WCHAR_T 0 // wchar_t is not available for MSVC++ 1.5 #define wxUSE_WCHAR_T 0 // wchar_t is not available for MSVC++ 1.5
#elif defined(__UNIX__) #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 #define wxUSE_WCHAR_T 1
#else #else
#define wxUSE_WCHAR_T 0 #define wxUSE_WCHAR_T 0
@@ -200,11 +200,16 @@ typedef _TUCHAR wxUChar;
#endif//wxUSE_UNICODE #endif//wxUSE_UNICODE
#if wxUSE_WCHAR_T #if wxUSE_WCHAR_T
#ifdef HAVE_WCSTR_H #ifdef HAVE_WCSTR_H
#include <wcstr.h> #include <wcstr.h>
#else #else
#include <wchar.h> #ifndef __FreeBSD__
#endif #include <wchar.h>
#else
#include <stdlib.h>
#define wxNEED_WCSLEN
#endif
#endif
#endif #endif
// check whether we are doing Unicode // check whether we are doing Unicode
@@ -288,6 +293,9 @@ typedef unsigned char wxUChar;
#define wxUChar unsigned char #define wxUChar unsigned char
#endif #endif
#ifdef __FreeBSD__
#undef _T
#endif
#define _T(x) x #define _T(x) x
// ctype.h functions // ctype.h functions

View File

@@ -1,7 +1,7 @@
# Note that this is NOT a relocatable package # Note that this is NOT a relocatable package
%define pref /usr %define pref /usr
%define ver 2.1.0 %define ver 2.1.0
%define rel 3 %define rel 4
Summary: The GTK+ 1.2 port of the wxWindows library Summary: The GTK+ 1.2 port of the wxWindows library
Name: wxGTK Name: wxGTK
@@ -9,7 +9,7 @@ Version: %{ver}
Release: %{rel} Release: %{rel}
Copyright: wxWindows Licence Copyright: wxWindows Licence
Group: X11/Libraries 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 URL: http://wesley.informatik.uni-freiburg.de/~wxxt/docs.html
Packager: Robert Roebling <roebling@ruf.uni-freiburg.de> Packager: Robert Roebling <roebling@ruf.uni-freiburg.de>
Requires: gtk+ >= 1.2.1 Requires: gtk+ >= 1.2.1