AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

replace wrong WXDLLEXPORT declarations with correct WXDLLIMPEXP_BASE/ADV/GL (patch from Tim Stahlhut)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50646 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2007-12-12 01:35:53 +00:00
parent 51cd351973
commit 163b3ad72c
27 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/animdecod.h
View File

@ -84,7 +84,7 @@ enum wxAnimationType
// wxAnimationDecoder class
// --------------------------------------------------------------------------
class WXDLLEXPORT wxAnimationDecoder : public wxObjectRefData
class WXDLLIMPEXP_ADV wxAnimationDecoder : public wxObjectRefData
{
public:
wxAnimationDecoder()

2
include/wx/cocoa/sound.h
View File

@ -16,7 +16,7 @@
#include "wx/object.h"
#include "wx/cocoa/ObjcRef.h"
class WXDLLEXPORT wxSound : public wxSoundBase
class WXDLLIMPEXP_ADV wxSound : public wxSoundBase
{
public:
wxSound()

2
include/wx/cocoa/taskbar.h
View File

@ -19,7 +19,7 @@ class WXDLLIMPEXP_FWD_CORE wxMenu;
class wxTaskBarIconCocoaImpl;
class WXDLLEXPORT wxTaskBarIcon : public wxTaskBarIconBase
class WXDLLIMPEXP_ADV wxTaskBarIcon : public wxTaskBarIconBase
{
friend class wxTaskBarIconCocoaImpl;
DECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon)

2
include/wx/dcsvg.h
View File

@ -28,7 +28,7 @@ class WXDLLIMPEXP_FWD_BASE wxFileOutputStream;
class WXDLLIMPEXP_FWD_BASE wxSVGFileDC;
class WXDLLIMPEXP_FWD_CORE wxSVGFileDC;
class WXDLLIMPEXP_CORE wxSVGFileDCImpl : public wxDCImpl
{

2
include/wx/flags.h
View File

@ -154,7 +154,7 @@ private :
};
#define WX_DEFINE_FLAGS( flags ) \
class WXDLLEXPORT flags \
class WXDLLIMPEXP_BASE flags \
{\
public : \
flags(long data=0) :m_data(data) {} \

2
include/wx/generic/private/timer.h
View File

@ -20,7 +20,7 @@
class wxTimerDesc;
class WXDLLEXPORT wxGenericTimerImpl : public wxTimerImpl
class WXDLLIMPEXP_BASE wxGenericTimerImpl : public wxTimerImpl
{
public:
wxGenericTimerImpl(wxTimer* timer) : wxTimerImpl(timer) { Init(); }

2
include/wx/gtk1/glcanvas.h
View File

@ -18,7 +18,7 @@
// wxGLCanvas
//---------------------------------------------------------------------------
class WXDLLEXPORT wxGLCanvas : public wxGLCanvasX11
class WXDLLIMPEXP_GL wxGLCanvas : public wxGLCanvasX11
{
public:
wxGLCanvas(wxWindow *parent,

2
include/wx/mac/carbon/apptrait.h
View File

@ -16,7 +16,7 @@
// wxGUI/ConsoleAppTraits: must derive from wxAppTraits, not wxAppTraitsBase
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxConsoleAppTraits : public wxConsoleAppTraitsBase
class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase
{
public:
// no timer support in wxBase yet

2
include/wx/mac/carbon/drawer.h
View File

@ -25,7 +25,7 @@
#if ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2 )
class WXDLLEXPORT wxDrawerWindow : public wxTopLevelWindow
class WXDLLIMPEXP_ADV wxDrawerWindow : public wxTopLevelWindow
{
DECLARE_DYNAMIC_CLASS(wxDrawerWindow)

4
include/wx/mac/carbon/glcanvas.h
View File

@ -20,7 +20,7 @@
# include <agl.h>
#endif
class WXDLLEXPORT wxGLContext : public wxGLContextBase
class WXDLLIMPEXP_GL wxGLContext : public wxGLContextBase
{
public:
wxGLContext(wxGLCanvas *win, const wxGLContext *other = NULL);
@ -37,7 +37,7 @@ private:
DECLARE_NO_COPY_CLASS(wxGLContext)
};
class WXDLLEXPORT wxGLCanvas : public wxGLCanvasBase
class WXDLLIMPEXP_GL wxGLCanvas : public wxGLCanvasBase
{
public:
wxGLCanvas(wxWindow *parent,

2
include/wx/mac/carbon/joystick.h
View File

@ -14,7 +14,7 @@
#include "wx/event.h"
class WXDLLEXPORT wxJoystick: public wxObject
class WXDLLIMPEXP_ADV wxJoystick: public wxObject
{
DECLARE_DYNAMIC_CLASS(wxJoystick)
public:

2
include/wx/mac/carbon/sound.h
View File

@ -17,7 +17,7 @@
#include "wx/object.h"
class WXDLLEXPORT wxSound : public wxSoundBase
class WXDLLIMPEXP_ADV wxSound : public wxSoundBase
{
public:
wxSound();

2
include/wx/mac/carbon/taskbarosx.h
View File

@ -15,7 +15,7 @@
class WXDLLIMPEXP_FWD_CORE wxIcon;
class WXDLLIMPEXP_FWD_CORE wxMenu;
class WXDLLEXPORT wxTaskBarIcon : public wxTaskBarIconBase
class WXDLLIMPEXP_ADV wxTaskBarIcon : public wxTaskBarIconBase
{
DECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon)
public:

2
include/wx/mac/corefoundation/joystick.h
View File

@ -16,7 +16,7 @@
class WXDLLIMPEXP_FWD_CORE wxJoystickThread;
class WXDLLEXPORT wxJoystick: public wxObject
class WXDLLIMPEXP_ADV wxJoystick: public wxObject
{
DECLARE_DYNAMIC_CLASS(wxJoystick)
public:

8
include/wx/math.h
View File

@ -132,13 +132,13 @@
extern "C" {
#endif
/* functions from common/extended.c */
WXDLLEXPORT wxFloat64 wxConvertFromIeeeExtended(const wxInt8 *bytes);
WXDLLEXPORT void wxConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes);
WXDLLIMPEXP_BASE wxFloat64 wxConvertFromIeeeExtended(const wxInt8 *bytes);
WXDLLIMPEXP_BASE void wxConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes);
/* use wxConvertFromIeeeExtended() and wxConvertToIeeeExtended() instead */
#if WXWIN_COMPATIBILITY_2_8
wxDEPRECATED( WXDLLEXPORT wxFloat64 ConvertFromIeeeExtended(const wxInt8 *bytes) );
wxDEPRECATED( WXDLLEXPORT void ConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes) );
wxDEPRECATED( WXDLLIMPEXP_BASE wxFloat64 ConvertFromIeeeExtended(const wxInt8 *bytes) );
wxDEPRECATED( WXDLLIMPEXP_BASE void ConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes) );
#endif // WXWIN_COMPATIBILITY_2_8
#ifdef __cplusplus

2
include/wx/os2/joystick.h
View File

@ -14,7 +14,7 @@
#include "wx/event.h"
class WXDLLEXPORT wxJoystick: public wxObject
class WXDLLIMPEXP_ADV wxJoystick: public wxObject
{
DECLARE_DYNAMIC_CLASS(wxJoystick)
public:

2
include/wx/palmos/timer.h
View File

@ -12,7 +12,7 @@
#ifndef _WX_TIMER_H_
#define _WX_TIMER_H_
class WXDLLEXPORT wxTimer : public wxTimerBase
class WXDLLIMPEXP_BASE wxTimer : public wxTimerBase
{
friend void wxProcessTimer(wxTimer& timer);

2
include/wx/timer.h
View File

@ -116,7 +116,7 @@ protected:
// wxTimerRunner: starts the timer in its ctor, stops in the dtor
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxTimerRunner
class WXDLLIMPEXP_BASE wxTimerRunner
{
public:
wxTimerRunner(wxTimer& timer) : m_timer(timer) { }

2
include/wx/unix/apptbase.h
View File

@ -19,7 +19,7 @@ class wxPipe;
// wxAppTraits: the Unix version adds extra hooks needed by Unix code
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxAppTraits : public wxAppTraitsBase
class WXDLLIMPEXP_BASE wxAppTraits : public wxAppTraitsBase
{
public:
// wxExecute() support methods

2
include/wx/unix/apptrait.h
View File

@ -16,7 +16,7 @@
// wxGUI/ConsoleAppTraits: must derive from wxAppTraits, not wxAppTraitsBase
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxConsoleAppTraits : public wxConsoleAppTraitsBase
class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase
{
public:
#if wxUSE_CONSOLE_EVENTLOOP

2
include/wx/x11/glcanvas.h
View File

@ -15,7 +15,7 @@
#include "wx/unix/glx11.h"
class WXDLLEXPORT wxGLCanvas : public wxGLCanvasX11
class WXDLLIMPEXP_GL wxGLCanvas : public wxGLCanvasX11
{
public:
wxGLCanvas(wxWindow *parent,

2
include/wx/x11/joystick.h
View File

@ -14,7 +14,7 @@
#include "wx/event.h"
class WXDLLEXPORT wxJoystick: public wxObject
class WXDLLIMPEXP_ADV wxJoystick: public wxObject
{
DECLARE_DYNAMIC_CLASS(wxJoystick)
public:

2
include/wx/xrc/xh_collpane.h
View File

@ -15,7 +15,7 @@
#if wxUSE_XRC && wxUSE_COLLPANE
class WXDLLIMPEXP_FWD_ADV wxCollapsiblePane;
class WXDLLIMPEXP_FWD_CORE wxCollapsiblePane;
class WXDLLIMPEXP_XRC wxCollapsiblePaneXmlHandler : public wxXmlResourceHandler
{

8
src/common/extended.c
View File

@ -105,7 +105,7 @@
* and a 64-bit mantissa, with no hidden bit.
****************************************************************/
WXDLLEXPORT wxFloat64 wxConvertFromIeeeExtended(const wxInt8 *bytes)
WXDLLIMPEXP_BASE wxFloat64 wxConvertFromIeeeExtended(const wxInt8 *bytes)
{
wxFloat64 f;
wxInt32 expon;
@ -145,7 +145,7 @@ WXDLLEXPORT wxFloat64 wxConvertFromIeeeExtended(const wxInt8 *bytes)
/****************************************************************/
WXDLLEXPORT void wxConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes)
WXDLLIMPEXP_BASE void wxConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes)
{
wxInt32 sign;
wxInt32 expon;
@ -192,12 +192,12 @@ WXDLLEXPORT void wxConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes)
}
#if WXWIN_COMPATIBILITY_2_8
WXDLLEXPORT wxFloat64 ConvertFromIeeeExtended(const wxInt8 *bytes)
WXDLLIMPEXP_BASE wxFloat64 ConvertFromIeeeExtended(const wxInt8 *bytes)
{
return wxConvertFromIeeeExtended(bytes);
}
WXDLLEXPORT void ConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes)
WXDLLIMPEXP_BASE void ConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes)
{
wxConvertToIeeeExtended(num, bytes);
}

6
src/common/filefn.cpp
View File

@ -1703,7 +1703,7 @@ bool wxFindFileInPath(wxString *pStr, const wxString& szPath, const wxString& sz
return false;
}
void WXDLLEXPORT wxSplitPath(const wxString& fileName,
void WXDLLIMPEXP_BASE wxSplitPath(const wxString& fileName,
wxString *pstrPath,
wxString *pstrName,
wxString *pstrExt)
@ -1713,7 +1713,7 @@ void WXDLLEXPORT wxSplitPath(const wxString& fileName,
#if wxUSE_DATETIME
time_t WXDLLEXPORT wxFileModificationTime(const wxString& filename)
time_t WXDLLIMPEXP_BASE wxFileModificationTime(const wxString& filename)
{
wxDateTime mtime;
if ( !wxFileName(filename).GetTimes(NULL, &mtime, NULL) )
@ -1729,7 +1729,7 @@ time_t WXDLLEXPORT wxFileModificationTime(const wxString& filename)
// Returns 0 if none or if there's a problem.
// filterStr is in the form: "All files (*.*)|*.*|JPEG Files (*.jpeg)|*.jpeg"
int WXDLLEXPORT wxParseCommonDialogsFilter(const wxString& filterStr,
int WXDLLIMPEXP_BASE wxParseCommonDialogsFilter(const wxString& filterStr,
wxArrayString& descriptions,
wxArrayString& filters)
{

16
src/common/log.cpp
View File

@ -385,13 +385,13 @@ static inline wxString wxLogSysErrorHelper(long err)
return wxString::Format(_(" (error %ld: %s)"), err, wxSysErrorMsg(err));
}
void WXDLLEXPORT wxVLogSysError(const wxString& format, va_list argptr)
void WXDLLIMPEXP_BASE wxVLogSysError(const wxString& format, va_list argptr)
{
wxVLogSysError(wxSysErrorCode(), format, argptr);
}
#if !wxUSE_UTF8_LOCALE_ONLY
void WXDLLEXPORT wxDoLogSysErrorWchar(const wxChar *format, ...)
void WXDLLIMPEXP_BASE wxDoLogSysErrorWchar(const wxChar *format, ...)
{
va_list argptr;
va_start(argptr, format);
@ -401,7 +401,7 @@ void WXDLLEXPORT wxDoLogSysErrorWchar(const wxChar *format, ...)
#endif // !wxUSE_UTF8_LOCALE_ONLY
#if wxUSE_UNICODE_UTF8
void WXDLLEXPORT wxDoLogSysErrorUtf8(const char *format, ...)
void WXDLLIMPEXP_BASE wxDoLogSysErrorUtf8(const char *format, ...)
{
va_list argptr;
va_start(argptr, format);
@ -410,7 +410,7 @@ void WXDLLEXPORT wxDoLogSysErrorUtf8(const char *format, ...)
}
#endif // wxUSE_UNICODE_UTF8
void WXDLLEXPORT wxVLogSysError(long err, const wxString& format, va_list argptr)
void WXDLLIMPEXP_BASE wxVLogSysError(long err, const wxString& format, va_list argptr)
{
if ( wxLog::IsEnabled() ) {
wxLog::OnLog(wxLOG_Error,
@ -420,7 +420,7 @@ void WXDLLEXPORT wxVLogSysError(long err, const wxString& format, va_list argptr
}
#if !wxUSE_UTF8_LOCALE_ONLY
void WXDLLEXPORT wxDoLogSysErrorWchar(long lErrCode, const wxChar *format, ...)
void WXDLLIMPEXP_BASE wxDoLogSysErrorWchar(long lErrCode, const wxChar *format, ...)
{
va_list argptr;
va_start(argptr, format);
@ -430,7 +430,7 @@ void WXDLLEXPORT wxDoLogSysErrorWchar(long lErrCode, const wxChar *format, ...)
#endif // !wxUSE_UTF8_LOCALE_ONLY
#if wxUSE_UNICODE_UTF8
void WXDLLEXPORT wxDoLogSysErrorUtf8(long lErrCode, const char *format, ...)
void WXDLLIMPEXP_BASE wxDoLogSysErrorUtf8(long lErrCode, const char *format, ...)
{
va_list argptr;
va_start(argptr, format);
@ -441,7 +441,7 @@ void WXDLLEXPORT wxDoLogSysErrorUtf8(long lErrCode, const char *format, ...)
#ifdef __WATCOMC__
// workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351
void WXDLLEXPORT wxDoLogSysErrorWchar(unsigned long lErrCode, const wxChar *format, ...)
void WXDLLIMPEXP_BASE wxDoLogSysErrorWchar(unsigned long lErrCode, const wxChar *format, ...)
{
va_list argptr;
va_start(argptr, format);
@ -449,7 +449,7 @@ void WXDLLEXPORT wxDoLogSysErrorWchar(unsigned long lErrCode, const wxChar *form
va_end(argptr);
}
void WXDLLEXPORT wxVLogSysError(unsigned long err, const wxString& format, va_list argptr)
void WXDLLIMPEXP_BASE wxVLogSysError(unsigned long err, const wxString& format, va_list argptr)
{ wxVLogSysError((long)err, format, argptr); }
#endif // __WATCOMC__

2
src/msw/snglinst.cpp
View File

@ -40,7 +40,7 @@
// wxSingleInstanceCheckerImpl: the real implementation class
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxSingleInstanceCheckerImpl
class WXDLLIMPEXP_BASE wxSingleInstanceCheckerImpl
{
public:
wxSingleInstanceCheckerImpl()