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

applied patch 417699 (remove WXDLLEXPORT from inline functions)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9891 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-04-26 16:38:11 +00:00
parent 7d88e2447e
commit 6d56eb5c56
6 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/app.h
View File

@@ -326,7 +326,7 @@ extern void WXDLLEXPORT wxWakeUpIdle();
// Post a message to the given eventhandler which will be processed during the // Post a message to the given eventhandler which will be processed during the
// next event loop iteration // next event loop iteration
inline void WXDLLEXPORT wxPostEvent(wxEvtHandler *dest, wxEvent& event) inline void wxPostEvent(wxEvtHandler *dest, wxEvent& event)
{ {
wxCHECK_RET( dest, wxT("need an object to post event to in wxPostEvent") ); wxCHECK_RET( dest, wxT("need an object to post event to in wxPostEvent") );

16
include/wx/longlong.h
View File

@@ -512,14 +512,14 @@ private:
// binary operators // binary operators
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
inline bool WXDLLEXPORT operator<(long l, const wxLongLong& ll) { return ll > l; } inline bool operator<(long l, const wxLongLong& ll) { return ll > l; }
inline bool WXDLLEXPORT operator>(long l, const wxLongLong& ll) { return ll > l; } inline bool operator>(long l, const wxLongLong& ll) { return ll > l; }
inline bool WXDLLEXPORT operator<=(long l, const wxLongLong& ll) { return ll > l; } inline bool operator<=(long l, const wxLongLong& ll) { return ll > l; }
inline bool WXDLLEXPORT operator>=(long l, const wxLongLong& ll) { return ll > l; } inline bool operator>=(long l, const wxLongLong& ll) { return ll > l; }
inline bool WXDLLEXPORT operator==(long l, const wxLongLong& ll) { return ll > l; } inline bool operator==(long l, const wxLongLong& ll) { return ll > l; }
inline bool WXDLLEXPORT operator!=(long l, const wxLongLong& ll) { return ll > l; } inline bool operator!=(long l, const wxLongLong& ll) { return ll > l; }
inline wxLongLong WXDLLEXPORT operator+(long l, const wxLongLong& ll) { return ll + l; } inline wxLongLong operator+(long l, const wxLongLong& ll) { return ll + l; }
inline wxLongLong WXDLLEXPORT operator-(long l, const wxLongLong& ll) { return ll - l; } inline wxLongLong operator-(long l, const wxLongLong& ll) { return ll - l; }
#endif // _WX_LONGLONG_H #endif // _WX_LONGLONG_H

9
include/wx/msw/dib.h
View File

@@ -15,6 +15,9 @@
class WXDLLEXPORT wxBitmap; class WXDLLEXPORT wxBitmap;
class WXDLLEXPORT wxPalette; class WXDLLEXPORT wxPalette;
// WARNING: these functions are private to wxWindows and shouldn't be used
// by the user code, they risk to disappear in the next versions!
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Functions for working with DIBs // Functions for working with DIBs
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -29,8 +32,8 @@ extern bool wxCreateDIB(long xSize, long ySize, long bitsPerPixel,
extern void wxFreeDIB(LPBITMAPINFO lpDIBHeader); extern void wxFreeDIB(LPBITMAPINFO lpDIBHeader);
// defined in ole/dataobj.cpp // defined in ole/dataobj.cpp
extern size_t wxConvertBitmapToDIB(LPBITMAPINFO pbi, const wxBitmap& bitmap); extern WXDLLEXPORT size_t wxConvertBitmapToDIB(LPBITMAPINFO pbi, const wxBitmap& bitmap);
extern wxBitmap wxConvertDIBToBitmap(const LPBITMAPINFO pbi); extern WXDLLEXPORT wxBitmap wxConvertDIBToBitmap(const LPBITMAPINFO pbi);
// the rest is defined in dib.cpp // the rest is defined in dib.cpp
@@ -38,7 +41,7 @@ extern wxBitmap wxConvertDIBToBitmap(const LPBITMAPINFO pbi);
bool wxSaveBitmap(wxChar *filename, wxBitmap *bitmap, wxPalette *colourmap = NULL); bool wxSaveBitmap(wxChar *filename, wxBitmap *bitmap, wxPalette *colourmap = NULL);
// Load device independent bitmap into device dependent bitmap // Load device independent bitmap into device dependent bitmap
wxBitmap *wxLoadBitmap(wxChar *filename, wxPalette **colourmap = NULL); wxBitmap *wxLoadBitmap(wxChar *filename, wxPalette **colourmap = NULL);
// Load into existing bitmap; // Load into existing bitmap;
bool wxLoadIntoBitmap(wxChar *filename, wxBitmap *bitmap, wxPalette **pal = NULL); bool wxLoadIntoBitmap(wxChar *filename, wxBitmap *bitmap, wxPalette **pal = NULL);

14
include/wx/string.h
View File

@@ -120,14 +120,14 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
// backwards compatibility only. // backwards compatibility only.
// 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 IsEmpty(const char *p) { return (!p || !*p); } inline bool IsEmpty(const char *p) { return (!p || !*p); }
// safe version of strlen() (returns 0 if passed NULL pointer) // safe version of strlen() (returns 0 if passed NULL pointer)
inline size_t WXDLLEXPORT Strlen(const char *psz) inline size_t Strlen(const char *psz)
{ return psz ? strlen(psz) : 0; } { return psz ? strlen(psz) : 0; }
// portable strcasecmp/_stricmp // portable strcasecmp/_stricmp
inline int WXDLLEXPORT Stricmp(const char *psz1, const char *psz2) inline int Stricmp(const char *psz1, const char *psz2)
{ {
#if defined(__VISUALC__) || ( defined(__MWERKS__) && defined(__INTEL__) ) #if defined(__VISUALC__) || ( defined(__MWERKS__) && defined(__INTEL__) )
return _stricmp(psz1, psz2); return _stricmp(psz1, psz2);
@@ -1126,14 +1126,14 @@ wxString WXDLLEXPORT operator+(wxChar ch, const wxString& string);
wxString WXDLLEXPORT operator+(const wxString& string, const wxChar *psz); wxString WXDLLEXPORT operator+(const wxString& string, const wxChar *psz);
wxString WXDLLEXPORT operator+(const wxChar *psz, const wxString& string); wxString WXDLLEXPORT operator+(const wxChar *psz, const wxString& string);
#if wxUSE_UNICODE #if wxUSE_UNICODE
inline wxString WXDLLEXPORT operator+(const wxString& string, const wxWCharBuffer& buf) inline wxString operator+(const wxString& string, const wxWCharBuffer& buf)
{ return string + (const wchar_t *)buf; } { return string + (const wchar_t *)buf; }
inline wxString WXDLLEXPORT operator+(const wxWCharBuffer& buf, const wxString& string) inline wxString operator+(const wxWCharBuffer& buf, const wxString& string)
{ return (const wchar_t *)buf + string; } { return (const wchar_t *)buf + string; }
#else // !wxUSE_UNICODE #else // !wxUSE_UNICODE
inline wxString WXDLLEXPORT operator+(const wxString& string, const wxCharBuffer& buf) inline wxString operator+(const wxString& string, const wxCharBuffer& buf)
{ return string + (const char *)buf; } { return string + (const char *)buf; }
inline wxString WXDLLEXPORT operator+(const wxCharBuffer& buf, const wxString& string) inline wxString operator+(const wxCharBuffer& buf, const wxString& string)
{ return (const char *)buf + string; } { return (const char *)buf + string; }
#endif // wxUSE_UNICODE/!wxUSE_UNICODE #endif // wxUSE_UNICODE/!wxUSE_UNICODE

2
include/wx/window.h
View File

@@ -921,7 +921,7 @@ WXDLLEXPORT extern wxWindow* wxFindWindowAtPointer(wxPoint& pt);
WXDLLEXPORT extern wxPoint wxGetMousePosition(); WXDLLEXPORT extern wxPoint wxGetMousePosition();
// deprecated (doesn't start with 'wx' prefix), use wxWindow::NewControlId() // deprecated (doesn't start with 'wx' prefix), use wxWindow::NewControlId()
inline WXDLLEXPORT int NewControlId() { return wxWindowBase::NewControlId(); } inline int NewControlId() { return wxWindowBase::NewControlId(); }
#endif #endif
// _WX_WINDOW_H_BASE_ // _WX_WINDOW_H_BASE_

4
include/wx/wxchar.h
View File

@@ -511,11 +511,11 @@ typedef unsigned __WCHAR_TYPE__ 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
WXDLLEXPORT inline bool wxIsEmpty(const wxChar *p) { return !p || !*p; } 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)
WXDLLEXPORT inline size_t wxStrlen(const wxChar *psz) inline size_t wxStrlen(const wxChar *psz)
{ return psz ? wxStrlen_(psz) : 0; } { return psz ? wxStrlen_(psz) : 0; }
#endif #endif