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

Moved all WXDLLEXPORT's to be before the return type in order to make

Browse Source 
VC 6.0 happy when building a DLL.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2489 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
1999-05-17 17:10:11 +00:00
parent 7af6f32725
commit 49828363f8
1 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
include/wx/wxchar.h
View File

@@ -428,18 +428,18 @@ typedef unsigned char wxUChar;
#endif #endif
/// checks whether the passed in pointer is NULL and if the string is empty /// checks whether the passed in pointer is NULL and if the string is empty
inline bool WXDLLEXPORT wxIsEmpty(const wxChar *p) { return !p || !*p; } WXDLLEXPORT inline bool wxIsEmpty(const wxChar *p) { return !p || !*p; }
#ifndef wxNEED_WX_STRING_H #ifndef wxNEED_WX_STRING_H
/// safe version of strlen() (returns 0 if passed NULL pointer) /// safe version of strlen() (returns 0 if passed NULL pointer)
inline size_t WXDLLEXPORT wxStrlen(const wxChar *psz) WXDLLEXPORT inline size_t wxStrlen(const wxChar *psz)
{ return psz ? wxStrlen_(psz) : 0; } { return psz ? wxStrlen_(psz) : 0; }
#endif #endif
#if wxUSE_WCHAR_T #if wxUSE_WCHAR_T
// multibyte<->widechar conversion // multibyte<->widechar conversion
size_t WXDLLEXPORT wxMB2WC(wchar_t *buf, const char *psz, size_t n); WXDLLEXPORT size_t wxMB2WC(wchar_t *buf, const char *psz, size_t n);
size_t WXDLLEXPORT wxWC2MB(char *buf, const wchar_t *psz, size_t n); WXDLLEXPORT size_t wxWC2MB(char *buf, const wchar_t *psz, size_t n);
#if wxUSE_UNICODE #if wxUSE_UNICODE
#define wxMB2WX wxMB2WC #define wxMB2WX wxMB2WC
#define wxWX2MB wxWC2MB #define wxWX2MB wxWC2MB
@@ -461,88 +461,88 @@ size_t WXDLLEXPORT wxWC2MB(char *buf, const wchar_t *psz, size_t n);
#define wxWX2WC wxMB2WC #define wxWX2WC wxMB2WC
#endif #endif
bool WXDLLEXPORT wxOKlibc(); // for internal use WXDLLEXPORT bool wxOKlibc(); // for internal use
// if libc versions are not available, use replacements defined in wxchar.cpp // if libc versions are not available, use replacements defined in wxchar.cpp
#ifndef wxStrdup #ifndef wxStrdup
wxChar * WXDLLEXPORT wxStrdup(const wxChar *psz); WXDLLEXPORT wxChar * wxStrdup(const wxChar *psz);
#endif #endif
#ifndef wxStricmp #ifndef wxStricmp
int WXDLLEXPORT wxStricmp(const wxChar *psz1, const wxChar *psz2); WXDLLEXPORT int wxStricmp(const wxChar *psz1, const wxChar *psz2);
#endif #endif
#ifndef wxStrtok #ifndef wxStrtok
wxChar * WXDLLEXPORT wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr); WXDLLEXPORT wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr);
#endif #endif
#ifndef wxSetlocale #ifndef wxSetlocale
wxChar * WXDLLEXPORT wxSetlocale(int category, const wxChar *locale); WXDLLEXPORT wxChar * wxSetlocale(int category, const wxChar *locale);
#endif #endif
#ifdef wxNEED_WCSLEN // for use in buffer.h #ifdef wxNEED_WCSLEN // for use in buffer.h
size_t WXDLLEXPORT wcslen(const wchar_t *s); WXDLLEXPORT size_t wcslen(const wchar_t *s);
#endif #endif
#ifdef wxNEED_WX_CTYPE_H #ifdef wxNEED_WX_CTYPE_H
int WXDLLEXPORT wxIsalnum(wxChar ch); WXDLLEXPORT int wxIsalnum(wxChar ch);
int WXDLLEXPORT wxIsalpha(wxChar ch); WXDLLEXPORT int wxIsalpha(wxChar ch);
int WXDLLEXPORT wxIsctrl(wxChar ch); WXDLLEXPORT int wxIsctrl(wxChar ch);
int WXDLLEXPORT wxIsdigit(wxChar ch); WXDLLEXPORT int wxIsdigit(wxChar ch);
int WXDLLEXPORT wxIsgraph(wxChar ch); WXDLLEXPORT int wxIsgraph(wxChar ch);
int WXDLLEXPORT wxIslower(wxChar ch); WXDLLEXPORT int wxIslower(wxChar ch);
int WXDLLEXPORT wxIsprint(wxChar ch); WXDLLEXPORT int wxIsprint(wxChar ch);
int WXDLLEXPORT wxIspunct(wxChar ch); WXDLLEXPORT int wxIspunct(wxChar ch);
int WXDLLEXPORT wxIsspace(wxChar ch); WXDLLEXPORT int wxIsspace(wxChar ch);
int WXDLLEXPORT wxIsupper(wxChar ch); WXDLLEXPORT int wxIsupper(wxChar ch);
int WXDLLEXPORT wxIsxdigit(wxChar ch); WXDLLEXPORT int wxIsxdigit(wxChar ch);
int WXDLLEXPORT wxTolower(wxChar ch); WXDLLEXPORT int wxTolower(wxChar ch);
int WXDLLEXPORT wxToupper(wxChar ch); WXDLLEXPORT int wxToupper(wxChar ch);
#endif #endif
#ifdef wxNEED_WX_STRING_H #ifdef wxNEED_WX_STRING_H
wxChar * WXDLLEXPORT wxStrcat(wxChar *dest, const wxChar *src); WXDLLEXPORT wxChar * wxStrcat(wxChar *dest, const wxChar *src);
wxChar * WXDLLEXPORT wxStrchr(const wxChar *s, wxChar c); WXDLLEXPORT wxChar * wxStrchr(const wxChar *s, wxChar c);
int WXDLLEXPORT wxStrcmp(const wxChar *s1, const wxChar *s2); WXDLLEXPORT int wxStrcmp(const wxChar *s1, const wxChar *s2);
int WXDLLEXPORT wxStrcoll(const wxChar *s1, const wxChar *s2); WXDLLEXPORT int wxStrcoll(const wxChar *s1, const wxChar *s2);
wxChar * WXDLLEXPORT wxStrcpy(wxChar *dest, const wxChar *src); WXDLLEXPORT wxChar * wxStrcpy(wxChar *dest, const wxChar *src);
size_t WXDLLEXPORT wxStrcspn(const wxChar *s, const wxChar *reject); WXDLLEXPORT size_t wxStrcspn(const wxChar *s, const wxChar *reject);
size_t WXDLLEXPORT wxStrlen(const wxChar *s); WXDLLEXPORT size_t wxStrlen(const wxChar *s);
wxChar * WXDLLEXPORT wxStrncat(wxChar *dest, const wxChar *src, size_t n); WXDLLEXPORT wxChar * wxStrncat(wxChar *dest, const wxChar *src, size_t n);
int WXDLLEXPORT wxStrncmp(const wxChar *s1, const wxChar *s2, size_t n); WXDLLEXPORT int wxStrncmp(const wxChar *s1, const wxChar *s2, size_t n);
wxChar * WXDLLEXPORT wxStrncpy(wxChar *dest, const wxChar *src, size_t n); WXDLLEXPORT wxChar * wxStrncpy(wxChar *dest, const wxChar *src, size_t n);
wxChar * WXDLLEXPORT wxStrpbrk(const wxChar *s, const wxChar *accept); WXDLLEXPORT wxChar * wxStrpbrk(const wxChar *s, const wxChar *accept);
wxChar * WXDLLEXPORT wxStrrchr(const wxChar *s, wxChar c); WXDLLEXPORT wxChar * wxStrrchr(const wxChar *s, wxChar c);
size_t WXDLLEXPORT wxStrspn(const wxChar *s, const wxChar *accept); WXDLLEXPORT size_t wxStrspn(const wxChar *s, const wxChar *accept);
wxChar * WXDLLEXPORT wxStrstr(const wxChar *haystack, const wxChar *needle); WXDLLEXPORT wxChar * wxStrstr(const wxChar *haystack, const wxChar *needle);
double WXDLLEXPORT wxStrtod(const wxChar *nptr, wxChar **endptr); WXDLLEXPORT double wxStrtod(const wxChar *nptr, wxChar **endptr);
long int WXDLLEXPORT wxStrtol(const wxChar *nptr, wxChar **endptr, int base); WXDLLEXPORT long int wxStrtol(const wxChar *nptr, wxChar **endptr, int base);
unsigned long int WXDLLEXPORT wxStrtoul(const wxChar *nptr, wxChar **endptr, int base); WXDLLEXPORT unsigned long int wxStrtoul(const wxChar *nptr, wxChar **endptr, int base);
size_t WXDLLEXPORT wxStrxfrm(wxChar *dest, const wxChar *src, size_t n); WXDLLEXPORT size_t wxStrxfrm(wxChar *dest, const wxChar *src, size_t n);
#endif #endif
#ifdef wxNEED_WX_STDIO_H #ifdef wxNEED_WX_STDIO_H
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
int WXDLLEXPORT wxPrintf(const wxChar *fmt, ...); WXDLLEXPORT int wxPrintf(const wxChar *fmt, ...);
int WXDLLEXPORT wxVprintf(const wxChar *fmt, va_list argptr); WXDLLEXPORT int wxVprintf(const wxChar *fmt, va_list argptr);
int WXDLLEXPORT wxFprintf(FILE *stream, const wxChar *fmt, ...); WXDLLEXPORT int wxFprintf(FILE *stream, const wxChar *fmt, ...);
int WXDLLEXPORT wxVfprintf(FILE *stream, const wxChar *fmt, va_list argptr); WXDLLEXPORT int wxVfprintf(FILE *stream, const wxChar *fmt, va_list argptr);
int WXDLLEXPORT wxSprintf(wxChar *buf, const wxChar *fmt, ...); WXDLLEXPORT int wxSprintf(wxChar *buf, const wxChar *fmt, ...);
int WXDLLEXPORT wxVsprintf(wxChar *buf, const wxChar *fmt, va_list argptr); WXDLLEXPORT int wxVsprintf(wxChar *buf, const wxChar *fmt, va_list argptr);
int WXDLLEXPORT wxSscanf(const wxChar *buf, const wxChar *fmt, ...); WXDLLEXPORT int wxSscanf(const wxChar *buf, const wxChar *fmt, ...);
int WXDLLEXPORT wxVsscanf(const wxChar *buf, const wxChar *fmt, va_list argptr); WXDLLEXPORT int wxVsscanf(const wxChar *buf, const wxChar *fmt, va_list argptr);
#endif #endif
#ifndef wxAtof #ifndef wxAtof
double WXDLLEXPORT wxAtof(const wxChar *psz); WXDLLEXPORT double wxAtof(const wxChar *psz);
#endif #endif
#ifdef wxNEED_WX_STDLIB_H #ifdef wxNEED_WX_STDLIB_H
int WXDLLEXPORT wxAtoi(const wxChar *psz); WXDLLEXPORT int wxAtoi(const wxChar *psz);
long WXDLLEXPORT wxAtol(const wxChar *psz); WXDLLEXPORT long wxAtol(const wxChar *psz);
wxChar * WXDLLEXPORT wxGetenv(const wxChar *name); WXDLLEXPORT wxChar * wxGetenv(const wxChar *name);
int WXDLLEXPORT wxSystem(const wxChar *psz); WXDLLEXPORT int wxSystem(const wxChar *psz);
#endif #endif
#endif #endif