From 968eb2ef396c78442ffea7a2463f3777ca6d1632 Mon Sep 17 00:00:00 2001 From: Michael Wetherell Date: Tue, 2 Aug 2005 18:16:51 +0000 Subject: [PATCH 1/1] Add import/export macros git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35052 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/generic/caret.h | 4 ++-- include/wx/sckipc.h | 4 ++-- include/wx/unix/sound.h | 12 ++++++------ include/wx/utils.h | 11 ++++++++--- include/wx/x11/bitmap.h | 10 +++++----- include/wx/x11/brush.h | 8 ++++---- include/wx/x11/clipbrd.h | 2 +- include/wx/x11/colour.h | 10 +++++----- include/wx/x11/cursor.h | 2 +- include/wx/x11/dataform.h | 2 +- include/wx/x11/dataobj.h | 2 +- include/wx/x11/dataobj2.h | 4 ++-- include/wx/x11/dcclient.h | 14 +++++++------- include/wx/x11/dcmemory.h | 2 +- include/wx/x11/dcscreen.h | 2 +- include/wx/x11/font.h | 2 +- include/wx/x11/icon.h | 2 +- include/wx/x11/pen.h | 8 ++++---- include/wx/x11/popupwin.h | 2 +- include/wx/x11/private.h | 6 +++--- include/wx/x11/privx.h | 8 ++++---- include/wx/x11/region.h | 6 +++--- include/wx/x11/reparent.h | 6 +++--- include/wx/x11/textctrl.h | 4 ++-- include/wx/x11/window.h | 2 +- 25 files changed, 70 insertions(+), 65 deletions(-) diff --git a/include/wx/generic/caret.h b/include/wx/generic/caret.h index 96677b46d1..d69587dc72 100644 --- a/include/wx/generic/caret.h +++ b/include/wx/generic/caret.h @@ -18,7 +18,7 @@ #include "wx/timer.h" -class wxCaret; +class WXDLLIMPEXP_CORE wxCaret; class WXDLLEXPORT wxCaretTimer : public wxTimer { @@ -30,7 +30,7 @@ private: wxCaret *m_caret; }; -class wxCaret : public wxCaretBase +class WXDLLIMPEXP_CORE wxCaret : public wxCaretBase { public: // ctors diff --git a/include/wx/sckipc.h b/include/wx/sckipc.h index 25f7477646..ab06fb943e 100644 --- a/include/wx/sckipc.h +++ b/include/wx/sckipc.h @@ -106,7 +106,7 @@ private: DECLARE_NO_COPY_CLASS(wxTCPConnection) }; -class wxTCPServer: public wxServerBase +class WXDLLIMPEXP_NET wxTCPServer: public wxServerBase { DECLARE_DYNAMIC_CLASS(wxTCPServer) @@ -133,7 +133,7 @@ protected: DECLARE_NO_COPY_CLASS(wxTCPServer) }; -class wxTCPClient: public wxClientBase +class WXDLLIMPEXP_NET wxTCPClient: public wxClientBase { DECLARE_DYNAMIC_CLASS(wxTCPClient) diff --git a/include/wx/unix/sound.h b/include/wx/unix/sound.h index 6b0050ffdb..2ebb2e53c6 100644 --- a/include/wx/unix/sound.h +++ b/include/wx/unix/sound.h @@ -26,12 +26,12 @@ // wxSound: simple audio playback class // ---------------------------------------------------------------------------- -class wxSoundBackend; -class wxSound; -class wxDynamicLibrary; +class WXDLLIMPEXP_ADV wxSoundBackend; +class WXDLLIMPEXP_ADV wxSound; +class WXDLLIMPEXP_BASE wxDynamicLibrary; /// Sound data, as loaded from .wav file: -class wxSoundData +class WXDLLIMPEXP_ADV wxSoundData { public: wxSoundData() : m_refCnt(1) {} @@ -59,7 +59,7 @@ private: /// Simple sound class: -class wxSound : public wxSoundBase +class WXDLLIMPEXP_ADV wxSound : public wxSoundBase { public: wxSound(); @@ -121,7 +121,7 @@ struct wxSoundPlaybackStatus }; // Audio backend interface -class wxSoundBackend +class WXDLLIMPEXP_ADV wxSoundBackend { public: virtual ~wxSoundBackend() {} diff --git a/include/wx/utils.h b/include/wx/utils.h index d07359eca9..db44a049e6 100644 --- a/include/wx/utils.h +++ b/include/wx/utils.h @@ -90,7 +90,12 @@ wxDEPRECATED( WXDLLIMPEXP_BASE wxChar* copystring(const wxChar *s) ); // ---------------------------------------------------------------------------- // Sound the bell +#if !defined __EMX__ && \ + (defined __WXMOTIF__ || defined __WXGTK__ || defined __WXX11__) +WXDLLIMPEXP_CORE void wxBell(); +#else WXDLLIMPEXP_BASE void wxBell(); +#endif // Get OS description as a user-readable string WXDLLIMPEXP_BASE wxString wxGetOsDescription(); @@ -523,9 +528,9 @@ void WXDLLEXPORT wxGetMousePosition( int* x, int* y ); #endif #ifdef __X__ - WXDisplay *wxGetDisplay(); - bool wxSetDisplay(const wxString& display_name); - wxString wxGetDisplayName(); + WXDLLIMPEXP_CORE WXDisplay *wxGetDisplay(); + WXDLLIMPEXP_CORE bool wxSetDisplay(const wxString& display_name); + WXDLLIMPEXP_CORE wxString wxGetDisplayName(); #endif // X or GTK+ #ifdef __X__ diff --git a/include/wx/x11/bitmap.h b/include/wx/x11/bitmap.h index c7a746e2e7..5d01d42685 100644 --- a/include/wx/x11/bitmap.h +++ b/include/wx/x11/bitmap.h @@ -26,15 +26,15 @@ // classes //----------------------------------------------------------------------------- -class wxMask; -class wxBitmap; -class wxImage; +class WXDLLIMPEXP_CORE wxMask; +class WXDLLIMPEXP_CORE wxBitmap; +class WXDLLIMPEXP_CORE wxImage; //----------------------------------------------------------------------------- // wxMask //----------------------------------------------------------------------------- -class wxMask: public wxObject +class WXDLLIMPEXP_CORE wxMask: public wxObject { public: wxMask(); @@ -74,7 +74,7 @@ private: DECLARE_DYNAMIC_CLASS(wxBitmapHandler) }; -class wxBitmap: public wxBitmapBase +class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase { public: wxBitmap(); diff --git a/include/wx/x11/brush.h b/include/wx/x11/brush.h index 58160f1fc3..85c9d97124 100644 --- a/include/wx/x11/brush.h +++ b/include/wx/x11/brush.h @@ -22,15 +22,15 @@ // classes //----------------------------------------------------------------------------- -class wxBrush; -class wxColour; -class wxBitmap; +class WXDLLIMPEXP_CORE wxBrush; +class WXDLLIMPEXP_CORE wxColour; +class WXDLLIMPEXP_CORE wxBitmap; //----------------------------------------------------------------------------- // wxBrush //----------------------------------------------------------------------------- -class wxBrush: public wxBrushBase +class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase { public: wxBrush() { } diff --git a/include/wx/x11/clipbrd.h b/include/wx/x11/clipbrd.h index 981aab4690..eff7593f6e 100644 --- a/include/wx/x11/clipbrd.h +++ b/include/wx/x11/clipbrd.h @@ -27,7 +27,7 @@ // wxClipboard // ---------------------------------------------------------------------------- -class wxClipboard : public wxClipboardBase +class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase { public: wxClipboard(); diff --git a/include/wx/x11/colour.h b/include/wx/x11/colour.h index 357d8657d3..9e33cece1f 100644 --- a/include/wx/x11/colour.h +++ b/include/wx/x11/colour.h @@ -26,12 +26,12 @@ // classes //----------------------------------------------------------------------------- -class wxDC; -class wxPaintDC; -class wxBitmap; -class wxWindow; +class WXDLLIMPEXP_CORE wxDC; +class WXDLLIMPEXP_CORE wxPaintDC; +class WXDLLIMPEXP_CORE wxBitmap; +class WXDLLIMPEXP_CORE wxWindow; -class wxColour; +class WXDLLIMPEXP_CORE wxColour; //----------------------------------------------------------------------------- // wxColour diff --git a/include/wx/x11/cursor.h b/include/wx/x11/cursor.h index e914316b8a..764a8e81cf 100644 --- a/include/wx/x11/cursor.h +++ b/include/wx/x11/cursor.h @@ -26,7 +26,7 @@ // wxCursor //----------------------------------------------------------------------------- -class wxCursor: public wxObject +class WXDLLIMPEXP_CORE wxCursor: public wxObject { public: diff --git a/include/wx/x11/dataform.h b/include/wx/x11/dataform.h index 006f7b0e38..0e6fed774f 100644 --- a/include/wx/x11/dataform.h +++ b/include/wx/x11/dataform.h @@ -12,7 +12,7 @@ #ifndef _WX_X11_DATAFORM_H #define _WX_X11_DATAFORM_H -class wxDataFormat +class WXDLLIMPEXP_CORE wxDataFormat { public: // the clipboard formats under Xt are Atoms diff --git a/include/wx/x11/dataobj.h b/include/wx/x11/dataobj.h index 885dc31145..97b7df7eb4 100644 --- a/include/wx/x11/dataobj.h +++ b/include/wx/x11/dataobj.h @@ -18,7 +18,7 @@ // wxDataObject is the same as wxDataObjectBase under wxMotif // ---------------------------------------------------------------------------- -class wxDataObject : public wxDataObjectBase +class WXDLLIMPEXP_CORE wxDataObject : public wxDataObjectBase { public: wxDataObject(); diff --git a/include/wx/x11/dataobj2.h b/include/wx/x11/dataobj2.h index db3da090d9..73b1b1bf61 100644 --- a/include/wx/x11/dataobj2.h +++ b/include/wx/x11/dataobj2.h @@ -19,7 +19,7 @@ // wxBitmapDataObject is a specialization of wxDataObject for bitmaps // ---------------------------------------------------------------------------- -class wxBitmapDataObject : public wxBitmapDataObjectBase +class WXDLLIMPEXP_CORE wxBitmapDataObject : public wxBitmapDataObjectBase { public: // ctors @@ -63,7 +63,7 @@ private: // wxFileDataObject is a specialization of wxDataObject for file names // ---------------------------------------------------------------------------- -class wxFileDataObject : public wxFileDataObjectBase +class WXDLLIMPEXP_CORE wxFileDataObject : public wxFileDataObjectBase { public: // implement base class pure virtuals diff --git a/include/wx/x11/dcclient.h b/include/wx/x11/dcclient.h index 3dd5f19b50..717ef91ea2 100644 --- a/include/wx/x11/dcclient.h +++ b/include/wx/x11/dcclient.h @@ -23,17 +23,17 @@ // fwd declarations // ----------------------------------------------------------------------------- -class wxWindow; +class WXDLLIMPEXP_CORE wxWindow; -class wxWindowDC; -class wxPaintDC; -class wxClientDC; +class WXDLLIMPEXP_CORE wxWindowDC; +class WXDLLIMPEXP_CORE wxPaintDC; +class WXDLLIMPEXP_CORE wxClientDC; //----------------------------------------------------------------------------- // wxWindowDC //----------------------------------------------------------------------------- -class wxWindowDC : public wxDC +class WXDLLIMPEXP_CORE wxWindowDC : public wxDC { public: wxWindowDC(); @@ -150,7 +150,7 @@ private: // wxClientDC //----------------------------------------------------------------------------- -class wxClientDC : public wxWindowDC +class WXDLLIMPEXP_CORE wxClientDC : public wxWindowDC { public: wxClientDC() { } @@ -167,7 +167,7 @@ private: // wxPaintDC //----------------------------------------------------------------------------- -class wxPaintDC : public wxClientDC +class WXDLLIMPEXP_CORE wxPaintDC : public wxClientDC { public: wxPaintDC() { } diff --git a/include/wx/x11/dcmemory.h b/include/wx/x11/dcmemory.h index 50259bbdf6..a9ad424435 100644 --- a/include/wx/x11/dcmemory.h +++ b/include/wx/x11/dcmemory.h @@ -18,7 +18,7 @@ #include "wx/dcclient.h" -class wxMemoryDC : public wxWindowDC +class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC { public: wxMemoryDC(); diff --git a/include/wx/x11/dcscreen.h b/include/wx/x11/dcscreen.h index b1c32801f5..0fd97e1dda 100644 --- a/include/wx/x11/dcscreen.h +++ b/include/wx/x11/dcscreen.h @@ -22,7 +22,7 @@ // wxScreenDC //----------------------------------------------------------------------------- -class wxScreenDC : public wxPaintDC +class WXDLLIMPEXP_CORE wxScreenDC : public wxPaintDC { public: wxScreenDC(); diff --git a/include/wx/x11/font.h b/include/wx/x11/font.h index d2ee13045a..561f72ebae 100644 --- a/include/wx/x11/font.h +++ b/include/wx/x11/font.h @@ -19,7 +19,7 @@ class wxXFont; // Font -class wxFont : public wxFontBase +class WXDLLIMPEXP_CORE wxFont : public wxFontBase { public: // ctors and such diff --git a/include/wx/x11/icon.h b/include/wx/x11/icon.h index c9f867a6a7..7ced9173c5 100644 --- a/include/wx/x11/icon.h +++ b/include/wx/x11/icon.h @@ -22,7 +22,7 @@ // wxIcon //----------------------------------------------------------------------------- -class wxIcon: public wxBitmap +class WXDLLIMPEXP_CORE wxIcon: public wxBitmap { public: wxIcon(); diff --git a/include/wx/x11/pen.h b/include/wx/x11/pen.h index 7b7937c264..0eb56b2bf5 100644 --- a/include/wx/x11/pen.h +++ b/include/wx/x11/pen.h @@ -23,9 +23,9 @@ // classes //----------------------------------------------------------------------------- -class wxPen; -class wxColour; -class wxBitmap; +class WXDLLIMPEXP_CORE wxPen; +class WXDLLIMPEXP_CORE wxColour; +class WXDLLIMPEXP_CORE wxBitmap; typedef char wxX11Dash; @@ -33,7 +33,7 @@ typedef char wxX11Dash; // wxPen //----------------------------------------------------------------------------- -class wxPen: public wxGDIObject +class WXDLLIMPEXP_CORE wxPen: public wxGDIObject { public: wxPen() { } diff --git a/include/wx/x11/popupwin.h b/include/wx/x11/popupwin.h index 6cb6d721e9..60852edfd8 100644 --- a/include/wx/x11/popupwin.h +++ b/include/wx/x11/popupwin.h @@ -23,7 +23,7 @@ // wxPopUpWindow //----------------------------------------------------------------------------- -class wxPopupWindow: public wxPopupWindowBase +class WXDLLIMPEXP_CORE wxPopupWindow: public wxPopupWindowBase { public: wxPopupWindow() { } diff --git a/include/wx/x11/private.h b/include/wx/x11/private.h index 80596e6bbd..5d5814b0d7 100644 --- a/include/wx/x11/private.h +++ b/include/wx/x11/private.h @@ -32,9 +32,9 @@ #include "pango/pango.h" #endif -class wxMouseEvent; -class wxKeyEvent; -class wxWindow; +class WXDLLIMPEXP_CORE wxMouseEvent; +class WXDLLIMPEXP_CORE wxKeyEvent; +class WXDLLIMPEXP_CORE wxWindow; // ---------------------------------------------------------------------------- // Some Unicode <-> UTF8 macros stolen from GTK diff --git a/include/wx/x11/privx.h b/include/wx/x11/privx.h index 6a9c5336be..658ee94b34 100644 --- a/include/wx/x11/privx.h +++ b/include/wx/x11/privx.h @@ -26,10 +26,10 @@ #pragma message enable nosimpint #endif -class wxMouseEvent; -class wxKeyEvent; -class wxWindow; -class wxRegion; +class WXDLLIMPEXP_CORE wxMouseEvent; +class WXDLLIMPEXP_CORE wxKeyEvent; +class WXDLLIMPEXP_CORE wxWindow; +class WXDLLIMPEXP_CORE wxRegion; // ---------------------------------------------------------------------------- // key events related functions diff --git a/include/wx/x11/region.h b/include/wx/x11/region.h index c9ff21e4b4..7fd888d7aa 100644 --- a/include/wx/x11/region.h +++ b/include/wx/x11/region.h @@ -24,7 +24,7 @@ // classes //----------------------------------------------------------------------------- -class wxRegion; +class WXDLLIMPEXP_CORE wxRegion; //----------------------------------------------------------------------------- // constants @@ -51,7 +51,7 @@ enum wxRegionOp // wxRegion // ---------------------------------------------------------------------------- -class wxRegion : public wxGDIObject +class WXDLLIMPEXP_CORE wxRegion : public wxGDIObject { public: wxRegion() { } @@ -158,7 +158,7 @@ private: // wxRegionIterator: decomposes a region into rectangles // ---------------------------------------------------------------------------- -class wxRegionIterator: public wxObject +class WXDLLIMPEXP_CORE wxRegionIterator: public wxObject { public: wxRegionIterator(); diff --git a/include/wx/x11/reparent.h b/include/wx/x11/reparent.h index b98f70c918..6956c7eed9 100644 --- a/include/wx/x11/reparent.h +++ b/include/wx/x11/reparent.h @@ -22,8 +22,8 @@ * This class helps to reparent a specific window */ -class wxAdoptedWindow; -class wxReparenter: public wxObject +class WXDLLIMPEXP_CORE wxAdoptedWindow; +class WXDLLIMPEXP_CORE wxReparenter: public wxObject { public: wxReparenter() {} @@ -56,7 +56,7 @@ protected: * toolkit. It has no parent until reparented. */ -class wxAdoptedWindow: public wxWindow +class WXDLLIMPEXP_CORE wxAdoptedWindow: public wxWindow { public: wxAdoptedWindow(); diff --git a/include/wx/x11/textctrl.h b/include/wx/x11/textctrl.h index 2e3b528c74..01571cd0c3 100644 --- a/include/wx/x11/textctrl.h +++ b/include/wx/x11/textctrl.h @@ -31,7 +31,7 @@ // classes //----------------------------------------------------------------------------- -class wxTextCtrl; +class WXDLLIMPEXP_CORE wxTextCtrl; //----------------------------------------------------------------------------- // helpers @@ -89,7 +89,7 @@ enum wxSourceLanguage // wxTextCtrl //----------------------------------------------------------------------------- -class wxTextCtrl: public wxTextCtrlBase, public wxScrollHelper +class WXDLLIMPEXP_CORE wxTextCtrl: public wxTextCtrlBase, public wxScrollHelper { public: wxTextCtrl() { Init(); } diff --git a/include/wx/x11/window.h b/include/wx/x11/window.h index b4642112b5..829809811d 100644 --- a/include/wx/x11/window.h +++ b/include/wx/x11/window.h @@ -22,7 +22,7 @@ // wxWindow class for Motif - see also wxWindowBase // ---------------------------------------------------------------------------- -class wxWindowX11 : public wxWindowBase +class WXDLLIMPEXP_CORE wxWindowX11 : public wxWindowBase { friend class WXDLLEXPORT wxDC; friend class WXDLLEXPORT wxWindowDC; -- 2.45.2