Add import/export macros

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35052 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2005-08-02 18:16:51 +00:00
parent d98c97a36a
commit 968eb2ef39
25 changed files with 70 additions and 65 deletions

View File

@@ -18,7 +18,7 @@
#include "wx/timer.h" #include "wx/timer.h"
class wxCaret; class WXDLLIMPEXP_CORE wxCaret;
class WXDLLEXPORT wxCaretTimer : public wxTimer class WXDLLEXPORT wxCaretTimer : public wxTimer
{ {
@@ -30,7 +30,7 @@ private:
wxCaret *m_caret; wxCaret *m_caret;
}; };
class wxCaret : public wxCaretBase class WXDLLIMPEXP_CORE wxCaret : public wxCaretBase
{ {
public: public:
// ctors // ctors

View File

@@ -106,7 +106,7 @@ private:
DECLARE_NO_COPY_CLASS(wxTCPConnection) DECLARE_NO_COPY_CLASS(wxTCPConnection)
}; };
class wxTCPServer: public wxServerBase class WXDLLIMPEXP_NET wxTCPServer: public wxServerBase
{ {
DECLARE_DYNAMIC_CLASS(wxTCPServer) DECLARE_DYNAMIC_CLASS(wxTCPServer)
@@ -133,7 +133,7 @@ protected:
DECLARE_NO_COPY_CLASS(wxTCPServer) DECLARE_NO_COPY_CLASS(wxTCPServer)
}; };
class wxTCPClient: public wxClientBase class WXDLLIMPEXP_NET wxTCPClient: public wxClientBase
{ {
DECLARE_DYNAMIC_CLASS(wxTCPClient) DECLARE_DYNAMIC_CLASS(wxTCPClient)

View File

@@ -26,12 +26,12 @@
// wxSound: simple audio playback class // wxSound: simple audio playback class
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class wxSoundBackend; class WXDLLIMPEXP_ADV wxSoundBackend;
class wxSound; class WXDLLIMPEXP_ADV wxSound;
class wxDynamicLibrary; class WXDLLIMPEXP_BASE wxDynamicLibrary;
/// Sound data, as loaded from .wav file: /// Sound data, as loaded from .wav file:
class wxSoundData class WXDLLIMPEXP_ADV wxSoundData
{ {
public: public:
wxSoundData() : m_refCnt(1) {} wxSoundData() : m_refCnt(1) {}
@@ -59,7 +59,7 @@ private:
/// Simple sound class: /// Simple sound class:
class wxSound : public wxSoundBase class WXDLLIMPEXP_ADV wxSound : public wxSoundBase
{ {
public: public:
wxSound(); wxSound();
@@ -121,7 +121,7 @@ struct wxSoundPlaybackStatus
}; };
// Audio backend interface // Audio backend interface
class wxSoundBackend class WXDLLIMPEXP_ADV wxSoundBackend
{ {
public: public:
virtual ~wxSoundBackend() {} virtual ~wxSoundBackend() {}

View File

@@ -90,7 +90,12 @@ wxDEPRECATED( WXDLLIMPEXP_BASE wxChar* copystring(const wxChar *s) );
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Sound the bell // Sound the bell
#if !defined __EMX__ && \
(defined __WXMOTIF__ || defined __WXGTK__ || defined __WXX11__)
WXDLLIMPEXP_CORE void wxBell();
#else
WXDLLIMPEXP_BASE void wxBell(); WXDLLIMPEXP_BASE void wxBell();
#endif
// Get OS description as a user-readable string // Get OS description as a user-readable string
WXDLLIMPEXP_BASE wxString wxGetOsDescription(); WXDLLIMPEXP_BASE wxString wxGetOsDescription();
@@ -523,9 +528,9 @@ void WXDLLEXPORT wxGetMousePosition( int* x, int* y );
#endif #endif
#ifdef __X__ #ifdef __X__
WXDisplay *wxGetDisplay(); WXDLLIMPEXP_CORE WXDisplay *wxGetDisplay();
bool wxSetDisplay(const wxString& display_name); WXDLLIMPEXP_CORE bool wxSetDisplay(const wxString& display_name);
wxString wxGetDisplayName(); WXDLLIMPEXP_CORE wxString wxGetDisplayName();
#endif // X or GTK+ #endif // X or GTK+
#ifdef __X__ #ifdef __X__

View File

@@ -26,15 +26,15 @@
// classes // classes
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
class wxMask; class WXDLLIMPEXP_CORE wxMask;
class wxBitmap; class WXDLLIMPEXP_CORE wxBitmap;
class wxImage; class WXDLLIMPEXP_CORE wxImage;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxMask // wxMask
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
class wxMask: public wxObject class WXDLLIMPEXP_CORE wxMask: public wxObject
{ {
public: public:
wxMask(); wxMask();
@@ -74,7 +74,7 @@ private:
DECLARE_DYNAMIC_CLASS(wxBitmapHandler) DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
}; };
class wxBitmap: public wxBitmapBase class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase
{ {
public: public:
wxBitmap(); wxBitmap();

View File

@@ -22,15 +22,15 @@
// classes // classes
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
class wxBrush; class WXDLLIMPEXP_CORE wxBrush;
class wxColour; class WXDLLIMPEXP_CORE wxColour;
class wxBitmap; class WXDLLIMPEXP_CORE wxBitmap;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxBrush // wxBrush
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
class wxBrush: public wxBrushBase class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase
{ {
public: public:
wxBrush() { } wxBrush() { }

View File

@@ -27,7 +27,7 @@
// wxClipboard // wxClipboard
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class wxClipboard : public wxClipboardBase class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase
{ {
public: public:
wxClipboard(); wxClipboard();

View File

@@ -26,12 +26,12 @@
// classes // classes
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
class wxDC; class WXDLLIMPEXP_CORE wxDC;
class wxPaintDC; class WXDLLIMPEXP_CORE wxPaintDC;
class wxBitmap; class WXDLLIMPEXP_CORE wxBitmap;
class wxWindow; class WXDLLIMPEXP_CORE wxWindow;
class wxColour; class WXDLLIMPEXP_CORE wxColour;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxColour // wxColour

View File

@@ -26,7 +26,7 @@
// wxCursor // wxCursor
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
class wxCursor: public wxObject class WXDLLIMPEXP_CORE wxCursor: public wxObject
{ {
public: public:

View File

@@ -12,7 +12,7 @@
#ifndef _WX_X11_DATAFORM_H #ifndef _WX_X11_DATAFORM_H
#define _WX_X11_DATAFORM_H #define _WX_X11_DATAFORM_H
class wxDataFormat class WXDLLIMPEXP_CORE wxDataFormat
{ {
public: public:
// the clipboard formats under Xt are Atoms // the clipboard formats under Xt are Atoms

View File

@@ -18,7 +18,7 @@
// wxDataObject is the same as wxDataObjectBase under wxMotif // wxDataObject is the same as wxDataObjectBase under wxMotif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class wxDataObject : public wxDataObjectBase class WXDLLIMPEXP_CORE wxDataObject : public wxDataObjectBase
{ {
public: public:
wxDataObject(); wxDataObject();

View File

@@ -19,7 +19,7 @@
// wxBitmapDataObject is a specialization of wxDataObject for bitmaps // wxBitmapDataObject is a specialization of wxDataObject for bitmaps
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class wxBitmapDataObject : public wxBitmapDataObjectBase class WXDLLIMPEXP_CORE wxBitmapDataObject : public wxBitmapDataObjectBase
{ {
public: public:
// ctors // ctors
@@ -63,7 +63,7 @@ private:
// wxFileDataObject is a specialization of wxDataObject for file names // wxFileDataObject is a specialization of wxDataObject for file names
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class wxFileDataObject : public wxFileDataObjectBase class WXDLLIMPEXP_CORE wxFileDataObject : public wxFileDataObjectBase
{ {
public: public:
// implement base class pure virtuals // implement base class pure virtuals

View File

@@ -23,17 +23,17 @@
// fwd declarations // fwd declarations
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
class wxWindow; class WXDLLIMPEXP_CORE wxWindow;
class wxWindowDC; class WXDLLIMPEXP_CORE wxWindowDC;
class wxPaintDC; class WXDLLIMPEXP_CORE wxPaintDC;
class wxClientDC; class WXDLLIMPEXP_CORE wxClientDC;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxWindowDC // wxWindowDC
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
class wxWindowDC : public wxDC class WXDLLIMPEXP_CORE wxWindowDC : public wxDC
{ {
public: public:
wxWindowDC(); wxWindowDC();
@@ -150,7 +150,7 @@ private:
// wxClientDC // wxClientDC
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
class wxClientDC : public wxWindowDC class WXDLLIMPEXP_CORE wxClientDC : public wxWindowDC
{ {
public: public:
wxClientDC() { } wxClientDC() { }
@@ -167,7 +167,7 @@ private:
// wxPaintDC // wxPaintDC
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
class wxPaintDC : public wxClientDC class WXDLLIMPEXP_CORE wxPaintDC : public wxClientDC
{ {
public: public:
wxPaintDC() { } wxPaintDC() { }

View File

@@ -18,7 +18,7 @@
#include "wx/dcclient.h" #include "wx/dcclient.h"
class wxMemoryDC : public wxWindowDC class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC
{ {
public: public:
wxMemoryDC(); wxMemoryDC();

View File

@@ -22,7 +22,7 @@
// wxScreenDC // wxScreenDC
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
class wxScreenDC : public wxPaintDC class WXDLLIMPEXP_CORE wxScreenDC : public wxPaintDC
{ {
public: public:
wxScreenDC(); wxScreenDC();

View File

@@ -19,7 +19,7 @@
class wxXFont; class wxXFont;
// Font // Font
class wxFont : public wxFontBase class WXDLLIMPEXP_CORE wxFont : public wxFontBase
{ {
public: public:
// ctors and such // ctors and such

View File

@@ -22,7 +22,7 @@
// wxIcon // wxIcon
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
class wxIcon: public wxBitmap class WXDLLIMPEXP_CORE wxIcon: public wxBitmap
{ {
public: public:
wxIcon(); wxIcon();

View File

@@ -23,9 +23,9 @@
// classes // classes
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
class wxPen; class WXDLLIMPEXP_CORE wxPen;
class wxColour; class WXDLLIMPEXP_CORE wxColour;
class wxBitmap; class WXDLLIMPEXP_CORE wxBitmap;
typedef char wxX11Dash; typedef char wxX11Dash;
@@ -33,7 +33,7 @@ typedef char wxX11Dash;
// wxPen // wxPen
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
class wxPen: public wxGDIObject class WXDLLIMPEXP_CORE wxPen: public wxGDIObject
{ {
public: public:
wxPen() { } wxPen() { }

View File

@@ -23,7 +23,7 @@
// wxPopUpWindow // wxPopUpWindow
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
class wxPopupWindow: public wxPopupWindowBase class WXDLLIMPEXP_CORE wxPopupWindow: public wxPopupWindowBase
{ {
public: public:
wxPopupWindow() { } wxPopupWindow() { }

View File

@@ -32,9 +32,9 @@
#include "pango/pango.h" #include "pango/pango.h"
#endif #endif
class wxMouseEvent; class WXDLLIMPEXP_CORE wxMouseEvent;
class wxKeyEvent; class WXDLLIMPEXP_CORE wxKeyEvent;
class wxWindow; class WXDLLIMPEXP_CORE wxWindow;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Some Unicode <-> UTF8 macros stolen from GTK // Some Unicode <-> UTF8 macros stolen from GTK

View File

@@ -26,10 +26,10 @@
#pragma message enable nosimpint #pragma message enable nosimpint
#endif #endif
class wxMouseEvent; class WXDLLIMPEXP_CORE wxMouseEvent;
class wxKeyEvent; class WXDLLIMPEXP_CORE wxKeyEvent;
class wxWindow; class WXDLLIMPEXP_CORE wxWindow;
class wxRegion; class WXDLLIMPEXP_CORE wxRegion;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// key events related functions // key events related functions

View File

@@ -24,7 +24,7 @@
// classes // classes
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
class wxRegion; class WXDLLIMPEXP_CORE wxRegion;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// constants // constants
@@ -51,7 +51,7 @@ enum wxRegionOp
// wxRegion // wxRegion
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class wxRegion : public wxGDIObject class WXDLLIMPEXP_CORE wxRegion : public wxGDIObject
{ {
public: public:
wxRegion() { } wxRegion() { }
@@ -158,7 +158,7 @@ private:
// wxRegionIterator: decomposes a region into rectangles // wxRegionIterator: decomposes a region into rectangles
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class wxRegionIterator: public wxObject class WXDLLIMPEXP_CORE wxRegionIterator: public wxObject
{ {
public: public:
wxRegionIterator(); wxRegionIterator();

View File

@@ -22,8 +22,8 @@
* This class helps to reparent a specific window * This class helps to reparent a specific window
*/ */
class wxAdoptedWindow; class WXDLLIMPEXP_CORE wxAdoptedWindow;
class wxReparenter: public wxObject class WXDLLIMPEXP_CORE wxReparenter: public wxObject
{ {
public: public:
wxReparenter() {} wxReparenter() {}
@@ -56,7 +56,7 @@ protected:
* toolkit. It has no parent until reparented. * toolkit. It has no parent until reparented.
*/ */
class wxAdoptedWindow: public wxWindow class WXDLLIMPEXP_CORE wxAdoptedWindow: public wxWindow
{ {
public: public:
wxAdoptedWindow(); wxAdoptedWindow();

View File

@@ -31,7 +31,7 @@
// classes // classes
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
class wxTextCtrl; class WXDLLIMPEXP_CORE wxTextCtrl;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// helpers // helpers
@@ -89,7 +89,7 @@ enum wxSourceLanguage
// wxTextCtrl // wxTextCtrl
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
class wxTextCtrl: public wxTextCtrlBase, public wxScrollHelper class WXDLLIMPEXP_CORE wxTextCtrl: public wxTextCtrlBase, public wxScrollHelper
{ {
public: public:
wxTextCtrl() { Init(); } wxTextCtrl() { Init(); }

View File

@@ -22,7 +22,7 @@
// wxWindow class for Motif - see also wxWindowBase // wxWindow class for Motif - see also wxWindowBase
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class wxWindowX11 : public wxWindowBase class WXDLLIMPEXP_CORE wxWindowX11 : public wxWindowBase
{ {
friend class WXDLLEXPORT wxDC; friend class WXDLLEXPORT wxDC;
friend class WXDLLEXPORT wxWindowDC; friend class WXDLLEXPORT wxWindowDC;