Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Digital Mars compilation warnings and Unicode fixes (patch 884587)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-02-07 15:07:08 +00:00
parent b9b1f368fe
commit ba1e9d6ced
6 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/filefn.h
View File

@@ -75,6 +75,7 @@ enum wxSeekMode
#if defined( __VISUALC__ ) \ #if defined( __VISUALC__ ) \
|| ( defined(__MINGW32__) && !defined(__WINE__) && wxCHECK_W32API_VERSION( 0, 5 ) ) \ || ( defined(__MINGW32__) && !defined(__WINE__) && wxCHECK_W32API_VERSION( 0, 5 ) ) \
|| ( defined(__MWERKS__) && defined(__WXMSW__) ) \ || ( defined(__MWERKS__) && defined(__WXMSW__) ) \
|| ( defined(__DMC__) && defined(__WXMSW__) ) \
|| ( defined(__WATCOMC__) && defined(__WXMSW__) ) || ( defined(__WATCOMC__) && defined(__WXMSW__) )
// functions // functions
#if defined(__BORLANDC__) || defined(__WATCOMC__) #if defined(__BORLANDC__) || defined(__WATCOMC__)
@@ -163,6 +164,9 @@ enum wxSeekMode
#if defined(__MWERKS__) && defined(macintosh) #if defined(__MWERKS__) && defined(macintosh)
#include <sys/stat.h> #include <sys/stat.h>
#endif #endif
#if defined(__DMC__)
typedef unsigned long mode_t;
#endif
WXDLLIMPEXP_BASE int wxStat( const wxChar *file_name, wxStructStat *buf ); WXDLLIMPEXP_BASE int wxStat( const wxChar *file_name, wxStructStat *buf );
WXDLLIMPEXP_BASE int wxAccess( const wxChar *pathname, int mode ); WXDLLIMPEXP_BASE int wxAccess( const wxChar *pathname, int mode );
WXDLLIMPEXP_BASE int wxOpen( const wxChar *pathname, int flags, mode_t mode ); WXDLLIMPEXP_BASE int wxOpen( const wxChar *pathname, int flags, mode_t mode );

4
include/wx/univ/checklst.h
View File

@@ -37,7 +37,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
int nStrings = 0, int nStrings = 0,
const wxString *choices = NULL, const wxString choices[] = NULL,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr) const wxString& name = wxListBoxNameStr)
@@ -60,7 +60,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
int nStrings = 0, int nStrings = 0,
const wxString *choices = NULL, const wxString choices[] = (const wxString *) NULL,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr); const wxString& name = wxListBoxNameStr);

2
include/wx/univ/combobox.h
View File

@@ -221,7 +221,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
int n = 0, int n = 0,
const wxString *choices = (const wxString *) NULL, const wxString choices[] = (const wxString *) NULL,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxComboBoxNameStr) const wxString& name = wxComboBoxNameStr)

12
include/wx/wxchar.h
View File

@@ -114,6 +114,8 @@
#include <ctype.h> #include <ctype.h>
#elif defined(__WATCOMC__) #elif defined(__WATCOMC__)
#define wxHAVE_TCHAR_SUPPORT #define wxHAVE_TCHAR_SUPPORT
#elif defined(__DMC__)
#define wxHAVE_TCHAR_SUPPORT
#elif defined(__MINGW32__) && wxCHECK_W32API_VERSION( 1, 0 ) #elif defined(__MINGW32__) && wxCHECK_W32API_VERSION( 1, 0 )
#define wxHAVE_TCHAR_SUPPORT #define wxHAVE_TCHAR_SUPPORT
#include <stddef.h> #include <stddef.h>
@@ -300,7 +302,17 @@
#define wxPutchar _puttchar #define wxPutchar _puttchar
#define wxPuts _putts #define wxPuts _putts
#define wxScanf _tscanf #define wxScanf _tscanf
#if defined(__DMC__)
/* Digital Mars adds count to _stprintf (C99) so it does not fit wxWindows needs */
/* Instead of it we can use function from MSW api (FIXME: doesn't work) */
#ifdef wxUSE_UNICODE
#define wxSprintf wsprintfW
#else
#define wxSprintf wsprintfA
#endif
#else
#define wxSprintf _stprintf #define wxSprintf _stprintf
#endif
#define wxSscanf _stscanf #define wxSscanf _stscanf
#define wxTmpnam _ttmpnam #define wxTmpnam _ttmpnam
#define wxUngetc _tungetc #define wxUngetc _tungetc

1
src/common/filefn.cpp
View File

@@ -1303,6 +1303,7 @@ bool wxRemoveFile(const wxString& file)
#if defined(__VISUALC__) \ #if defined(__VISUALC__) \
|| defined(__BORLANDC__) \ || defined(__BORLANDC__) \
|| defined(__WATCOMC__) \ || defined(__WATCOMC__) \
|| defined(__DMC__) \
|| defined(__GNUWIN32__) || defined(__GNUWIN32__)
int res = wxRemove(file); int res = wxRemove(file);
#elif defined(__WXMAC__) #elif defined(__WXMAC__)

2
src/univ/combobox.cpp
View File

@@ -694,7 +694,7 @@ bool wxComboBox::Create(wxWindow *parent,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
int n, int n,
const wxString *choices, const wxString choices[],
long style, long style,
const wxValidator& validator, const wxValidator& validator,
const wxString& name) const wxString& name)