From 20123d495814b8b8543bf43fbd63aa7ec21e5d78 Mon Sep 17 00:00:00 2001 From: Michael Wetherell Date: Tue, 2 Aug 2005 22:58:06 +0000 Subject: [PATCH] Add import/export attributes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35055 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/generic/paletteg.h | 4 ++-- include/wx/gtk/app.h | 6 +++--- include/wx/gtk/bitmap.h | 12 ++++++------ include/wx/gtk/bmpbuttn.h | 2 +- include/wx/gtk/brush.h | 4 ++-- include/wx/gtk/button.h | 6 +++--- include/wx/gtk/checkbox.h | 2 +- include/wx/gtk/checklst.h | 2 +- include/wx/gtk/choice.h | 2 +- include/wx/gtk/clipbrd.h | 2 +- include/wx/gtk/colour.h | 12 ++++++------ include/wx/gtk/combobox.h | 8 ++++---- include/wx/gtk/control.h | 4 ++-- include/wx/gtk/cursor.h | 2 +- include/wx/gtk/dataform.h | 2 +- include/wx/gtk/dataobj.h | 2 +- include/wx/gtk/dataobj2.h | 4 ++-- include/wx/gtk/dc.h | 4 ++-- include/wx/gtk/dcclient.h | 12 ++++++------ include/wx/gtk/dcmemory.h | 4 ++-- include/wx/gtk/dcscreen.h | 4 ++-- include/wx/gtk/dialog.h | 6 +++--- include/wx/gtk/dnd.h | 14 +++++++------- include/wx/gtk/filedlg.h | 2 +- include/wx/gtk/font.h | 10 +++++----- include/wx/gtk/fontdlg.h | 2 +- include/wx/gtk/frame.h | 14 +++++++------- include/wx/gtk/gauge.h | 6 +++--- include/wx/gtk/gdiobj.h | 2 +- include/wx/gtk/icon.h | 4 ++-- include/wx/gtk/listbox.h | 2 +- include/wx/gtk/mdi.h | 16 ++++++++-------- include/wx/gtk/menu.h | 4 ++-- include/wx/gtk/menuitem.h | 2 +- include/wx/gtk/minifram.h | 4 ++-- include/wx/gtk/notebook.h | 4 ++-- include/wx/gtk/pen.h | 4 ++-- include/wx/gtk/popupwin.h | 2 +- include/wx/gtk/private.h | 2 +- include/wx/gtk/radiobox.h | 2 +- include/wx/gtk/radiobut.h | 2 +- include/wx/gtk/region.h | 6 +++--- include/wx/gtk/scrolbar.h | 4 ++-- include/wx/gtk/slider.h | 2 +- include/wx/gtk/spinbutt.h | 2 +- include/wx/gtk/spinctrl.h | 2 +- include/wx/gtk/statbmp.h | 2 +- include/wx/gtk/statbox.h | 2 +- include/wx/gtk/statline.h | 2 +- include/wx/gtk/stattext.h | 4 ++-- include/wx/gtk/tbargtk.h | 2 +- include/wx/gtk/textctrl.h | 2 +- include/wx/gtk/tglbtn.h | 10 +++++----- include/wx/gtk/timer.h | 2 +- include/wx/gtk/tooltip.h | 6 +++--- include/wx/gtk/toplevel.h | 2 +- include/wx/gtk/treectrl.h | 4 ++-- include/wx/gtk/win_gtk.h | 14 ++++++++++++++ include/wx/gtk/window.h | 6 +++--- include/wx/gtk1/app.h | 6 +++--- include/wx/gtk1/bitmap.h | 12 ++++++------ include/wx/gtk1/bmpbuttn.h | 2 +- include/wx/gtk1/brush.h | 4 ++-- include/wx/gtk1/button.h | 6 +++--- include/wx/gtk1/checkbox.h | 2 +- include/wx/gtk1/checklst.h | 2 +- include/wx/gtk1/choice.h | 2 +- include/wx/gtk1/clipbrd.h | 2 +- include/wx/gtk1/colour.h | 12 ++++++------ include/wx/gtk1/combobox.h | 8 ++++---- include/wx/gtk1/control.h | 4 ++-- include/wx/gtk1/cursor.h | 2 +- include/wx/gtk1/dataform.h | 2 +- include/wx/gtk1/dataobj.h | 2 +- include/wx/gtk1/dataobj2.h | 4 ++-- include/wx/gtk1/dc.h | 4 ++-- include/wx/gtk1/dcclient.h | 12 ++++++------ include/wx/gtk1/dcmemory.h | 4 ++-- include/wx/gtk1/dcscreen.h | 4 ++-- include/wx/gtk1/dialog.h | 6 +++--- include/wx/gtk1/dnd.h | 14 +++++++------- include/wx/gtk1/filedlg.h | 2 +- include/wx/gtk1/font.h | 10 +++++----- include/wx/gtk1/fontdlg.h | 2 +- include/wx/gtk1/frame.h | 14 +++++++------- include/wx/gtk1/gauge.h | 6 +++--- include/wx/gtk1/gdiobj.h | 2 +- include/wx/gtk1/icon.h | 4 ++-- include/wx/gtk1/listbox.h | 2 +- include/wx/gtk1/mdi.h | 16 ++++++++-------- include/wx/gtk1/menu.h | 4 ++-- include/wx/gtk1/menuitem.h | 2 +- include/wx/gtk1/minifram.h | 4 ++-- include/wx/gtk1/notebook.h | 4 ++-- include/wx/gtk1/pen.h | 4 ++-- include/wx/gtk1/popupwin.h | 2 +- include/wx/gtk1/private.h | 2 +- include/wx/gtk1/radiobox.h | 2 +- include/wx/gtk1/radiobut.h | 2 +- include/wx/gtk1/region.h | 6 +++--- include/wx/gtk1/scrolbar.h | 4 ++-- include/wx/gtk1/slider.h | 2 +- include/wx/gtk1/spinbutt.h | 2 +- include/wx/gtk1/spinctrl.h | 2 +- include/wx/gtk1/statbmp.h | 2 +- include/wx/gtk1/statbox.h | 2 +- include/wx/gtk1/statline.h | 2 +- include/wx/gtk1/stattext.h | 4 ++-- include/wx/gtk1/tbargtk.h | 2 +- include/wx/gtk1/textctrl.h | 2 +- include/wx/gtk1/tglbtn.h | 10 +++++----- include/wx/gtk1/timer.h | 2 +- include/wx/gtk1/tooltip.h | 6 +++--- include/wx/gtk1/toplevel.h | 2 +- include/wx/gtk1/treectrl.h | 4 ++-- include/wx/gtk1/win_gtk.h | 14 ++++++++++++++ include/wx/gtk1/window.h | 6 +++--- include/wx/unix/execute.h | 6 +++--- src/gtk/taskbar.cpp | 13 +++++++------ src/gtk/window.cpp | 13 +++++++------ src/gtk1/taskbar.cpp | 13 +++++++------ src/gtk1/window.cpp | 13 +++++++------ 122 files changed, 321 insertions(+), 289 deletions(-) diff --git a/include/wx/generic/paletteg.h b/include/wx/generic/paletteg.h index 54a6b51f73..8160ae7126 100644 --- a/include/wx/generic/paletteg.h +++ b/include/wx/generic/paletteg.h @@ -25,13 +25,13 @@ // classes //----------------------------------------------------------------------------- -class wxPalette; +class WXDLLIMPEXP_CORE wxPalette; //----------------------------------------------------------------------------- // wxPalette //----------------------------------------------------------------------------- -class wxPalette: public wxPaletteBase +class WXDLLIMPEXP_CORE wxPalette: public wxPaletteBase { DECLARE_DYNAMIC_CLASS(wxPalette) diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h index 82ee2dd180..d1e6f63ef5 100644 --- a/include/wx/gtk/app.h +++ b/include/wx/gtk/app.h @@ -22,14 +22,14 @@ // classes //----------------------------------------------------------------------------- -class wxApp; -class wxLog; +class WXDLLIMPEXP_CORE wxApp; +class WXDLLIMPEXP_BASE wxLog; //----------------------------------------------------------------------------- // wxApp //----------------------------------------------------------------------------- -class wxApp: public wxAppBase +class WXDLLIMPEXP_CORE wxApp: public wxAppBase { public: wxApp(); diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h index c3058826d5..3a780c8a70 100644 --- a/include/wx/gtk/bitmap.h +++ b/include/wx/gtk/bitmap.h @@ -31,15 +31,15 @@ class WXDLLEXPORT wxPixelDataBase; // 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(); @@ -65,7 +65,7 @@ private: // wxBitmap //----------------------------------------------------------------------------- -class wxBitmap: public wxBitmapBase +class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase { public: wxBitmap(); @@ -173,7 +173,7 @@ private: // wxBitmapHandler //----------------------------------------------------------------------------- -class wxBitmapHandler: public wxBitmapHandlerBase +class WXDLLIMPEXP_CORE wxBitmapHandler: public wxBitmapHandlerBase { public: wxBitmapHandler() { } diff --git a/include/wx/gtk/bmpbuttn.h b/include/wx/gtk/bmpbuttn.h index f4d71460df..bc3a5cfe16 100644 --- a/include/wx/gtk/bmpbuttn.h +++ b/include/wx/gtk/bmpbuttn.h @@ -19,7 +19,7 @@ // wxBitmapButton // ---------------------------------------------------------------------------- -class wxBitmapButton: public wxBitmapButtonBase +class WXDLLIMPEXP_CORE wxBitmapButton: public wxBitmapButtonBase { public: wxBitmapButton() { Init(); } diff --git a/include/wx/gtk/brush.h b/include/wx/gtk/brush.h index 144bb4a1cb..3a446e000c 100644 --- a/include/wx/gtk/brush.h +++ b/include/wx/gtk/brush.h @@ -25,13 +25,13 @@ // classes //----------------------------------------------------------------------------- -class wxBrush; +class WXDLLIMPEXP_CORE wxBrush; //----------------------------------------------------------------------------- // wxBrush //----------------------------------------------------------------------------- -class wxBrush: public wxBrushBase +class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase { public: wxBrush() { } diff --git a/include/wx/gtk/button.h b/include/wx/gtk/button.h index 0d1c3110c7..e0d5e0d0ee 100644 --- a/include/wx/gtk/button.h +++ b/include/wx/gtk/button.h @@ -23,19 +23,19 @@ // classes //----------------------------------------------------------------------------- -class wxButton; +class WXDLLIMPEXP_CORE wxButton; //----------------------------------------------------------------------------- // global data //----------------------------------------------------------------------------- -extern const wxChar *wxButtonNameStr; +extern WXDLLIMPEXP_CORE const wxChar *wxButtonNameStr; //----------------------------------------------------------------------------- // wxButton //----------------------------------------------------------------------------- -class wxButton: public wxButtonBase +class WXDLLIMPEXP_CORE wxButton: public wxButtonBase { public: wxButton(); diff --git a/include/wx/gtk/checkbox.h b/include/wx/gtk/checkbox.h index bcf031c96e..1e143d15d0 100644 --- a/include/wx/gtk/checkbox.h +++ b/include/wx/gtk/checkbox.h @@ -18,7 +18,7 @@ // wxCheckBox // ---------------------------------------------------------------------------- -class wxCheckBox : public wxCheckBoxBase +class WXDLLIMPEXP_CORE wxCheckBox : public wxCheckBoxBase { public: wxCheckBox(); diff --git a/include/wx/gtk/checklst.h b/include/wx/gtk/checklst.h index b2afb54cf3..b5f57efcd5 100644 --- a/include/wx/gtk/checklst.h +++ b/include/wx/gtk/checklst.h @@ -32,7 +32,7 @@ // wxCheckListBox // ---------------------------------------------------------------------------- -class wxCheckListBox : public wxListBox +class WXDLLIMPEXP_CORE wxCheckListBox : public wxListBox { public: wxCheckListBox(); diff --git a/include/wx/gtk/choice.h b/include/wx/gtk/choice.h index a00f825872..d2b9f17600 100644 --- a/include/wx/gtk/choice.h +++ b/include/wx/gtk/choice.h @@ -21,7 +21,7 @@ class WXDLLIMPEXP_BASE wxArrayString; // wxChoice //----------------------------------------------------------------------------- -class wxChoice : public wxChoiceBase +class WXDLLIMPEXP_CORE wxChoice : public wxChoiceBase { public: wxChoice(); diff --git a/include/wx/gtk/clipbrd.h b/include/wx/gtk/clipbrd.h index 38f7c427c9..921af6681e 100644 --- a/include/wx/gtk/clipbrd.h +++ b/include/wx/gtk/clipbrd.h @@ -27,7 +27,7 @@ // wxClipboard // ---------------------------------------------------------------------------- -class wxClipboard : public wxClipboardBase +class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase { public: wxClipboard(); diff --git a/include/wx/gtk/colour.h b/include/wx/gtk/colour.h index 788466d8e9..3d5fa8c825 100644 --- a/include/wx/gtk/colour.h +++ b/include/wx/gtk/colour.h @@ -25,18 +25,18 @@ // 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 //----------------------------------------------------------------------------- -class wxColour: public wxGDIObject +class WXDLLIMPEXP_CORE wxColour: public wxGDIObject { public: wxColour() { } diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h index 061d74289d..0b9a462b52 100644 --- a/include/wx/gtk/combobox.h +++ b/include/wx/gtk/combobox.h @@ -26,20 +26,20 @@ // classes //----------------------------------------------------------------------------- -class wxComboBox; +class WXDLLIMPEXP_CORE wxComboBox; //----------------------------------------------------------------------------- // global data //----------------------------------------------------------------------------- -extern const wxChar* wxComboBoxNameStr; -extern const wxChar* wxEmptyString; +extern WXDLLIMPEXP_CORE const wxChar* wxComboBoxNameStr; +extern WXDLLIMPEXP_BASE const wxChar* wxEmptyString; //----------------------------------------------------------------------------- // wxComboBox //----------------------------------------------------------------------------- -class wxComboBox : public wxControl, public wxComboBoxBase +class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase { public: inline wxComboBox() {} diff --git a/include/wx/gtk/control.h b/include/wx/gtk/control.h index bcac0a83d8..0bbe956798 100644 --- a/include/wx/gtk/control.h +++ b/include/wx/gtk/control.h @@ -23,7 +23,7 @@ // classes //----------------------------------------------------------------------------- -class wxControl; +class WXDLLIMPEXP_CORE wxControl; //----------------------------------------------------------------------------- // wxControl @@ -36,7 +36,7 @@ extern "C" { typedef GtkWidget* (*wxGtkWidgetNewFromAdj_t)(GtkAdjustment*); } -class wxControl : public wxControlBase +class WXDLLIMPEXP_CORE wxControl : public wxControlBase { public: wxControl(); diff --git a/include/wx/gtk/cursor.h b/include/wx/gtk/cursor.h index 5886b6e20f..f1f7ca00d4 100644 --- a/include/wx/gtk/cursor.h +++ b/include/wx/gtk/cursor.h @@ -27,7 +27,7 @@ // wxCursor //----------------------------------------------------------------------------- -class wxCursor: public wxObject +class WXDLLIMPEXP_CORE wxCursor: public wxObject { public: diff --git a/include/wx/gtk/dataform.h b/include/wx/gtk/dataform.h index 00b2c9f0c0..3b66e3117a 100644 --- a/include/wx/gtk/dataform.h +++ b/include/wx/gtk/dataform.h @@ -12,7 +12,7 @@ #ifndef _WX_GTK_DATAFORM_H #define _WX_GTK_DATAFORM_H -class wxDataFormat +class WXDLLIMPEXP_CORE wxDataFormat { public: // the clipboard formats under GDK are GdkAtoms diff --git a/include/wx/gtk/dataobj.h b/include/wx/gtk/dataobj.h index fa14819b17..ba33924fdd 100644 --- a/include/wx/gtk/dataobj.h +++ b/include/wx/gtk/dataobj.h @@ -18,7 +18,7 @@ // wxDataObject is the same as wxDataObjectBase under wxGTK // ---------------------------------------------------------------------------- -class wxDataObject : public wxDataObjectBase +class WXDLLIMPEXP_CORE wxDataObject : public wxDataObjectBase { public: wxDataObject(); diff --git a/include/wx/gtk/dataobj2.h b/include/wx/gtk/dataobj2.h index dc7bc94bb7..42258ace39 100644 --- a/include/wx/gtk/dataobj2.h +++ b/include/wx/gtk/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/gtk/dc.h b/include/wx/gtk/dc.h index 6022c4d728..a7853b439c 100644 --- a/include/wx/gtk/dc.h +++ b/include/wx/gtk/dc.h @@ -19,7 +19,7 @@ // classes //----------------------------------------------------------------------------- -class wxDC; +class WXDLLIMPEXP_CORE wxDC; //----------------------------------------------------------------------------- // constants @@ -40,7 +40,7 @@ class wxDC; // wxDC //----------------------------------------------------------------------------- -class wxDC : public wxDCBase +class WXDLLIMPEXP_CORE wxDC : public wxDCBase { public: wxDC(); diff --git a/include/wx/gtk/dcclient.h b/include/wx/gtk/dcclient.h index ad9d68325b..70b7d9b38f 100644 --- a/include/wx/gtk/dcclient.h +++ b/include/wx/gtk/dcclient.h @@ -21,15 +21,15 @@ // classes //----------------------------------------------------------------------------- -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(); @@ -140,7 +140,7 @@ private: // wxClientDC //----------------------------------------------------------------------------- -class wxClientDC : public wxWindowDC +class WXDLLIMPEXP_CORE wxClientDC : public wxWindowDC { public: wxClientDC() { } @@ -157,7 +157,7 @@ private: // wxPaintDC //----------------------------------------------------------------------------- -class wxPaintDC : public wxClientDC +class WXDLLIMPEXP_CORE wxPaintDC : public wxClientDC { public: wxPaintDC() { } diff --git a/include/wx/gtk/dcmemory.h b/include/wx/gtk/dcmemory.h index 8658a250eb..891703ebd8 100644 --- a/include/wx/gtk/dcmemory.h +++ b/include/wx/gtk/dcmemory.h @@ -22,13 +22,13 @@ // classes //----------------------------------------------------------------------------- -class wxMemoryDC; +class WXDLLIMPEXP_CORE wxMemoryDC; //----------------------------------------------------------------------------- // wxMemoryDC //----------------------------------------------------------------------------- -class wxMemoryDC : public wxWindowDC +class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC { public: wxMemoryDC(); diff --git a/include/wx/gtk/dcscreen.h b/include/wx/gtk/dcscreen.h index b1cc81a7e6..3b23ae3204 100644 --- a/include/wx/gtk/dcscreen.h +++ b/include/wx/gtk/dcscreen.h @@ -16,13 +16,13 @@ // classes //----------------------------------------------------------------------------- -class wxScreenDC; +class WXDLLIMPEXP_CORE wxScreenDC; //----------------------------------------------------------------------------- // wxScreenDC //----------------------------------------------------------------------------- -class wxScreenDC : public wxPaintDC +class WXDLLIMPEXP_CORE wxScreenDC : public wxPaintDC { public: wxScreenDC(); diff --git a/include/wx/gtk/dialog.h b/include/wx/gtk/dialog.h index 9f30a1c8d8..099dd51d74 100644 --- a/include/wx/gtk/dialog.h +++ b/include/wx/gtk/dialog.h @@ -21,19 +21,19 @@ // classes //----------------------------------------------------------------------------- -class wxDialog; +class WXDLLIMPEXP_CORE wxDialog; //----------------------------------------------------------------------------- // global data //----------------------------------------------------------------------------- -extern const wxChar *wxDialogNameStr; +extern WXDLLIMPEXP_CORE const wxChar *wxDialogNameStr; //----------------------------------------------------------------------------- // wxDialog //----------------------------------------------------------------------------- -class wxDialog: public wxDialogBase +class WXDLLIMPEXP_CORE wxDialog: public wxDialogBase { public: wxDialog() { Init(); } diff --git a/include/wx/gtk/dnd.h b/include/wx/gtk/dnd.h index c2210c23a3..f65580b62f 100644 --- a/include/wx/gtk/dnd.h +++ b/include/wx/gtk/dnd.h @@ -28,13 +28,13 @@ // classes //------------------------------------------------------------------------- -class wxWindow; +class WXDLLIMPEXP_CORE wxWindow; -class wxDropTarget; -class wxTextDropTarget; -class wxFileDropTarget; +class WXDLLIMPEXP_CORE wxDropTarget; +class WXDLLIMPEXP_CORE wxTextDropTarget; +class WXDLLIMPEXP_CORE wxFileDropTarget; -class wxDropSource; +class WXDLLIMPEXP_CORE wxDropSource; // ---------------------------------------------------------------------------- // macros @@ -50,7 +50,7 @@ class wxDropSource; // wxDropTarget //------------------------------------------------------------------------- -class wxDropTarget: public wxDropTargetBase +class WXDLLIMPEXP_CORE wxDropTarget: public wxDropTargetBase { public: wxDropTarget(wxDataObject *dataObject = (wxDataObject*) NULL ); @@ -83,7 +83,7 @@ public: // wxDropSource //------------------------------------------------------------------------- -class wxDropSource: public wxDropSourceBase +class WXDLLIMPEXP_CORE wxDropSource: public wxDropSourceBase { public: // constructor. set data later with SetData() diff --git a/include/wx/gtk/filedlg.h b/include/wx/gtk/filedlg.h index 31b895da18..1978700da3 100644 --- a/include/wx/gtk/filedlg.h +++ b/include/wx/gtk/filedlg.h @@ -21,7 +21,7 @@ // wxFileDialog //------------------------------------------------------------------------- -class wxFileDialog: public wxGenericFileDialog +class WXDLLIMPEXP_CORE wxFileDialog: public wxGenericFileDialog { public: wxFileDialog() { } diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h index 1502d7bf6d..dbfe1b1f00 100644 --- a/include/wx/gtk/font.h +++ b/include/wx/gtk/font.h @@ -20,17 +20,17 @@ // classes // ---------------------------------------------------------------------------- -class wxDC; -class wxPaintDC; -class wxWindow; +class WXDLLIMPEXP_CORE wxDC; +class WXDLLIMPEXP_CORE wxPaintDC; +class WXDLLIMPEXP_CORE wxWindow; -class wxFont; +class WXDLLIMPEXP_CORE wxFont; // ---------------------------------------------------------------------------- // wxFont // ---------------------------------------------------------------------------- -class wxFont : public wxFontBase +class WXDLLIMPEXP_CORE wxFont : public wxFontBase { public: // ctors and such diff --git a/include/wx/gtk/fontdlg.h b/include/wx/gtk/fontdlg.h index 901f458fa2..87662f028b 100644 --- a/include/wx/gtk/fontdlg.h +++ b/include/wx/gtk/fontdlg.h @@ -19,7 +19,7 @@ // wxFontDialog //----------------------------------------------------------------------------- -class wxFontDialog : public wxFontDialogBase +class WXDLLIMPEXP_CORE wxFontDialog : public wxFontDialogBase { public: wxFontDialog() : wxFontDialogBase() { /* must be Create()d later */ } diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h index 3befcf231f..a8f91cb9ce 100644 --- a/include/wx/gtk/frame.h +++ b/include/wx/gtk/frame.h @@ -19,18 +19,18 @@ // classes //----------------------------------------------------------------------------- -class wxMDIChildFrame; -class wxMDIClientWindow; -class wxMenu; -class wxMenuBar; -class wxToolBar; -class wxStatusBar; +class WXDLLIMPEXP_CORE wxMDIChildFrame; +class WXDLLIMPEXP_CORE wxMDIClientWindow; +class WXDLLIMPEXP_CORE wxMenu; +class WXDLLIMPEXP_CORE wxMenuBar; +class WXDLLIMPEXP_CORE wxToolBar; +class WXDLLIMPEXP_CORE wxStatusBar; //----------------------------------------------------------------------------- // wxFrame //----------------------------------------------------------------------------- -class wxFrame : public wxFrameBase +class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase { public: // construction diff --git a/include/wx/gtk/gauge.h b/include/wx/gtk/gauge.h index e00e65d934..46f9cad23b 100644 --- a/include/wx/gtk/gauge.h +++ b/include/wx/gtk/gauge.h @@ -27,19 +27,19 @@ // classes //----------------------------------------------------------------------------- -class wxGauge; +class WXDLLIMPEXP_CORE wxGauge; //----------------------------------------------------------------------------- // global data //----------------------------------------------------------------------------- -extern const wxChar* wxGaugeNameStr; +extern WXDLLIMPEXP_CORE const wxChar* wxGaugeNameStr; //----------------------------------------------------------------------------- // wxGaugeBox //----------------------------------------------------------------------------- -class wxGauge: public wxControl +class WXDLLIMPEXP_CORE wxGauge: public wxControl { public: wxGauge() { Init(); } diff --git a/include/wx/gtk/gdiobj.h b/include/wx/gtk/gdiobj.h index d87d6b9542..1c13ef8172 100644 --- a/include/wx/gtk/gdiobj.h +++ b/include/wx/gtk/gdiobj.h @@ -17,7 +17,7 @@ #pragma interface #endif -class wxGDIObject : public wxObject +class WXDLLIMPEXP_CORE wxGDIObject : public wxObject { public: inline wxGDIObject() { m_visible = FALSE; }; diff --git a/include/wx/gtk/icon.h b/include/wx/gtk/icon.h index 0bcbf462c0..4c6a6a3daa 100644 --- a/include/wx/gtk/icon.h +++ b/include/wx/gtk/icon.h @@ -23,13 +23,13 @@ // classes //----------------------------------------------------------------------------- -class wxIcon; +class WXDLLIMPEXP_CORE wxIcon; //----------------------------------------------------------------------------- // wxIcon //----------------------------------------------------------------------------- -class wxIcon: public wxBitmap +class WXDLLIMPEXP_CORE wxIcon: public wxBitmap { public: wxIcon(); diff --git a/include/wx/gtk/listbox.h b/include/wx/gtk/listbox.h index ad45a72c7d..8612b6ccf4 100644 --- a/include/wx/gtk/listbox.h +++ b/include/wx/gtk/listbox.h @@ -23,7 +23,7 @@ class WXDLLIMPEXP_BASE wxSortedArrayString; // wxListBox //----------------------------------------------------------------------------- -class wxListBox : public wxListBoxBase +class WXDLLIMPEXP_CORE wxListBox : public wxListBoxBase { public: // ctors and such diff --git a/include/wx/gtk/mdi.h b/include/wx/gtk/mdi.h index 991610644e..fc3a5fc76a 100644 --- a/include/wx/gtk/mdi.h +++ b/include/wx/gtk/mdi.h @@ -27,22 +27,22 @@ // classes //----------------------------------------------------------------------------- -class wxMDIParentFrame; -class wxMDIClientWindow; -class wxMDIChildFrame; +class WXDLLIMPEXP_CORE wxMDIParentFrame; +class WXDLLIMPEXP_CORE wxMDIClientWindow; +class WXDLLIMPEXP_CORE wxMDIChildFrame; //----------------------------------------------------------------------------- // global data //----------------------------------------------------------------------------- -extern const wxChar* wxFrameNameStr; -extern const wxChar* wxStatusLineNameStr; +extern WXDLLIMPEXP_CORE const wxChar* wxFrameNameStr; +extern WXDLLIMPEXP_CORE const wxChar* wxStatusLineNameStr; //----------------------------------------------------------------------------- // wxMDIParentFrame //----------------------------------------------------------------------------- -class wxMDIParentFrame: public wxFrame +class WXDLLIMPEXP_CORE wxMDIParentFrame: public wxFrame { public: wxMDIParentFrame() { Init(); } @@ -102,7 +102,7 @@ private: // wxMDIChildFrame //----------------------------------------------------------------------------- -class wxMDIChildFrame: public wxFrame +class WXDLLIMPEXP_CORE wxMDIChildFrame: public wxFrame { public: wxMDIChildFrame(); @@ -205,7 +205,7 @@ private: // wxMDIClientWindow //----------------------------------------------------------------------------- -class wxMDIClientWindow: public wxWindow +class WXDLLIMPEXP_CORE wxMDIClientWindow: public wxWindow { public: wxMDIClientWindow(); diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h index e28b4477e7..dcdba21d72 100644 --- a/include/wx/gtk/menu.h +++ b/include/wx/gtk/menu.h @@ -18,7 +18,7 @@ // wxMenuBar //----------------------------------------------------------------------------- -class wxMenuBar : public wxMenuBarBase +class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase { public: // ctors @@ -65,7 +65,7 @@ private: // wxMenu //----------------------------------------------------------------------------- -class wxMenu : public wxMenuBase +class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase { public: // ctors & dtor diff --git a/include/wx/gtk/menuitem.h b/include/wx/gtk/menuitem.h index 790aa61847..f3a935735c 100644 --- a/include/wx/gtk/menuitem.h +++ b/include/wx/gtk/menuitem.h @@ -20,7 +20,7 @@ // wxMenuItem //----------------------------------------------------------------------------- -class wxMenuItem : public wxMenuItemBase +class WXDLLIMPEXP_CORE wxMenuItem : public wxMenuItemBase { public: wxMenuItem(wxMenu *parentMenu = (wxMenu *)NULL, diff --git a/include/wx/gtk/minifram.h b/include/wx/gtk/minifram.h index 5f62b0af38..df4f6a8790 100644 --- a/include/wx/gtk/minifram.h +++ b/include/wx/gtk/minifram.h @@ -25,13 +25,13 @@ // classes //----------------------------------------------------------------------------- -class wxMiniFrame; +class WXDLLIMPEXP_CORE wxMiniFrame; //----------------------------------------------------------------------------- // wxMiniFrame //----------------------------------------------------------------------------- -class wxMiniFrame: public wxFrame +class WXDLLIMPEXP_CORE wxMiniFrame: public wxFrame { DECLARE_DYNAMIC_CLASS(wxMiniFrame) diff --git a/include/wx/gtk/notebook.h b/include/wx/gtk/notebook.h index 43473dc100..bbb3ff1c9f 100644 --- a/include/wx/gtk/notebook.h +++ b/include/wx/gtk/notebook.h @@ -19,7 +19,7 @@ // internal class //----------------------------------------------------------------------------- -class wxGtkNotebookPage; +class WXDLLIMPEXP_CORE wxGtkNotebookPage; #include "wx/list.h" WX_DECLARE_LIST(wxGtkNotebookPage, wxGtkNotebookPagesList); @@ -28,7 +28,7 @@ WX_DECLARE_LIST(wxGtkNotebookPage, wxGtkNotebookPagesList); // wxNotebook //----------------------------------------------------------------------------- -class wxNotebook : public wxNotebookBase +class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase { public: // default for dynamic class diff --git a/include/wx/gtk/pen.h b/include/wx/gtk/pen.h index e71e01253f..f7df079622 100644 --- a/include/wx/gtk/pen.h +++ b/include/wx/gtk/pen.h @@ -25,7 +25,7 @@ // classes //----------------------------------------------------------------------------- -class wxPen; +class WXDLLIMPEXP_CORE wxPen; #if defined(__WXGTK127__) || defined(__WXGTK20__) typedef gint8 wxGTKDash; @@ -37,7 +37,7 @@ typedef gchar wxGTKDash; // wxPen //----------------------------------------------------------------------------- -class wxPen: public wxGDIObject +class WXDLLIMPEXP_CORE wxPen: public wxGDIObject { public: wxPen() { } diff --git a/include/wx/gtk/popupwin.h b/include/wx/gtk/popupwin.h index e40673b4e6..d101a6e3f1 100644 --- a/include/wx/gtk/popupwin.h +++ b/include/wx/gtk/popupwin.h @@ -23,7 +23,7 @@ // wxPopUpWindow //----------------------------------------------------------------------------- -class wxPopupWindow: public wxPopupWindowBase +class WXDLLIMPEXP_CORE wxPopupWindow: public wxPopupWindowBase { public: wxPopupWindow() { } diff --git a/include/wx/gtk/private.h b/include/wx/gtk/private.h index c943f3ad2d..254dca0a37 100644 --- a/include/wx/gtk/private.h +++ b/include/wx/gtk/private.h @@ -133,7 +133,7 @@ inline wxEventType GtkScrollWinTypeToWx(guint scrollType) #ifdef __WXGTK20__ // Escapes string so that it is valid Pango markup XML string: -wxString wxEscapeStringForPangoMarkup(const wxString& str); +WXDLLIMPEXP_CORE wxString wxEscapeStringForPangoMarkup(const wxString& str); #endif // The declaration for gtk_icon_size_lookup was accidentally ifdefed out in diff --git a/include/wx/gtk/radiobox.h b/include/wx/gtk/radiobox.h index 7d155a6783..3eeb57552b 100644 --- a/include/wx/gtk/radiobox.h +++ b/include/wx/gtk/radiobox.h @@ -21,7 +21,7 @@ // wxRadioBox //----------------------------------------------------------------------------- -class wxRadioBox: public wxControl +class WXDLLIMPEXP_CORE wxRadioBox: public wxControl { public: wxRadioBox() { Init(); } diff --git a/include/wx/gtk/radiobut.h b/include/wx/gtk/radiobut.h index 552286e179..8611d506b8 100644 --- a/include/wx/gtk/radiobut.h +++ b/include/wx/gtk/radiobut.h @@ -19,7 +19,7 @@ // wxRadioButton //----------------------------------------------------------------------------- -class wxRadioButton: public wxControl +class WXDLLIMPEXP_CORE wxRadioButton: public wxControl { public: wxRadioButton() { } diff --git a/include/wx/gtk/region.h b/include/wx/gtk/region.h index 40c7d60d42..11f11ea6f8 100644 --- a/include/wx/gtk/region.h +++ b/include/wx/gtk/region.h @@ -22,7 +22,7 @@ // classes //----------------------------------------------------------------------------- -class wxRegion; +class WXDLLIMPEXP_CORE wxRegion; //----------------------------------------------------------------------------- // constants @@ -49,7 +49,7 @@ enum wxRegionOp // wxRegion // ---------------------------------------------------------------------------- -class wxRegion : public wxGDIObject +class WXDLLIMPEXP_CORE wxRegion : public wxGDIObject { public: wxRegion() { } @@ -162,7 +162,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/gtk/scrolbar.h b/include/wx/gtk/scrolbar.h index 5a8dd5cbc2..7a982bf669 100644 --- a/include/wx/gtk/scrolbar.h +++ b/include/wx/gtk/scrolbar.h @@ -21,13 +21,13 @@ // classes //----------------------------------------------------------------------------- -class wxScrollBar; +class WXDLLIMPEXP_CORE wxScrollBar; //----------------------------------------------------------------------------- // wxScrollBar //----------------------------------------------------------------------------- -class wxScrollBar: public wxScrollBarBase +class WXDLLIMPEXP_CORE wxScrollBar: public wxScrollBarBase { public: wxScrollBar() diff --git a/include/wx/gtk/slider.h b/include/wx/gtk/slider.h index 3ff3ad6ea2..7c1ab92185 100644 --- a/include/wx/gtk/slider.h +++ b/include/wx/gtk/slider.h @@ -18,7 +18,7 @@ // wxSlider // ---------------------------------------------------------------------------- -class wxSlider : public wxSliderBase +class WXDLLIMPEXP_CORE wxSlider : public wxSliderBase { public: wxSlider() { } diff --git a/include/wx/gtk/spinbutt.h b/include/wx/gtk/spinbutt.h index bbf998067d..2c0c3913a7 100644 --- a/include/wx/gtk/spinbutt.h +++ b/include/wx/gtk/spinbutt.h @@ -19,7 +19,7 @@ // wxSpinButton //----------------------------------------------------------------------------- -class wxSpinButton : public wxSpinButtonBase +class WXDLLIMPEXP_CORE wxSpinButton : public wxSpinButtonBase { public: wxSpinButton() { } diff --git a/include/wx/gtk/spinctrl.h b/include/wx/gtk/spinctrl.h index 7ca72d8262..c784b1d05a 100644 --- a/include/wx/gtk/spinctrl.h +++ b/include/wx/gtk/spinctrl.h @@ -25,7 +25,7 @@ // wxSpinCtrl //----------------------------------------------------------------------------- -class wxSpinCtrl : public wxControl +class WXDLLIMPEXP_CORE wxSpinCtrl : public wxControl { public: wxSpinCtrl() {} diff --git a/include/wx/gtk/statbmp.h b/include/wx/gtk/statbmp.h index 8174a8ebf0..241b5352ed 100644 --- a/include/wx/gtk/statbmp.h +++ b/include/wx/gtk/statbmp.h @@ -21,7 +21,7 @@ // wxStaticBitmap //----------------------------------------------------------------------------- -class wxStaticBitmap : public wxStaticBitmapBase +class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase { public: wxStaticBitmap(); diff --git a/include/wx/gtk/statbox.h b/include/wx/gtk/statbox.h index 87b7372b86..015c5280c3 100644 --- a/include/wx/gtk/statbox.h +++ b/include/wx/gtk/statbox.h @@ -19,7 +19,7 @@ // wxStaticBox //----------------------------------------------------------------------------- -class wxStaticBox : public wxStaticBoxBase +class WXDLLIMPEXP_CORE wxStaticBox : public wxStaticBoxBase { public: wxStaticBox(); diff --git a/include/wx/gtk/statline.h b/include/wx/gtk/statline.h index aec5372856..7b6e673728 100644 --- a/include/wx/gtk/statline.h +++ b/include/wx/gtk/statline.h @@ -23,7 +23,7 @@ // wxStaticLine // ---------------------------------------------------------------------------- -class wxStaticLine : public wxStaticLineBase +class WXDLLIMPEXP_CORE wxStaticLine : public wxStaticLineBase { public: wxStaticLine(); diff --git a/include/wx/gtk/stattext.h b/include/wx/gtk/stattext.h index fc7098928b..a39b1c3d4e 100644 --- a/include/wx/gtk/stattext.h +++ b/include/wx/gtk/stattext.h @@ -24,7 +24,7 @@ // classes //----------------------------------------------------------------------------- -class wxStaticText; +class WXDLLIMPEXP_CORE wxStaticText; //----------------------------------------------------------------------------- // global data @@ -34,7 +34,7 @@ class wxStaticText; // wxStaticText //----------------------------------------------------------------------------- -class wxStaticText : public wxControl +class WXDLLIMPEXP_CORE wxStaticText : public wxControl { public: wxStaticText(); diff --git a/include/wx/gtk/tbargtk.h b/include/wx/gtk/tbargtk.h index ce78401588..10ee7d1f3c 100644 --- a/include/wx/gtk/tbargtk.h +++ b/include/wx/gtk/tbargtk.h @@ -20,7 +20,7 @@ // wxToolBar // ---------------------------------------------------------------------------- -class wxToolBar : public wxToolBarBase +class WXDLLIMPEXP_CORE wxToolBar : public wxToolBarBase { public: // construction/destruction diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h index 6a52dba4f3..b55dc917c9 100644 --- a/include/wx/gtk/textctrl.h +++ b/include/wx/gtk/textctrl.h @@ -19,7 +19,7 @@ // wxTextCtrl //----------------------------------------------------------------------------- -class wxTextCtrl: public wxTextCtrlBase +class WXDLLIMPEXP_CORE wxTextCtrl: public wxTextCtrlBase { public: wxTextCtrl() { Init(); } diff --git a/include/wx/gtk/tglbtn.h b/include/wx/gtk/tglbtn.h index 3c5bc6c541..8aa5434314 100644 --- a/include/wx/gtk/tglbtn.h +++ b/include/wx/gtk/tglbtn.h @@ -19,20 +19,20 @@ // classes //----------------------------------------------------------------------------- -class wxToggleButton; -class wxToggleBitmapButton; +class WXDLLIMPEXP_CORE wxToggleButton; +class WXDLLIMPEXP_CORE wxToggleBitmapButton; //----------------------------------------------------------------------------- // global data //----------------------------------------------------------------------------- -extern const wxChar *wxCheckBoxNameStr; +extern WXDLLIMPEXP_CORE const wxChar *wxCheckBoxNameStr; //----------------------------------------------------------------------------- // wxToggleBitmapButton //----------------------------------------------------------------------------- -class wxToggleBitmapButton: public wxControl +class WXDLLIMPEXP_CORE wxToggleBitmapButton: public wxControl { public: // construction/destruction @@ -88,7 +88,7 @@ private: // wxToggleButton //----------------------------------------------------------------------------- -class wxToggleButton: public wxControl +class WXDLLIMPEXP_CORE wxToggleButton: public wxControl { public: // construction/destruction diff --git a/include/wx/gtk/timer.h b/include/wx/gtk/timer.h index 5d006be202..a93dbbe62e 100644 --- a/include/wx/gtk/timer.h +++ b/include/wx/gtk/timer.h @@ -19,7 +19,7 @@ // wxTimer //----------------------------------------------------------------------------- -class wxTimer : public wxTimerBase +class WXDLLIMPEXP_CORE wxTimer : public wxTimerBase { public: wxTimer() { Init(); } diff --git a/include/wx/gtk/tooltip.h b/include/wx/gtk/tooltip.h index 39b2f82fa0..d92f206e82 100644 --- a/include/wx/gtk/tooltip.h +++ b/include/wx/gtk/tooltip.h @@ -22,14 +22,14 @@ // forward declarations //----------------------------------------------------------------------------- -class wxToolTip; -class wxWindow; +class WXDLLIMPEXP_CORE wxToolTip; +class WXDLLIMPEXP_CORE wxWindow; //----------------------------------------------------------------------------- // wxToolTip //----------------------------------------------------------------------------- -class wxToolTip : public wxObject +class WXDLLIMPEXP_CORE wxToolTip : public wxObject { public: // globally change the tooltip parameters diff --git a/include/wx/gtk/toplevel.h b/include/wx/gtk/toplevel.h index 45bfd16771..a701afc13e 100644 --- a/include/wx/gtk/toplevel.h +++ b/include/wx/gtk/toplevel.h @@ -20,7 +20,7 @@ // wxTopLevelWindowGTK //----------------------------------------------------------------------------- -class wxTopLevelWindowGTK : public wxTopLevelWindowBase +class WXDLLIMPEXP_CORE wxTopLevelWindowGTK : public wxTopLevelWindowBase { public: // construction diff --git a/include/wx/gtk/treectrl.h b/include/wx/gtk/treectrl.h index b5452888b6..84b5697f66 100644 --- a/include/wx/gtk/treectrl.h +++ b/include/wx/gtk/treectrl.h @@ -25,13 +25,13 @@ typedef long wxDataType; // fwd decl -class wxImageList; +class WXDLLIMPEXP_CORE wxImageList; struct wxTreeViewItem; // a callback function used for sorting tree items, it should return -1 if the // first item precedes the second, +1 if the second precedes the first or 0 if // they're equivalent -class wxTreeItemData; +class WXDLLIMPEXP_CORE wxTreeItemData; typedef int (*wxTreeItemCmpFunc)(wxTreeItemData *item1, wxTreeItemData *item2); // ---------------------------------------------------------------------------- diff --git a/include/wx/gtk/win_gtk.h b/include/wx/gtk/win_gtk.h index 4f79acfb7f..1ade9a1ae6 100644 --- a/include/wx/gtk/win_gtk.h +++ b/include/wx/gtk/win_gtk.h @@ -23,6 +23,8 @@ extern "C" { #include #endif +#include "wx/dlimpexp.h" + #define GTK_PIZZA(obj) GTK_CHECK_CAST (obj, gtk_pizza_get_type (), GtkPizza) #define GTK_PIZZA_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_pizza_get_type (), GtkPizzaClass) #define GTK_IS_PIZZA(obj) GTK_CHECK_TYPE (obj, gtk_pizza_get_type ()) @@ -82,28 +84,37 @@ struct _GtkPizzaClass GtkAdjustment *vadjustment); }; +WXDLLIMPEXP_CORE GtkType gtk_pizza_get_type (void); +WXDLLIMPEXP_CORE GtkWidget* gtk_pizza_new (void); +WXDLLIMPEXP_CORE void gtk_pizza_set_shadow_type (GtkPizza *pizza, GtkMyShadowType type); +WXDLLIMPEXP_CORE void gtk_pizza_set_clear (GtkPizza *pizza, gboolean clear); +WXDLLIMPEXP_CORE void gtk_pizza_set_filter (GtkPizza *pizza, gboolean use); +WXDLLIMPEXP_CORE void gtk_pizza_set_external (GtkPizza *pizza, gboolean expose); +WXDLLIMPEXP_CORE void gtk_pizza_scroll (GtkPizza *pizza, gint dx, gint dy); +WXDLLIMPEXP_CORE gint gtk_pizza_child_resized (GtkPizza *pizza, GtkWidget *widget); +WXDLLIMPEXP_CORE void gtk_pizza_put (GtkPizza *pizza, GtkWidget *widget, gint x, @@ -111,16 +122,19 @@ void gtk_pizza_put (GtkPizza *pizza, gint width, gint height); +WXDLLIMPEXP_CORE void gtk_pizza_move (GtkPizza *pizza, GtkWidget *widget, gint x, gint y ); +WXDLLIMPEXP_CORE void gtk_pizza_resize (GtkPizza *pizza, GtkWidget *widget, gint width, gint height ); +WXDLLIMPEXP_CORE void gtk_pizza_set_size (GtkPizza *pizza, GtkWidget *widget, gint x, diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h index 607f344c21..2528f768a4 100644 --- a/include/wx/gtk/window.h +++ b/include/wx/gtk/window.h @@ -23,14 +23,14 @@ struct wxGtkIMData; // callback definition for inserting a window (internal) //----------------------------------------------------------------------------- -class wxWindowGTK; +class WXDLLIMPEXP_CORE wxWindowGTK; typedef void (*wxInsertChildFunction)( wxWindowGTK*, wxWindowGTK* ); //----------------------------------------------------------------------------- // wxWindowGTK //----------------------------------------------------------------------------- -class wxWindowGTK : public wxWindowBase +class WXDLLIMPEXP_CORE wxWindowGTK : public wxWindowBase { public: // creating the window @@ -297,6 +297,6 @@ private: DECLARE_NO_COPY_CLASS(wxWindowGTK) }; -extern wxWindow *wxFindFocusedChild(wxWindowGTK *win); +extern WXDLLIMPEXP_CORE wxWindow *wxFindFocusedChild(wxWindowGTK *win); #endif // __GTKWINDOWH__ diff --git a/include/wx/gtk1/app.h b/include/wx/gtk1/app.h index 82ee2dd180..d1e6f63ef5 100644 --- a/include/wx/gtk1/app.h +++ b/include/wx/gtk1/app.h @@ -22,14 +22,14 @@ // classes //----------------------------------------------------------------------------- -class wxApp; -class wxLog; +class WXDLLIMPEXP_CORE wxApp; +class WXDLLIMPEXP_BASE wxLog; //----------------------------------------------------------------------------- // wxApp //----------------------------------------------------------------------------- -class wxApp: public wxAppBase +class WXDLLIMPEXP_CORE wxApp: public wxAppBase { public: wxApp(); diff --git a/include/wx/gtk1/bitmap.h b/include/wx/gtk1/bitmap.h index c3058826d5..3a780c8a70 100644 --- a/include/wx/gtk1/bitmap.h +++ b/include/wx/gtk1/bitmap.h @@ -31,15 +31,15 @@ class WXDLLEXPORT wxPixelDataBase; // 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(); @@ -65,7 +65,7 @@ private: // wxBitmap //----------------------------------------------------------------------------- -class wxBitmap: public wxBitmapBase +class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase { public: wxBitmap(); @@ -173,7 +173,7 @@ private: // wxBitmapHandler //----------------------------------------------------------------------------- -class wxBitmapHandler: public wxBitmapHandlerBase +class WXDLLIMPEXP_CORE wxBitmapHandler: public wxBitmapHandlerBase { public: wxBitmapHandler() { } diff --git a/include/wx/gtk1/bmpbuttn.h b/include/wx/gtk1/bmpbuttn.h index f4d71460df..bc3a5cfe16 100644 --- a/include/wx/gtk1/bmpbuttn.h +++ b/include/wx/gtk1/bmpbuttn.h @@ -19,7 +19,7 @@ // wxBitmapButton // ---------------------------------------------------------------------------- -class wxBitmapButton: public wxBitmapButtonBase +class WXDLLIMPEXP_CORE wxBitmapButton: public wxBitmapButtonBase { public: wxBitmapButton() { Init(); } diff --git a/include/wx/gtk1/brush.h b/include/wx/gtk1/brush.h index 144bb4a1cb..3a446e000c 100644 --- a/include/wx/gtk1/brush.h +++ b/include/wx/gtk1/brush.h @@ -25,13 +25,13 @@ // classes //----------------------------------------------------------------------------- -class wxBrush; +class WXDLLIMPEXP_CORE wxBrush; //----------------------------------------------------------------------------- // wxBrush //----------------------------------------------------------------------------- -class wxBrush: public wxBrushBase +class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase { public: wxBrush() { } diff --git a/include/wx/gtk1/button.h b/include/wx/gtk1/button.h index 0d1c3110c7..e0d5e0d0ee 100644 --- a/include/wx/gtk1/button.h +++ b/include/wx/gtk1/button.h @@ -23,19 +23,19 @@ // classes //----------------------------------------------------------------------------- -class wxButton; +class WXDLLIMPEXP_CORE wxButton; //----------------------------------------------------------------------------- // global data //----------------------------------------------------------------------------- -extern const wxChar *wxButtonNameStr; +extern WXDLLIMPEXP_CORE const wxChar *wxButtonNameStr; //----------------------------------------------------------------------------- // wxButton //----------------------------------------------------------------------------- -class wxButton: public wxButtonBase +class WXDLLIMPEXP_CORE wxButton: public wxButtonBase { public: wxButton(); diff --git a/include/wx/gtk1/checkbox.h b/include/wx/gtk1/checkbox.h index bcf031c96e..1e143d15d0 100644 --- a/include/wx/gtk1/checkbox.h +++ b/include/wx/gtk1/checkbox.h @@ -18,7 +18,7 @@ // wxCheckBox // ---------------------------------------------------------------------------- -class wxCheckBox : public wxCheckBoxBase +class WXDLLIMPEXP_CORE wxCheckBox : public wxCheckBoxBase { public: wxCheckBox(); diff --git a/include/wx/gtk1/checklst.h b/include/wx/gtk1/checklst.h index b2afb54cf3..b5f57efcd5 100644 --- a/include/wx/gtk1/checklst.h +++ b/include/wx/gtk1/checklst.h @@ -32,7 +32,7 @@ // wxCheckListBox // ---------------------------------------------------------------------------- -class wxCheckListBox : public wxListBox +class WXDLLIMPEXP_CORE wxCheckListBox : public wxListBox { public: wxCheckListBox(); diff --git a/include/wx/gtk1/choice.h b/include/wx/gtk1/choice.h index a00f825872..d2b9f17600 100644 --- a/include/wx/gtk1/choice.h +++ b/include/wx/gtk1/choice.h @@ -21,7 +21,7 @@ class WXDLLIMPEXP_BASE wxArrayString; // wxChoice //----------------------------------------------------------------------------- -class wxChoice : public wxChoiceBase +class WXDLLIMPEXP_CORE wxChoice : public wxChoiceBase { public: wxChoice(); diff --git a/include/wx/gtk1/clipbrd.h b/include/wx/gtk1/clipbrd.h index 38f7c427c9..921af6681e 100644 --- a/include/wx/gtk1/clipbrd.h +++ b/include/wx/gtk1/clipbrd.h @@ -27,7 +27,7 @@ // wxClipboard // ---------------------------------------------------------------------------- -class wxClipboard : public wxClipboardBase +class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase { public: wxClipboard(); diff --git a/include/wx/gtk1/colour.h b/include/wx/gtk1/colour.h index 788466d8e9..3d5fa8c825 100644 --- a/include/wx/gtk1/colour.h +++ b/include/wx/gtk1/colour.h @@ -25,18 +25,18 @@ // 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 //----------------------------------------------------------------------------- -class wxColour: public wxGDIObject +class WXDLLIMPEXP_CORE wxColour: public wxGDIObject { public: wxColour() { } diff --git a/include/wx/gtk1/combobox.h b/include/wx/gtk1/combobox.h index 061d74289d..0b9a462b52 100644 --- a/include/wx/gtk1/combobox.h +++ b/include/wx/gtk1/combobox.h @@ -26,20 +26,20 @@ // classes //----------------------------------------------------------------------------- -class wxComboBox; +class WXDLLIMPEXP_CORE wxComboBox; //----------------------------------------------------------------------------- // global data //----------------------------------------------------------------------------- -extern const wxChar* wxComboBoxNameStr; -extern const wxChar* wxEmptyString; +extern WXDLLIMPEXP_CORE const wxChar* wxComboBoxNameStr; +extern WXDLLIMPEXP_BASE const wxChar* wxEmptyString; //----------------------------------------------------------------------------- // wxComboBox //----------------------------------------------------------------------------- -class wxComboBox : public wxControl, public wxComboBoxBase +class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase { public: inline wxComboBox() {} diff --git a/include/wx/gtk1/control.h b/include/wx/gtk1/control.h index bcac0a83d8..0bbe956798 100644 --- a/include/wx/gtk1/control.h +++ b/include/wx/gtk1/control.h @@ -23,7 +23,7 @@ // classes //----------------------------------------------------------------------------- -class wxControl; +class WXDLLIMPEXP_CORE wxControl; //----------------------------------------------------------------------------- // wxControl @@ -36,7 +36,7 @@ extern "C" { typedef GtkWidget* (*wxGtkWidgetNewFromAdj_t)(GtkAdjustment*); } -class wxControl : public wxControlBase +class WXDLLIMPEXP_CORE wxControl : public wxControlBase { public: wxControl(); diff --git a/include/wx/gtk1/cursor.h b/include/wx/gtk1/cursor.h index 5886b6e20f..f1f7ca00d4 100644 --- a/include/wx/gtk1/cursor.h +++ b/include/wx/gtk1/cursor.h @@ -27,7 +27,7 @@ // wxCursor //----------------------------------------------------------------------------- -class wxCursor: public wxObject +class WXDLLIMPEXP_CORE wxCursor: public wxObject { public: diff --git a/include/wx/gtk1/dataform.h b/include/wx/gtk1/dataform.h index 00b2c9f0c0..3b66e3117a 100644 --- a/include/wx/gtk1/dataform.h +++ b/include/wx/gtk1/dataform.h @@ -12,7 +12,7 @@ #ifndef _WX_GTK_DATAFORM_H #define _WX_GTK_DATAFORM_H -class wxDataFormat +class WXDLLIMPEXP_CORE wxDataFormat { public: // the clipboard formats under GDK are GdkAtoms diff --git a/include/wx/gtk1/dataobj.h b/include/wx/gtk1/dataobj.h index fa14819b17..ba33924fdd 100644 --- a/include/wx/gtk1/dataobj.h +++ b/include/wx/gtk1/dataobj.h @@ -18,7 +18,7 @@ // wxDataObject is the same as wxDataObjectBase under wxGTK // ---------------------------------------------------------------------------- -class wxDataObject : public wxDataObjectBase +class WXDLLIMPEXP_CORE wxDataObject : public wxDataObjectBase { public: wxDataObject(); diff --git a/include/wx/gtk1/dataobj2.h b/include/wx/gtk1/dataobj2.h index dc7bc94bb7..42258ace39 100644 --- a/include/wx/gtk1/dataobj2.h +++ b/include/wx/gtk1/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/gtk1/dc.h b/include/wx/gtk1/dc.h index 6022c4d728..a7853b439c 100644 --- a/include/wx/gtk1/dc.h +++ b/include/wx/gtk1/dc.h @@ -19,7 +19,7 @@ // classes //----------------------------------------------------------------------------- -class wxDC; +class WXDLLIMPEXP_CORE wxDC; //----------------------------------------------------------------------------- // constants @@ -40,7 +40,7 @@ class wxDC; // wxDC //----------------------------------------------------------------------------- -class wxDC : public wxDCBase +class WXDLLIMPEXP_CORE wxDC : public wxDCBase { public: wxDC(); diff --git a/include/wx/gtk1/dcclient.h b/include/wx/gtk1/dcclient.h index ad9d68325b..70b7d9b38f 100644 --- a/include/wx/gtk1/dcclient.h +++ b/include/wx/gtk1/dcclient.h @@ -21,15 +21,15 @@ // classes //----------------------------------------------------------------------------- -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(); @@ -140,7 +140,7 @@ private: // wxClientDC //----------------------------------------------------------------------------- -class wxClientDC : public wxWindowDC +class WXDLLIMPEXP_CORE wxClientDC : public wxWindowDC { public: wxClientDC() { } @@ -157,7 +157,7 @@ private: // wxPaintDC //----------------------------------------------------------------------------- -class wxPaintDC : public wxClientDC +class WXDLLIMPEXP_CORE wxPaintDC : public wxClientDC { public: wxPaintDC() { } diff --git a/include/wx/gtk1/dcmemory.h b/include/wx/gtk1/dcmemory.h index 8658a250eb..891703ebd8 100644 --- a/include/wx/gtk1/dcmemory.h +++ b/include/wx/gtk1/dcmemory.h @@ -22,13 +22,13 @@ // classes //----------------------------------------------------------------------------- -class wxMemoryDC; +class WXDLLIMPEXP_CORE wxMemoryDC; //----------------------------------------------------------------------------- // wxMemoryDC //----------------------------------------------------------------------------- -class wxMemoryDC : public wxWindowDC +class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC { public: wxMemoryDC(); diff --git a/include/wx/gtk1/dcscreen.h b/include/wx/gtk1/dcscreen.h index b1cc81a7e6..3b23ae3204 100644 --- a/include/wx/gtk1/dcscreen.h +++ b/include/wx/gtk1/dcscreen.h @@ -16,13 +16,13 @@ // classes //----------------------------------------------------------------------------- -class wxScreenDC; +class WXDLLIMPEXP_CORE wxScreenDC; //----------------------------------------------------------------------------- // wxScreenDC //----------------------------------------------------------------------------- -class wxScreenDC : public wxPaintDC +class WXDLLIMPEXP_CORE wxScreenDC : public wxPaintDC { public: wxScreenDC(); diff --git a/include/wx/gtk1/dialog.h b/include/wx/gtk1/dialog.h index 9f30a1c8d8..099dd51d74 100644 --- a/include/wx/gtk1/dialog.h +++ b/include/wx/gtk1/dialog.h @@ -21,19 +21,19 @@ // classes //----------------------------------------------------------------------------- -class wxDialog; +class WXDLLIMPEXP_CORE wxDialog; //----------------------------------------------------------------------------- // global data //----------------------------------------------------------------------------- -extern const wxChar *wxDialogNameStr; +extern WXDLLIMPEXP_CORE const wxChar *wxDialogNameStr; //----------------------------------------------------------------------------- // wxDialog //----------------------------------------------------------------------------- -class wxDialog: public wxDialogBase +class WXDLLIMPEXP_CORE wxDialog: public wxDialogBase { public: wxDialog() { Init(); } diff --git a/include/wx/gtk1/dnd.h b/include/wx/gtk1/dnd.h index c2210c23a3..f65580b62f 100644 --- a/include/wx/gtk1/dnd.h +++ b/include/wx/gtk1/dnd.h @@ -28,13 +28,13 @@ // classes //------------------------------------------------------------------------- -class wxWindow; +class WXDLLIMPEXP_CORE wxWindow; -class wxDropTarget; -class wxTextDropTarget; -class wxFileDropTarget; +class WXDLLIMPEXP_CORE wxDropTarget; +class WXDLLIMPEXP_CORE wxTextDropTarget; +class WXDLLIMPEXP_CORE wxFileDropTarget; -class wxDropSource; +class WXDLLIMPEXP_CORE wxDropSource; // ---------------------------------------------------------------------------- // macros @@ -50,7 +50,7 @@ class wxDropSource; // wxDropTarget //------------------------------------------------------------------------- -class wxDropTarget: public wxDropTargetBase +class WXDLLIMPEXP_CORE wxDropTarget: public wxDropTargetBase { public: wxDropTarget(wxDataObject *dataObject = (wxDataObject*) NULL ); @@ -83,7 +83,7 @@ public: // wxDropSource //------------------------------------------------------------------------- -class wxDropSource: public wxDropSourceBase +class WXDLLIMPEXP_CORE wxDropSource: public wxDropSourceBase { public: // constructor. set data later with SetData() diff --git a/include/wx/gtk1/filedlg.h b/include/wx/gtk1/filedlg.h index 31b895da18..1978700da3 100644 --- a/include/wx/gtk1/filedlg.h +++ b/include/wx/gtk1/filedlg.h @@ -21,7 +21,7 @@ // wxFileDialog //------------------------------------------------------------------------- -class wxFileDialog: public wxGenericFileDialog +class WXDLLIMPEXP_CORE wxFileDialog: public wxGenericFileDialog { public: wxFileDialog() { } diff --git a/include/wx/gtk1/font.h b/include/wx/gtk1/font.h index 1502d7bf6d..dbfe1b1f00 100644 --- a/include/wx/gtk1/font.h +++ b/include/wx/gtk1/font.h @@ -20,17 +20,17 @@ // classes // ---------------------------------------------------------------------------- -class wxDC; -class wxPaintDC; -class wxWindow; +class WXDLLIMPEXP_CORE wxDC; +class WXDLLIMPEXP_CORE wxPaintDC; +class WXDLLIMPEXP_CORE wxWindow; -class wxFont; +class WXDLLIMPEXP_CORE wxFont; // ---------------------------------------------------------------------------- // wxFont // ---------------------------------------------------------------------------- -class wxFont : public wxFontBase +class WXDLLIMPEXP_CORE wxFont : public wxFontBase { public: // ctors and such diff --git a/include/wx/gtk1/fontdlg.h b/include/wx/gtk1/fontdlg.h index 901f458fa2..87662f028b 100644 --- a/include/wx/gtk1/fontdlg.h +++ b/include/wx/gtk1/fontdlg.h @@ -19,7 +19,7 @@ // wxFontDialog //----------------------------------------------------------------------------- -class wxFontDialog : public wxFontDialogBase +class WXDLLIMPEXP_CORE wxFontDialog : public wxFontDialogBase { public: wxFontDialog() : wxFontDialogBase() { /* must be Create()d later */ } diff --git a/include/wx/gtk1/frame.h b/include/wx/gtk1/frame.h index 3befcf231f..a8f91cb9ce 100644 --- a/include/wx/gtk1/frame.h +++ b/include/wx/gtk1/frame.h @@ -19,18 +19,18 @@ // classes //----------------------------------------------------------------------------- -class wxMDIChildFrame; -class wxMDIClientWindow; -class wxMenu; -class wxMenuBar; -class wxToolBar; -class wxStatusBar; +class WXDLLIMPEXP_CORE wxMDIChildFrame; +class WXDLLIMPEXP_CORE wxMDIClientWindow; +class WXDLLIMPEXP_CORE wxMenu; +class WXDLLIMPEXP_CORE wxMenuBar; +class WXDLLIMPEXP_CORE wxToolBar; +class WXDLLIMPEXP_CORE wxStatusBar; //----------------------------------------------------------------------------- // wxFrame //----------------------------------------------------------------------------- -class wxFrame : public wxFrameBase +class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase { public: // construction diff --git a/include/wx/gtk1/gauge.h b/include/wx/gtk1/gauge.h index e00e65d934..46f9cad23b 100644 --- a/include/wx/gtk1/gauge.h +++ b/include/wx/gtk1/gauge.h @@ -27,19 +27,19 @@ // classes //----------------------------------------------------------------------------- -class wxGauge; +class WXDLLIMPEXP_CORE wxGauge; //----------------------------------------------------------------------------- // global data //----------------------------------------------------------------------------- -extern const wxChar* wxGaugeNameStr; +extern WXDLLIMPEXP_CORE const wxChar* wxGaugeNameStr; //----------------------------------------------------------------------------- // wxGaugeBox //----------------------------------------------------------------------------- -class wxGauge: public wxControl +class WXDLLIMPEXP_CORE wxGauge: public wxControl { public: wxGauge() { Init(); } diff --git a/include/wx/gtk1/gdiobj.h b/include/wx/gtk1/gdiobj.h index d87d6b9542..1c13ef8172 100644 --- a/include/wx/gtk1/gdiobj.h +++ b/include/wx/gtk1/gdiobj.h @@ -17,7 +17,7 @@ #pragma interface #endif -class wxGDIObject : public wxObject +class WXDLLIMPEXP_CORE wxGDIObject : public wxObject { public: inline wxGDIObject() { m_visible = FALSE; }; diff --git a/include/wx/gtk1/icon.h b/include/wx/gtk1/icon.h index 0bcbf462c0..4c6a6a3daa 100644 --- a/include/wx/gtk1/icon.h +++ b/include/wx/gtk1/icon.h @@ -23,13 +23,13 @@ // classes //----------------------------------------------------------------------------- -class wxIcon; +class WXDLLIMPEXP_CORE wxIcon; //----------------------------------------------------------------------------- // wxIcon //----------------------------------------------------------------------------- -class wxIcon: public wxBitmap +class WXDLLIMPEXP_CORE wxIcon: public wxBitmap { public: wxIcon(); diff --git a/include/wx/gtk1/listbox.h b/include/wx/gtk1/listbox.h index ad45a72c7d..8612b6ccf4 100644 --- a/include/wx/gtk1/listbox.h +++ b/include/wx/gtk1/listbox.h @@ -23,7 +23,7 @@ class WXDLLIMPEXP_BASE wxSortedArrayString; // wxListBox //----------------------------------------------------------------------------- -class wxListBox : public wxListBoxBase +class WXDLLIMPEXP_CORE wxListBox : public wxListBoxBase { public: // ctors and such diff --git a/include/wx/gtk1/mdi.h b/include/wx/gtk1/mdi.h index 991610644e..fc3a5fc76a 100644 --- a/include/wx/gtk1/mdi.h +++ b/include/wx/gtk1/mdi.h @@ -27,22 +27,22 @@ // classes //----------------------------------------------------------------------------- -class wxMDIParentFrame; -class wxMDIClientWindow; -class wxMDIChildFrame; +class WXDLLIMPEXP_CORE wxMDIParentFrame; +class WXDLLIMPEXP_CORE wxMDIClientWindow; +class WXDLLIMPEXP_CORE wxMDIChildFrame; //----------------------------------------------------------------------------- // global data //----------------------------------------------------------------------------- -extern const wxChar* wxFrameNameStr; -extern const wxChar* wxStatusLineNameStr; +extern WXDLLIMPEXP_CORE const wxChar* wxFrameNameStr; +extern WXDLLIMPEXP_CORE const wxChar* wxStatusLineNameStr; //----------------------------------------------------------------------------- // wxMDIParentFrame //----------------------------------------------------------------------------- -class wxMDIParentFrame: public wxFrame +class WXDLLIMPEXP_CORE wxMDIParentFrame: public wxFrame { public: wxMDIParentFrame() { Init(); } @@ -102,7 +102,7 @@ private: // wxMDIChildFrame //----------------------------------------------------------------------------- -class wxMDIChildFrame: public wxFrame +class WXDLLIMPEXP_CORE wxMDIChildFrame: public wxFrame { public: wxMDIChildFrame(); @@ -205,7 +205,7 @@ private: // wxMDIClientWindow //----------------------------------------------------------------------------- -class wxMDIClientWindow: public wxWindow +class WXDLLIMPEXP_CORE wxMDIClientWindow: public wxWindow { public: wxMDIClientWindow(); diff --git a/include/wx/gtk1/menu.h b/include/wx/gtk1/menu.h index e28b4477e7..dcdba21d72 100644 --- a/include/wx/gtk1/menu.h +++ b/include/wx/gtk1/menu.h @@ -18,7 +18,7 @@ // wxMenuBar //----------------------------------------------------------------------------- -class wxMenuBar : public wxMenuBarBase +class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase { public: // ctors @@ -65,7 +65,7 @@ private: // wxMenu //----------------------------------------------------------------------------- -class wxMenu : public wxMenuBase +class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase { public: // ctors & dtor diff --git a/include/wx/gtk1/menuitem.h b/include/wx/gtk1/menuitem.h index 790aa61847..f3a935735c 100644 --- a/include/wx/gtk1/menuitem.h +++ b/include/wx/gtk1/menuitem.h @@ -20,7 +20,7 @@ // wxMenuItem //----------------------------------------------------------------------------- -class wxMenuItem : public wxMenuItemBase +class WXDLLIMPEXP_CORE wxMenuItem : public wxMenuItemBase { public: wxMenuItem(wxMenu *parentMenu = (wxMenu *)NULL, diff --git a/include/wx/gtk1/minifram.h b/include/wx/gtk1/minifram.h index 5f62b0af38..df4f6a8790 100644 --- a/include/wx/gtk1/minifram.h +++ b/include/wx/gtk1/minifram.h @@ -25,13 +25,13 @@ // classes //----------------------------------------------------------------------------- -class wxMiniFrame; +class WXDLLIMPEXP_CORE wxMiniFrame; //----------------------------------------------------------------------------- // wxMiniFrame //----------------------------------------------------------------------------- -class wxMiniFrame: public wxFrame +class WXDLLIMPEXP_CORE wxMiniFrame: public wxFrame { DECLARE_DYNAMIC_CLASS(wxMiniFrame) diff --git a/include/wx/gtk1/notebook.h b/include/wx/gtk1/notebook.h index 43473dc100..bbb3ff1c9f 100644 --- a/include/wx/gtk1/notebook.h +++ b/include/wx/gtk1/notebook.h @@ -19,7 +19,7 @@ // internal class //----------------------------------------------------------------------------- -class wxGtkNotebookPage; +class WXDLLIMPEXP_CORE wxGtkNotebookPage; #include "wx/list.h" WX_DECLARE_LIST(wxGtkNotebookPage, wxGtkNotebookPagesList); @@ -28,7 +28,7 @@ WX_DECLARE_LIST(wxGtkNotebookPage, wxGtkNotebookPagesList); // wxNotebook //----------------------------------------------------------------------------- -class wxNotebook : public wxNotebookBase +class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase { public: // default for dynamic class diff --git a/include/wx/gtk1/pen.h b/include/wx/gtk1/pen.h index e71e01253f..f7df079622 100644 --- a/include/wx/gtk1/pen.h +++ b/include/wx/gtk1/pen.h @@ -25,7 +25,7 @@ // classes //----------------------------------------------------------------------------- -class wxPen; +class WXDLLIMPEXP_CORE wxPen; #if defined(__WXGTK127__) || defined(__WXGTK20__) typedef gint8 wxGTKDash; @@ -37,7 +37,7 @@ typedef gchar wxGTKDash; // wxPen //----------------------------------------------------------------------------- -class wxPen: public wxGDIObject +class WXDLLIMPEXP_CORE wxPen: public wxGDIObject { public: wxPen() { } diff --git a/include/wx/gtk1/popupwin.h b/include/wx/gtk1/popupwin.h index e40673b4e6..d101a6e3f1 100644 --- a/include/wx/gtk1/popupwin.h +++ b/include/wx/gtk1/popupwin.h @@ -23,7 +23,7 @@ // wxPopUpWindow //----------------------------------------------------------------------------- -class wxPopupWindow: public wxPopupWindowBase +class WXDLLIMPEXP_CORE wxPopupWindow: public wxPopupWindowBase { public: wxPopupWindow() { } diff --git a/include/wx/gtk1/private.h b/include/wx/gtk1/private.h index c943f3ad2d..254dca0a37 100644 --- a/include/wx/gtk1/private.h +++ b/include/wx/gtk1/private.h @@ -133,7 +133,7 @@ inline wxEventType GtkScrollWinTypeToWx(guint scrollType) #ifdef __WXGTK20__ // Escapes string so that it is valid Pango markup XML string: -wxString wxEscapeStringForPangoMarkup(const wxString& str); +WXDLLIMPEXP_CORE wxString wxEscapeStringForPangoMarkup(const wxString& str); #endif // The declaration for gtk_icon_size_lookup was accidentally ifdefed out in diff --git a/include/wx/gtk1/radiobox.h b/include/wx/gtk1/radiobox.h index 7d155a6783..3eeb57552b 100644 --- a/include/wx/gtk1/radiobox.h +++ b/include/wx/gtk1/radiobox.h @@ -21,7 +21,7 @@ // wxRadioBox //----------------------------------------------------------------------------- -class wxRadioBox: public wxControl +class WXDLLIMPEXP_CORE wxRadioBox: public wxControl { public: wxRadioBox() { Init(); } diff --git a/include/wx/gtk1/radiobut.h b/include/wx/gtk1/radiobut.h index 552286e179..8611d506b8 100644 --- a/include/wx/gtk1/radiobut.h +++ b/include/wx/gtk1/radiobut.h @@ -19,7 +19,7 @@ // wxRadioButton //----------------------------------------------------------------------------- -class wxRadioButton: public wxControl +class WXDLLIMPEXP_CORE wxRadioButton: public wxControl { public: wxRadioButton() { } diff --git a/include/wx/gtk1/region.h b/include/wx/gtk1/region.h index 40c7d60d42..11f11ea6f8 100644 --- a/include/wx/gtk1/region.h +++ b/include/wx/gtk1/region.h @@ -22,7 +22,7 @@ // classes //----------------------------------------------------------------------------- -class wxRegion; +class WXDLLIMPEXP_CORE wxRegion; //----------------------------------------------------------------------------- // constants @@ -49,7 +49,7 @@ enum wxRegionOp // wxRegion // ---------------------------------------------------------------------------- -class wxRegion : public wxGDIObject +class WXDLLIMPEXP_CORE wxRegion : public wxGDIObject { public: wxRegion() { } @@ -162,7 +162,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/gtk1/scrolbar.h b/include/wx/gtk1/scrolbar.h index 5a8dd5cbc2..7a982bf669 100644 --- a/include/wx/gtk1/scrolbar.h +++ b/include/wx/gtk1/scrolbar.h @@ -21,13 +21,13 @@ // classes //----------------------------------------------------------------------------- -class wxScrollBar; +class WXDLLIMPEXP_CORE wxScrollBar; //----------------------------------------------------------------------------- // wxScrollBar //----------------------------------------------------------------------------- -class wxScrollBar: public wxScrollBarBase +class WXDLLIMPEXP_CORE wxScrollBar: public wxScrollBarBase { public: wxScrollBar() diff --git a/include/wx/gtk1/slider.h b/include/wx/gtk1/slider.h index 3ff3ad6ea2..7c1ab92185 100644 --- a/include/wx/gtk1/slider.h +++ b/include/wx/gtk1/slider.h @@ -18,7 +18,7 @@ // wxSlider // ---------------------------------------------------------------------------- -class wxSlider : public wxSliderBase +class WXDLLIMPEXP_CORE wxSlider : public wxSliderBase { public: wxSlider() { } diff --git a/include/wx/gtk1/spinbutt.h b/include/wx/gtk1/spinbutt.h index bbf998067d..2c0c3913a7 100644 --- a/include/wx/gtk1/spinbutt.h +++ b/include/wx/gtk1/spinbutt.h @@ -19,7 +19,7 @@ // wxSpinButton //----------------------------------------------------------------------------- -class wxSpinButton : public wxSpinButtonBase +class WXDLLIMPEXP_CORE wxSpinButton : public wxSpinButtonBase { public: wxSpinButton() { } diff --git a/include/wx/gtk1/spinctrl.h b/include/wx/gtk1/spinctrl.h index 7ca72d8262..c784b1d05a 100644 --- a/include/wx/gtk1/spinctrl.h +++ b/include/wx/gtk1/spinctrl.h @@ -25,7 +25,7 @@ // wxSpinCtrl //----------------------------------------------------------------------------- -class wxSpinCtrl : public wxControl +class WXDLLIMPEXP_CORE wxSpinCtrl : public wxControl { public: wxSpinCtrl() {} diff --git a/include/wx/gtk1/statbmp.h b/include/wx/gtk1/statbmp.h index 8174a8ebf0..241b5352ed 100644 --- a/include/wx/gtk1/statbmp.h +++ b/include/wx/gtk1/statbmp.h @@ -21,7 +21,7 @@ // wxStaticBitmap //----------------------------------------------------------------------------- -class wxStaticBitmap : public wxStaticBitmapBase +class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase { public: wxStaticBitmap(); diff --git a/include/wx/gtk1/statbox.h b/include/wx/gtk1/statbox.h index 87b7372b86..015c5280c3 100644 --- a/include/wx/gtk1/statbox.h +++ b/include/wx/gtk1/statbox.h @@ -19,7 +19,7 @@ // wxStaticBox //----------------------------------------------------------------------------- -class wxStaticBox : public wxStaticBoxBase +class WXDLLIMPEXP_CORE wxStaticBox : public wxStaticBoxBase { public: wxStaticBox(); diff --git a/include/wx/gtk1/statline.h b/include/wx/gtk1/statline.h index aec5372856..7b6e673728 100644 --- a/include/wx/gtk1/statline.h +++ b/include/wx/gtk1/statline.h @@ -23,7 +23,7 @@ // wxStaticLine // ---------------------------------------------------------------------------- -class wxStaticLine : public wxStaticLineBase +class WXDLLIMPEXP_CORE wxStaticLine : public wxStaticLineBase { public: wxStaticLine(); diff --git a/include/wx/gtk1/stattext.h b/include/wx/gtk1/stattext.h index fc7098928b..a39b1c3d4e 100644 --- a/include/wx/gtk1/stattext.h +++ b/include/wx/gtk1/stattext.h @@ -24,7 +24,7 @@ // classes //----------------------------------------------------------------------------- -class wxStaticText; +class WXDLLIMPEXP_CORE wxStaticText; //----------------------------------------------------------------------------- // global data @@ -34,7 +34,7 @@ class wxStaticText; // wxStaticText //----------------------------------------------------------------------------- -class wxStaticText : public wxControl +class WXDLLIMPEXP_CORE wxStaticText : public wxControl { public: wxStaticText(); diff --git a/include/wx/gtk1/tbargtk.h b/include/wx/gtk1/tbargtk.h index ce78401588..10ee7d1f3c 100644 --- a/include/wx/gtk1/tbargtk.h +++ b/include/wx/gtk1/tbargtk.h @@ -20,7 +20,7 @@ // wxToolBar // ---------------------------------------------------------------------------- -class wxToolBar : public wxToolBarBase +class WXDLLIMPEXP_CORE wxToolBar : public wxToolBarBase { public: // construction/destruction diff --git a/include/wx/gtk1/textctrl.h b/include/wx/gtk1/textctrl.h index 6a52dba4f3..b55dc917c9 100644 --- a/include/wx/gtk1/textctrl.h +++ b/include/wx/gtk1/textctrl.h @@ -19,7 +19,7 @@ // wxTextCtrl //----------------------------------------------------------------------------- -class wxTextCtrl: public wxTextCtrlBase +class WXDLLIMPEXP_CORE wxTextCtrl: public wxTextCtrlBase { public: wxTextCtrl() { Init(); } diff --git a/include/wx/gtk1/tglbtn.h b/include/wx/gtk1/tglbtn.h index 3c5bc6c541..8aa5434314 100644 --- a/include/wx/gtk1/tglbtn.h +++ b/include/wx/gtk1/tglbtn.h @@ -19,20 +19,20 @@ // classes //----------------------------------------------------------------------------- -class wxToggleButton; -class wxToggleBitmapButton; +class WXDLLIMPEXP_CORE wxToggleButton; +class WXDLLIMPEXP_CORE wxToggleBitmapButton; //----------------------------------------------------------------------------- // global data //----------------------------------------------------------------------------- -extern const wxChar *wxCheckBoxNameStr; +extern WXDLLIMPEXP_CORE const wxChar *wxCheckBoxNameStr; //----------------------------------------------------------------------------- // wxToggleBitmapButton //----------------------------------------------------------------------------- -class wxToggleBitmapButton: public wxControl +class WXDLLIMPEXP_CORE wxToggleBitmapButton: public wxControl { public: // construction/destruction @@ -88,7 +88,7 @@ private: // wxToggleButton //----------------------------------------------------------------------------- -class wxToggleButton: public wxControl +class WXDLLIMPEXP_CORE wxToggleButton: public wxControl { public: // construction/destruction diff --git a/include/wx/gtk1/timer.h b/include/wx/gtk1/timer.h index 5d006be202..a93dbbe62e 100644 --- a/include/wx/gtk1/timer.h +++ b/include/wx/gtk1/timer.h @@ -19,7 +19,7 @@ // wxTimer //----------------------------------------------------------------------------- -class wxTimer : public wxTimerBase +class WXDLLIMPEXP_CORE wxTimer : public wxTimerBase { public: wxTimer() { Init(); } diff --git a/include/wx/gtk1/tooltip.h b/include/wx/gtk1/tooltip.h index 39b2f82fa0..d92f206e82 100644 --- a/include/wx/gtk1/tooltip.h +++ b/include/wx/gtk1/tooltip.h @@ -22,14 +22,14 @@ // forward declarations //----------------------------------------------------------------------------- -class wxToolTip; -class wxWindow; +class WXDLLIMPEXP_CORE wxToolTip; +class WXDLLIMPEXP_CORE wxWindow; //----------------------------------------------------------------------------- // wxToolTip //----------------------------------------------------------------------------- -class wxToolTip : public wxObject +class WXDLLIMPEXP_CORE wxToolTip : public wxObject { public: // globally change the tooltip parameters diff --git a/include/wx/gtk1/toplevel.h b/include/wx/gtk1/toplevel.h index 45bfd16771..a701afc13e 100644 --- a/include/wx/gtk1/toplevel.h +++ b/include/wx/gtk1/toplevel.h @@ -20,7 +20,7 @@ // wxTopLevelWindowGTK //----------------------------------------------------------------------------- -class wxTopLevelWindowGTK : public wxTopLevelWindowBase +class WXDLLIMPEXP_CORE wxTopLevelWindowGTK : public wxTopLevelWindowBase { public: // construction diff --git a/include/wx/gtk1/treectrl.h b/include/wx/gtk1/treectrl.h index b5452888b6..84b5697f66 100644 --- a/include/wx/gtk1/treectrl.h +++ b/include/wx/gtk1/treectrl.h @@ -25,13 +25,13 @@ typedef long wxDataType; // fwd decl -class wxImageList; +class WXDLLIMPEXP_CORE wxImageList; struct wxTreeViewItem; // a callback function used for sorting tree items, it should return -1 if the // first item precedes the second, +1 if the second precedes the first or 0 if // they're equivalent -class wxTreeItemData; +class WXDLLIMPEXP_CORE wxTreeItemData; typedef int (*wxTreeItemCmpFunc)(wxTreeItemData *item1, wxTreeItemData *item2); // ---------------------------------------------------------------------------- diff --git a/include/wx/gtk1/win_gtk.h b/include/wx/gtk1/win_gtk.h index 4f79acfb7f..1ade9a1ae6 100644 --- a/include/wx/gtk1/win_gtk.h +++ b/include/wx/gtk1/win_gtk.h @@ -23,6 +23,8 @@ extern "C" { #include #endif +#include "wx/dlimpexp.h" + #define GTK_PIZZA(obj) GTK_CHECK_CAST (obj, gtk_pizza_get_type (), GtkPizza) #define GTK_PIZZA_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_pizza_get_type (), GtkPizzaClass) #define GTK_IS_PIZZA(obj) GTK_CHECK_TYPE (obj, gtk_pizza_get_type ()) @@ -82,28 +84,37 @@ struct _GtkPizzaClass GtkAdjustment *vadjustment); }; +WXDLLIMPEXP_CORE GtkType gtk_pizza_get_type (void); +WXDLLIMPEXP_CORE GtkWidget* gtk_pizza_new (void); +WXDLLIMPEXP_CORE void gtk_pizza_set_shadow_type (GtkPizza *pizza, GtkMyShadowType type); +WXDLLIMPEXP_CORE void gtk_pizza_set_clear (GtkPizza *pizza, gboolean clear); +WXDLLIMPEXP_CORE void gtk_pizza_set_filter (GtkPizza *pizza, gboolean use); +WXDLLIMPEXP_CORE void gtk_pizza_set_external (GtkPizza *pizza, gboolean expose); +WXDLLIMPEXP_CORE void gtk_pizza_scroll (GtkPizza *pizza, gint dx, gint dy); +WXDLLIMPEXP_CORE gint gtk_pizza_child_resized (GtkPizza *pizza, GtkWidget *widget); +WXDLLIMPEXP_CORE void gtk_pizza_put (GtkPizza *pizza, GtkWidget *widget, gint x, @@ -111,16 +122,19 @@ void gtk_pizza_put (GtkPizza *pizza, gint width, gint height); +WXDLLIMPEXP_CORE void gtk_pizza_move (GtkPizza *pizza, GtkWidget *widget, gint x, gint y ); +WXDLLIMPEXP_CORE void gtk_pizza_resize (GtkPizza *pizza, GtkWidget *widget, gint width, gint height ); +WXDLLIMPEXP_CORE void gtk_pizza_set_size (GtkPizza *pizza, GtkWidget *widget, gint x, diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h index 607f344c21..2528f768a4 100644 --- a/include/wx/gtk1/window.h +++ b/include/wx/gtk1/window.h @@ -23,14 +23,14 @@ struct wxGtkIMData; // callback definition for inserting a window (internal) //----------------------------------------------------------------------------- -class wxWindowGTK; +class WXDLLIMPEXP_CORE wxWindowGTK; typedef void (*wxInsertChildFunction)( wxWindowGTK*, wxWindowGTK* ); //----------------------------------------------------------------------------- // wxWindowGTK //----------------------------------------------------------------------------- -class wxWindowGTK : public wxWindowBase +class WXDLLIMPEXP_CORE wxWindowGTK : public wxWindowBase { public: // creating the window @@ -297,6 +297,6 @@ private: DECLARE_NO_COPY_CLASS(wxWindowGTK) }; -extern wxWindow *wxFindFocusedChild(wxWindowGTK *win); +extern WXDLLIMPEXP_CORE wxWindow *wxFindFocusedChild(wxWindowGTK *win); #endif // __GTKWINDOWH__ diff --git a/include/wx/unix/execute.h b/include/wx/unix/execute.h index 745674ec60..7af0c51977 100644 --- a/include/wx/unix/execute.h +++ b/include/wx/unix/execute.h @@ -12,7 +12,7 @@ #include "wx/unix/pipe.h" -class wxProcess; +class WXDLLIMPEXP_BASE wxProcess; class wxStreamTempInputBuffer; // if pid > 0, the execution is async and the data is freed in the callback @@ -65,11 +65,11 @@ struct wxExecuteData // this function is called when the process terminates from port specific // callback function and is common to all ports (src/unix/utilsunx.cpp) -extern void wxHandleProcessTermination(wxEndProcessData *proc_data); +extern WXDLLIMPEXP_BASE void wxHandleProcessTermination(wxEndProcessData *proc_data); // this function is called to associate the port-specific callback with the // child process. The return valus is port-specific. -extern int wxAddProcessCallback(wxEndProcessData *proc_data, int fd); +extern WXDLLIMPEXP_CORE int wxAddProcessCallback(wxEndProcessData *proc_data, int fd); #if defined(__DARWIN__) && (defined(__WXMAC__) || defined(__WXCOCOA__)) // For ports (e.g. DARWIN) which can add callbacks based on the pid diff --git a/src/gtk/taskbar.cpp b/src/gtk/taskbar.cpp index 1badc0a089..cf26365834 100644 --- a/src/gtk/taskbar.cpp +++ b/src/gtk/taskbar.cpp @@ -75,14 +75,15 @@ bool wxTaskBarIconAreaBase::IsProtocolSupported() // Pop-up menu stuff //----------------------------------------------------------------------------- -extern "C" void gtk_pop_hide_callback( GtkWidget *widget, bool* is_waiting ); +extern "C" WXDLLIMPEXP_CORE void gtk_pop_hide_callback( GtkWidget *widget, bool* is_waiting ); -extern void SetInvokingWindow( wxMenu *menu, wxWindow* win ); +extern WXDLLIMPEXP_CORE void SetInvokingWindow( wxMenu *menu, wxWindow* win ); -extern "C" void wxPopupMenuPositionCallback( GtkMenu *menu, - gint *x, gint *y, - gboolean * WXUNUSED(whatever), - gpointer user_data ); +extern "C" WXDLLIMPEXP_CORE + void wxPopupMenuPositionCallback( GtkMenu *menu, + gint *x, gint *y, + gboolean * WXUNUSED(whatever), + gpointer user_data ); #if wxUSE_MENUS_NATIVE bool wxTaskBarIconAreaBase::DoPopupMenu( wxMenu *menu, int x, int y ) diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 536777c8f0..75df72073f 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -4419,13 +4419,13 @@ bool wxWindowGTK::SetBackgroundStyle(wxBackgroundStyle style) #if wxUSE_MENUS_NATIVE -extern "C" +extern "C" WXDLLIMPEXP_CORE void gtk_pop_hide_callback( GtkWidget *WXUNUSED(widget), bool* is_waiting ) { *is_waiting = FALSE; } -void SetInvokingWindow( wxMenu *menu, wxWindow* win ) +WXDLLIMPEXP_CORE void SetInvokingWindow( wxMenu *menu, wxWindow* win ) { menu->SetInvokingWindow( win ); @@ -4442,12 +4442,13 @@ void SetInvokingWindow( wxMenu *menu, wxWindow* win ) } } -extern "C" void wxPopupMenuPositionCallback( GtkMenu *menu, - gint *x, gint *y, +extern "C" WXDLLIMPEXP_CORE +void wxPopupMenuPositionCallback( GtkMenu *menu, + gint *x, gint *y, #ifdef __WXGTK20__ - gboolean * WXUNUSED(whatever), + gboolean * WXUNUSED(whatever), #endif - gpointer user_data ) + gpointer user_data ) { // ensure that the menu appears entirely on screen GtkRequisition req; diff --git a/src/gtk1/taskbar.cpp b/src/gtk1/taskbar.cpp index 1badc0a089..cf26365834 100644 --- a/src/gtk1/taskbar.cpp +++ b/src/gtk1/taskbar.cpp @@ -75,14 +75,15 @@ bool wxTaskBarIconAreaBase::IsProtocolSupported() // Pop-up menu stuff //----------------------------------------------------------------------------- -extern "C" void gtk_pop_hide_callback( GtkWidget *widget, bool* is_waiting ); +extern "C" WXDLLIMPEXP_CORE void gtk_pop_hide_callback( GtkWidget *widget, bool* is_waiting ); -extern void SetInvokingWindow( wxMenu *menu, wxWindow* win ); +extern WXDLLIMPEXP_CORE void SetInvokingWindow( wxMenu *menu, wxWindow* win ); -extern "C" void wxPopupMenuPositionCallback( GtkMenu *menu, - gint *x, gint *y, - gboolean * WXUNUSED(whatever), - gpointer user_data ); +extern "C" WXDLLIMPEXP_CORE + void wxPopupMenuPositionCallback( GtkMenu *menu, + gint *x, gint *y, + gboolean * WXUNUSED(whatever), + gpointer user_data ); #if wxUSE_MENUS_NATIVE bool wxTaskBarIconAreaBase::DoPopupMenu( wxMenu *menu, int x, int y ) diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index 536777c8f0..75df72073f 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -4419,13 +4419,13 @@ bool wxWindowGTK::SetBackgroundStyle(wxBackgroundStyle style) #if wxUSE_MENUS_NATIVE -extern "C" +extern "C" WXDLLIMPEXP_CORE void gtk_pop_hide_callback( GtkWidget *WXUNUSED(widget), bool* is_waiting ) { *is_waiting = FALSE; } -void SetInvokingWindow( wxMenu *menu, wxWindow* win ) +WXDLLIMPEXP_CORE void SetInvokingWindow( wxMenu *menu, wxWindow* win ) { menu->SetInvokingWindow( win ); @@ -4442,12 +4442,13 @@ void SetInvokingWindow( wxMenu *menu, wxWindow* win ) } } -extern "C" void wxPopupMenuPositionCallback( GtkMenu *menu, - gint *x, gint *y, +extern "C" WXDLLIMPEXP_CORE +void wxPopupMenuPositionCallback( GtkMenu *menu, + gint *x, gint *y, #ifdef __WXGTK20__ - gboolean * WXUNUSED(whatever), + gboolean * WXUNUSED(whatever), #endif - gpointer user_data ) + gpointer user_data ) { // ensure that the menu appears entirely on screen GtkRequisition req; -- 2.45.2