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

@@ -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

View File

@@ -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