From 53a2db124c633f80bdb16336084262037d879a2c Mon Sep 17 00:00:00 2001 From: Francesco Montorsi Date: Wed, 26 Mar 2008 15:06:00 +0000 Subject: [PATCH] substitute WXDLLEXPORT with WXDLLIMPEXP_CORE and WXDLLEXPORT_DATA with WXDLLIMPEXP_DATA_CORE git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/accel.h | 4 +- include/wx/access.h | 2 +- include/wx/anidecod.h | 4 +- include/wx/apptrait.h | 2 +- include/wx/artprov.h | 2 +- include/wx/bitmap.h | 8 +- include/wx/bmpbuttn.h | 4 +- include/wx/bookctrl.h | 4 +- include/wx/brush.h | 4 +- include/wx/button.h | 4 +- include/wx/caret.h | 6 +- include/wx/checkbox.h | 4 +- include/wx/checklst.h | 2 +- include/wx/choice.h | 4 +- include/wx/choicebk.h | 4 +- include/wx/clipbrd.h | 4 +- include/wx/clrpicker.h | 4 +- include/wx/cmdproc.h | 4 +- include/wx/cmndata.h | 10 +- include/wx/cocoa/app.h | 2 +- include/wx/cocoa/bitmap.h | 4 +- include/wx/cocoa/bmpbuttn.h | 2 +- include/wx/cocoa/brush.h | 2 +- include/wx/cocoa/button.h | 2 +- include/wx/cocoa/checkbox.h | 2 +- include/wx/cocoa/checklst.h | 2 +- include/wx/cocoa/choice.h | 2 +- include/wx/cocoa/colour.h | 2 +- include/wx/cocoa/combobox.h | 2 +- include/wx/cocoa/control.h | 2 +- include/wx/cocoa/cursor.h | 6 +- include/wx/cocoa/dcmemory.h | 2 +- include/wx/cocoa/dcscreen.h | 2 +- include/wx/cocoa/dialog.h | 2 +- include/wx/cocoa/dirdlg.h | 2 +- include/wx/cocoa/filedlg.h | 2 +- include/wx/cocoa/font.h | 2 +- include/wx/cocoa/frame.h | 2 +- include/wx/cocoa/gauge.h | 2 +- include/wx/cocoa/icon.h | 2 +- include/wx/cocoa/listbox.h | 2 +- include/wx/cocoa/mbarman.h | 2 +- include/wx/cocoa/mdi.h | 4 +- include/wx/cocoa/menu.h | 4 +- include/wx/cocoa/menuitem.h | 2 +- include/wx/cocoa/msgdlg.h | 2 +- include/wx/cocoa/notebook.h | 2 +- include/wx/cocoa/pen.h | 2 +- include/wx/cocoa/private/timer.h | 2 +- include/wx/cocoa/radiobox.h | 2 +- include/wx/cocoa/radiobut.h | 2 +- include/wx/cocoa/region.h | 4 +- include/wx/cocoa/scrolbar.h | 2 +- include/wx/cocoa/slider.h | 2 +- include/wx/cocoa/spinbutt.h | 2 +- include/wx/cocoa/statbmp.h | 2 +- include/wx/cocoa/statbox.h | 2 +- include/wx/cocoa/statline.h | 2 +- include/wx/cocoa/stattext.h | 2 +- include/wx/cocoa/textctrl.h | 2 +- include/wx/cocoa/toplevel.h | 4 +- include/wx/cocoa/window.h | 2 +- include/wx/colordlg.h | 9 +- include/wx/colour.h | 6 +- include/wx/combo.h | 4 +- include/wx/combobox.h | 4 +- include/wx/containr.h | 6 +- include/wx/control.h | 4 +- include/wx/cshelp.h | 12 +-- include/wx/ctrlsub.h | 8 +- include/wx/dataobj.h | 18 ++-- include/wx/dc.h | 10 +- include/wx/dcgraph.h | 4 +- include/wx/dcmirror.h | 4 +- include/wx/dialog.h | 8 +- include/wx/dialup.h | 4 +- include/wx/dirdlg.h | 10 +- include/wx/display.h | 4 +- include/wx/display_impl.h | 6 +- include/wx/dlimpexp.h | 6 +- include/wx/dnd.h | 10 +- include/wx/docmdi.h | 4 +- include/wx/docview.h | 24 ++--- include/wx/dynarray.h | 12 +-- include/wx/effects.h | 2 +- include/wx/encinfo.h | 2 +- include/wx/evtloop.h | 4 +- include/wx/fdrepdlg.h | 6 +- include/wx/filectrl.h | 2 +- include/wx/filedlg.h | 16 +-- include/wx/filepicker.h | 18 ++-- include/wx/font.h | 4 +- include/wx/fontdlg.h | 10 +- include/wx/fontenum.h | 2 +- include/wx/fontpicker.h | 4 +- include/wx/fontutil.h | 2 +- include/wx/frame.h | 6 +- include/wx/gauge.h | 4 +- include/wx/gbsizer.h | 10 +- include/wx/gdicmn.h | 60 +++++------ include/wx/generic/accel.h | 2 +- include/wx/generic/busyinfo.h | 2 +- include/wx/generic/buttonbar.h | 2 +- include/wx/generic/caret.h | 2 +- include/wx/generic/choicdgg.h | 22 ++-- include/wx/generic/colour.h | 2 +- include/wx/generic/colrdlgg.h | 2 +- include/wx/generic/combo.h | 4 +- include/wx/generic/dcpsg.h | 4 +- include/wx/generic/dirctrlg.h | 10 +- include/wx/generic/dirdlgg.h | 6 +- include/wx/generic/dragimgg.h | 2 +- include/wx/generic/fdrepdlg.h | 2 +- include/wx/generic/filectrlg.h | 6 +- include/wx/generic/filedlgg.h | 4 +- include/wx/generic/filepickerg.h | 4 +- include/wx/generic/fontdlgg.h | 2 +- include/wx/generic/imaglist.h | 4 +- include/wx/generic/listctrl.h | 4 +- include/wx/generic/logg.h | 6 +- include/wx/generic/mask.h | 2 +- include/wx/generic/mdig.h | 14 +-- include/wx/generic/msgdlgg.h | 2 +- include/wx/generic/numdlgg.h | 20 ++-- include/wx/generic/panelg.h | 4 +- include/wx/generic/printps.h | 4 +- include/wx/generic/prntdlgg.h | 8 +- include/wx/generic/progdlgg.h | 2 +- include/wx/generic/region.h | 4 +- include/wx/generic/spinctlg.h | 4 +- include/wx/generic/splitter.h | 4 +- include/wx/generic/srchctlg.h | 2 +- include/wx/generic/statline.h | 2 +- include/wx/generic/statusbr.h | 2 +- include/wx/generic/tabg.h | 12 +-- include/wx/generic/textdlgg.h | 42 ++++---- include/wx/generic/treectlg.h | 4 +- include/wx/geometry.h | 8 +- include/wx/gifdecod.h | 2 +- include/wx/graphics.h | 12 +-- include/wx/gtk/colordlg.h | 2 +- include/wx/gtk/filectrl.h | 2 +- include/wx/gtk/msgdlg.h | 2 +- include/wx/gtk/scrolwin.h | 2 +- include/wx/gtk/treectrl.h | 6 +- include/wx/gtk1/colordlg.h | 2 +- include/wx/gtk1/combobox.h | 2 +- include/wx/gtk1/mdi.h | 2 +- include/wx/gtk1/msgdlg.h | 4 +- include/wx/gtk1/scrolwin.h | 2 +- include/wx/gtk1/treectrl.h | 6 +- include/wx/hash.h | 2 +- include/wx/hashmap.h | 6 +- include/wx/hashset.h | 2 +- include/wx/helpbase.h | 2 +- include/wx/icon.h | 2 +- include/wx/iconbndl.h | 2 +- include/wx/imagbmp.h | 8 +- include/wx/image.h | 14 +-- include/wx/imaggif.h | 2 +- include/wx/imagiff.h | 2 +- include/wx/imagjpeg.h | 2 +- include/wx/imagpcx.h | 2 +- include/wx/imagpng.h | 2 +- include/wx/imagpnm.h | 2 +- include/wx/imagtga.h | 2 +- include/wx/imagtiff.h | 2 +- include/wx/imagxpm.h | 2 +- include/wx/layout.h | 4 +- include/wx/list.h | 8 +- include/wx/listbase.h | 6 +- include/wx/listbook.h | 4 +- include/wx/listbox.h | 4 +- include/wx/listctrl.h | 4 +- include/wx/mac/carbon/accel.h | 4 +- include/wx/mac/carbon/app.h | 6 +- include/wx/mac/carbon/apptrait.h | 2 +- include/wx/mac/carbon/bitmap.h | 4 +- include/wx/mac/carbon/bmpbuttn.h | 4 +- include/wx/mac/carbon/brush.h | 2 +- include/wx/mac/carbon/button.h | 6 +- include/wx/mac/carbon/checkbox.h | 4 +- include/wx/mac/carbon/checklst.h | 2 +- include/wx/mac/carbon/choice.h | 4 +- include/wx/mac/carbon/clipbrd.h | 2 +- include/wx/mac/carbon/colordlg.h | 2 +- include/wx/mac/carbon/colour.h | 2 +- include/wx/mac/carbon/combobox.h | 4 +- include/wx/mac/carbon/control.h | 4 +- include/wx/mac/carbon/cursor.h | 4 +- include/wx/mac/carbon/dataform.h | 2 +- include/wx/mac/carbon/dataobj.h | 2 +- include/wx/mac/carbon/dataobj2.h | 4 +- include/wx/mac/carbon/dcclient.h | 6 +- include/wx/mac/carbon/dcmemory.h | 2 +- include/wx/mac/carbon/dcprint.h | 2 +- include/wx/mac/carbon/dcscreen.h | 2 +- include/wx/mac/carbon/dialog.h | 4 +- include/wx/mac/carbon/dirdlg.h | 2 +- include/wx/mac/carbon/dnd.h | 4 +- include/wx/mac/carbon/evtloop.h | 4 +- include/wx/mac/carbon/filedlg.h | 2 +- include/wx/mac/carbon/font.h | 2 +- include/wx/mac/carbon/fontdlg.h | 4 +- include/wx/mac/carbon/frame.h | 4 +- include/wx/mac/carbon/gauge.h | 4 +- include/wx/mac/carbon/helpxxxx.h | 2 +- include/wx/mac/carbon/icon.h | 6 +- include/wx/mac/carbon/imaglist.h | 2 +- include/wx/mac/carbon/listbox.h | 2 +- include/wx/mac/carbon/listctrl.h | 2 +- include/wx/mac/carbon/mdi.h | 8 +- include/wx/mac/carbon/menu.h | 4 +- include/wx/mac/carbon/menuitem.h | 2 +- include/wx/mac/carbon/metafile.h | 12 +-- include/wx/mac/carbon/minifram.h | 2 +- include/wx/mac/carbon/msgdlg.h | 2 +- include/wx/mac/carbon/nonownedwnd.h | 2 +- include/wx/mac/carbon/palette.h | 2 +- include/wx/mac/carbon/pen.h | 2 +- include/wx/mac/carbon/pnghand.h | 2 +- include/wx/mac/carbon/popupwin.h | 2 +- include/wx/mac/carbon/printdlg.h | 6 +- include/wx/mac/carbon/printmac.h | 4 +- include/wx/mac/carbon/private.h | 26 ++--- include/wx/mac/carbon/private/print.h | 2 +- include/wx/mac/carbon/private/timer.h | 2 +- include/wx/mac/carbon/radiobox.h | 2 +- include/wx/mac/carbon/radiobut.h | 6 +- include/wx/mac/carbon/region.h | 4 +- include/wx/mac/carbon/scrolbar.h | 2 +- include/wx/mac/carbon/slider.h | 4 +- include/wx/mac/carbon/spinbutt.h | 2 +- include/wx/mac/carbon/spinctrl.h | 4 +- include/wx/mac/carbon/srchctrl.h | 2 +- include/wx/mac/carbon/statbmp.h | 2 +- include/wx/mac/carbon/statbox.h | 4 +- include/wx/mac/carbon/statline.h | 2 +- include/wx/mac/carbon/stattext.h | 2 +- include/wx/mac/carbon/statusbr.h | 2 +- include/wx/mac/carbon/tabctrl.h | 4 +- include/wx/mac/carbon/textctrl.h | 2 +- include/wx/mac/carbon/tglbtn.h | 6 +- include/wx/mac/carbon/toolbar.h | 4 +- include/wx/mac/carbon/toplevel.h | 2 +- include/wx/mac/carbon/treectrl.h | 6 +- include/wx/mac/carbon/window.h | 2 +- include/wx/matrix.h | 2 +- include/wx/menu.h | 4 +- include/wx/menuitem.h | 2 +- include/wx/mgl/app.h | 2 +- include/wx/mgl/bitmap.h | 2 +- include/wx/mgl/brush.h | 2 +- include/wx/mgl/clipbrd.h | 2 +- include/wx/mgl/cursor.h | 2 +- include/wx/mgl/dc.h | 2 +- include/wx/mgl/dcclient.h | 6 +- include/wx/mgl/dcmemory.h | 2 +- include/wx/mgl/dcscreen.h | 2 +- include/wx/mgl/font.h | 2 +- include/wx/mgl/palette.h | 2 +- include/wx/mgl/pen.h | 2 +- include/wx/mgl/popupwin.h | 2 +- include/wx/mgl/region.h | 4 +- include/wx/mgl/window.h | 2 +- include/wx/motif/accel.h | 4 +- include/wx/motif/app.h | 2 +- include/wx/motif/bmpbuttn.h | 2 +- include/wx/motif/bmpmotif.h | 2 +- include/wx/motif/button.h | 2 +- include/wx/motif/checkbox.h | 2 +- include/wx/motif/choice.h | 2 +- include/wx/motif/clipbrd.h | 20 ++-- include/wx/motif/colour.h | 2 +- include/wx/motif/combobox.h | 2 +- include/wx/motif/control.h | 2 +- include/wx/motif/cursor.h | 4 +- include/wx/motif/dc.h | 2 +- include/wx/motif/dcclient.h | 6 +- include/wx/motif/dcprint.h | 2 +- include/wx/motif/dcscreen.h | 2 +- include/wx/motif/dialog.h | 2 +- include/wx/motif/dnd.h | 10 +- include/wx/motif/filedlg.h | 2 +- include/wx/motif/frame.h | 2 +- include/wx/motif/gauge.h | 2 +- include/wx/motif/icon.h | 2 +- include/wx/motif/listbox.h | 2 +- include/wx/motif/mdi.h | 6 +- include/wx/motif/minifram.h | 2 +- include/wx/motif/msgdlg.h | 2 +- include/wx/motif/print.h | 4 +- include/wx/motif/private/timer.h | 2 +- include/wx/motif/radiobox.h | 2 +- include/wx/motif/radiobut.h | 2 +- include/wx/motif/scrolbar.h | 2 +- include/wx/motif/slider.h | 2 +- include/wx/motif/spinbutt.h | 2 +- include/wx/motif/statbmp.h | 2 +- include/wx/motif/statbox.h | 2 +- include/wx/motif/stattext.h | 2 +- include/wx/motif/textctrl.h | 2 +- include/wx/motif/tglbtn.h | 2 +- include/wx/motif/toolbar.h | 2 +- include/wx/motif/window.h | 2 +- include/wx/msgdlg.h | 6 +- include/wx/msw/accel.h | 2 +- include/wx/msw/app.h | 24 ++--- include/wx/msw/bitmap.h | 6 +- include/wx/msw/bmpbuttn.h | 2 +- include/wx/msw/brush.h | 2 +- include/wx/msw/button.h | 2 +- include/wx/msw/caret.h | 2 +- include/wx/msw/checkbox.h | 2 +- include/wx/msw/checklst.h | 2 +- include/wx/msw/choice.h | 2 +- include/wx/msw/clipbrd.h | 22 ++-- include/wx/msw/colordlg.h | 2 +- include/wx/msw/colour.h | 2 +- include/wx/msw/combo.h | 2 +- include/wx/msw/combobox.h | 2 +- include/wx/msw/control.h | 2 +- include/wx/msw/ctrlsub.h | 2 +- include/wx/msw/cursor.h | 2 +- include/wx/msw/dc.h | 6 +- include/wx/msw/dcclient.h | 8 +- include/wx/msw/dcmemory.h | 2 +- include/wx/msw/dcprint.h | 6 +- include/wx/msw/dcscreen.h | 2 +- include/wx/msw/dialog.h | 6 +- include/wx/msw/dib.h | 2 +- include/wx/msw/dirdlg.h | 2 +- include/wx/msw/dragimag.h | 2 +- include/wx/msw/enhmeta.h | 8 +- include/wx/msw/fdrepdlg.h | 2 +- include/wx/msw/filedlg.h | 2 +- include/wx/msw/font.h | 2 +- include/wx/msw/fontdlg.h | 2 +- include/wx/msw/frame.h | 2 +- include/wx/msw/gauge.h | 4 +- include/wx/msw/gdiimage.h | 6 +- include/wx/msw/helpchm.h | 2 +- include/wx/msw/helpwin.h | 2 +- include/wx/msw/icon.h | 4 +- include/wx/msw/imaglist.h | 2 +- include/wx/msw/iniconf.h | 2 +- include/wx/msw/listbox.h | 2 +- include/wx/msw/listctrl.h | 2 +- include/wx/msw/mdi.h | 8 +- include/wx/msw/menu.h | 6 +- include/wx/msw/menuitem.h | 2 +- include/wx/msw/metafile.h | 14 +-- include/wx/msw/minifram.h | 2 +- include/wx/msw/msgdlg.h | 2 +- include/wx/msw/notebook.h | 4 +- include/wx/msw/ole/access.h | 2 +- include/wx/msw/ole/automtn.h | 2 +- include/wx/msw/ole/dataform.h | 2 +- include/wx/msw/ole/dataobj.h | 2 +- include/wx/msw/ole/dataobj2.h | 8 +- include/wx/msw/ole/dropsrc.h | 2 +- include/wx/msw/ole/droptgt.h | 2 +- include/wx/msw/ole/oleutils.h | 10 +- include/wx/msw/ole/uuid.h | 2 +- include/wx/msw/palette.h | 2 +- include/wx/msw/pen.h | 2 +- include/wx/msw/popupwin.h | 2 +- include/wx/msw/printdlg.h | 6 +- include/wx/msw/printwin.h | 4 +- include/wx/msw/private.h | 46 ++++---- include/wx/msw/radiobox.h | 2 +- include/wx/msw/radiobut.h | 2 +- include/wx/msw/region.h | 4 +- include/wx/msw/scrolbar.h | 2 +- include/wx/msw/slider.h | 2 +- include/wx/msw/spinbutt.h | 2 +- include/wx/msw/spinctrl.h | 2 +- include/wx/msw/statbmp.h | 4 +- include/wx/msw/statbox.h | 2 +- include/wx/msw/statline.h | 2 +- include/wx/msw/stattext.h | 2 +- include/wx/msw/statusbar.h | 2 +- include/wx/msw/subwin.h | 2 +- include/wx/msw/tabctrl.h | 4 +- include/wx/msw/textctrl.h | 2 +- include/wx/msw/tglbtn.h | 4 +- include/wx/msw/toolbar.h | 2 +- include/wx/msw/tooltip.h | 2 +- include/wx/msw/toplevel.h | 2 +- include/wx/msw/treectrl.h | 2 +- include/wx/msw/uxtheme.h | 2 +- include/wx/msw/wince/checklst.h | 2 +- include/wx/msw/wince/choicece.h | 2 +- include/wx/msw/wince/helpwce.h | 2 +- include/wx/msw/wince/tbarwce.h | 4 +- include/wx/msw/wince/textctrlce.h | 2 +- include/wx/msw/window.h | 6 +- include/wx/msw/wrapwin.h | 6 +- include/wx/notebook.h | 6 +- include/wx/object.h | 50 ++++----- include/wx/os2/accel.h | 6 +- include/wx/os2/app.h | 10 +- include/wx/os2/bitmap.h | 8 +- include/wx/os2/bmpbuttn.h | 4 +- include/wx/os2/brush.h | 2 +- include/wx/os2/button.h | 2 +- include/wx/os2/checkbox.h | 4 +- include/wx/os2/checklst.h | 2 +- include/wx/os2/choice.h | 2 +- include/wx/os2/clipbrd.h | 22 ++-- include/wx/os2/colour.h | 2 +- include/wx/os2/combobox.h | 2 +- include/wx/os2/control.h | 2 +- include/wx/os2/cursor.h | 4 +- include/wx/os2/dc.h | 2 +- include/wx/os2/dcclient.h | 6 +- include/wx/os2/dcmemory.h | 2 +- include/wx/os2/dcprint.h | 4 +- include/wx/os2/dcscreen.h | 2 +- include/wx/os2/dialog.h | 4 +- include/wx/os2/dirdlg.h | 4 +- include/wx/os2/dnd.h | 4 +- include/wx/os2/filedlg.h | 2 +- include/wx/os2/font.h | 4 +- include/wx/os2/fontdlg.h | 2 +- include/wx/os2/frame.h | 2 +- include/wx/os2/gauge.h | 2 +- include/wx/os2/gdiimage.h | 6 +- include/wx/os2/helpwin.h | 2 +- include/wx/os2/icon.h | 4 +- include/wx/os2/iniconf.h | 2 +- include/wx/os2/listbox.h | 2 +- include/wx/os2/listctrl.h | 2 +- include/wx/os2/mdi.h | 6 +- include/wx/os2/menu.h | 4 +- include/wx/os2/menuitem.h | 2 +- include/wx/os2/metafile.h | 14 +-- include/wx/os2/minifram.h | 2 +- include/wx/os2/msgdlg.h | 2 +- include/wx/os2/notebook.h | 2 +- include/wx/os2/palette.h | 4 +- include/wx/os2/pen.h | 2 +- include/wx/os2/pnghand.h | 2 +- include/wx/os2/popupwin.h | 2 +- include/wx/os2/print.h | 4 +- include/wx/os2/printos2.h | 4 +- include/wx/os2/private.h | 146 +++++++++++++------------- include/wx/os2/private/timer.h | 2 +- include/wx/os2/radiobox.h | 2 +- include/wx/os2/radiobut.h | 2 +- include/wx/os2/region.h | 4 +- include/wx/os2/scrolbar.h | 2 +- include/wx/os2/slider.h | 2 +- include/wx/os2/spinbutt.h | 2 +- include/wx/os2/spinctrl.h | 2 +- include/wx/os2/statbmp.h | 2 +- include/wx/os2/statbox.h | 2 +- include/wx/os2/statline.h | 2 +- include/wx/os2/stattext.h | 2 +- include/wx/os2/tabctrl.h | 4 +- include/wx/os2/textctrl.h | 2 +- include/wx/os2/tglbtn.h | 4 +- include/wx/os2/toolbar.h | 2 +- include/wx/os2/toplevel.h | 2 +- include/wx/os2/treectrl.h | 6 +- include/wx/os2/window.h | 6 +- include/wx/overlay.h | 4 +- include/wx/ownerdrw.h | 2 +- include/wx/palette.h | 2 +- include/wx/palmos/accel.h | 2 +- include/wx/palmos/app.h | 5 +- include/wx/palmos/bitmap.h | 6 +- include/wx/palmos/bmpbuttn.h | 2 +- include/wx/palmos/brush.h | 2 +- include/wx/palmos/button.h | 2 +- include/wx/palmos/caret.h | 2 +- include/wx/palmos/checkbox.h | 2 +- include/wx/palmos/checklst.h | 2 +- include/wx/palmos/choice.h | 2 +- include/wx/palmos/clipbrd.h | 22 ++-- include/wx/palmos/colordlg.h | 2 +- include/wx/palmos/combobox.h | 2 +- include/wx/palmos/control.h | 2 +- include/wx/palmos/cursor.h | 2 +- include/wx/palmos/dc.h | 6 +- include/wx/palmos/dcclient.h | 6 +- include/wx/palmos/dcmemory.h | 2 +- include/wx/palmos/dcprint.h | 6 +- include/wx/palmos/dcscreen.h | 2 +- include/wx/palmos/dialog.h | 4 +- include/wx/palmos/dib.h | 2 +- include/wx/palmos/dirdlg.h | 2 +- include/wx/palmos/dragimag.h | 2 +- include/wx/palmos/enhmeta.h | 8 +- include/wx/palmos/evtloop.h | 2 +- include/wx/palmos/fdrepdlg.h | 2 +- include/wx/palmos/filedlg.h | 2 +- include/wx/palmos/font.h | 2 +- include/wx/palmos/fontdlg.h | 2 +- include/wx/palmos/frame.h | 2 +- include/wx/palmos/gauge.h | 4 +- include/wx/palmos/gdiimage.h | 6 +- include/wx/palmos/help.h | 2 +- include/wx/palmos/imaglist.h | 2 +- include/wx/palmos/listbox.h | 2 +- include/wx/palmos/listctrl.h | 2 +- include/wx/palmos/mdi.h | 8 +- include/wx/palmos/menu.h | 6 +- include/wx/palmos/menuitem.h | 2 +- include/wx/palmos/metafile.h | 12 +-- include/wx/palmos/minifram.h | 2 +- include/wx/palmos/msgdlg.h | 2 +- include/wx/palmos/mslu.h | 10 +- include/wx/palmos/notebook.h | 4 +- include/wx/palmos/palette.h | 4 +- include/wx/palmos/pen.h | 4 +- include/wx/palmos/popupwin.h | 2 +- include/wx/palmos/printdlg.h | 4 +- include/wx/palmos/printpalm.h | 4 +- include/wx/palmos/private/timer.h | 2 +- include/wx/palmos/progdlg.h | 2 +- include/wx/palmos/radiobox.h | 2 +- include/wx/palmos/radiobut.h | 2 +- include/wx/palmos/region.h | 4 +- include/wx/palmos/scrolbar.h | 2 +- include/wx/palmos/slider.h | 2 +- include/wx/palmos/spinbutt.h | 2 +- include/wx/palmos/spinctrl.h | 2 +- include/wx/palmos/statbmp.h | 4 +- include/wx/palmos/statbox.h | 2 +- include/wx/palmos/statline.h | 2 +- include/wx/palmos/stattext.h | 2 +- include/wx/palmos/statusbr.h | 2 +- include/wx/palmos/tabctrl.h | 6 +- include/wx/palmos/textctrl.h | 2 +- include/wx/palmos/tglbtn.h | 4 +- include/wx/palmos/toolbar.h | 2 +- include/wx/palmos/tooltip.h | 2 +- include/wx/palmos/toplevel.h | 2 +- include/wx/palmos/treectrl.h | 6 +- include/wx/palmos/window.h | 2 +- include/wx/paper.h | 6 +- include/wx/pen.h | 4 +- include/wx/pickerbase.h | 2 +- include/wx/popupwin.h | 6 +- include/wx/printdlg.h | 8 +- include/wx/prntbase.h | 24 ++--- include/wx/quantize.h | 2 +- include/wx/radiobox.h | 4 +- include/wx/radiobut.h | 2 +- include/wx/rawbmp.h | 2 +- include/wx/region.h | 4 +- include/wx/renderer.h | 10 +- include/wx/scrolbar.h | 4 +- include/wx/scrolwin.h | 4 +- include/wx/selstore.h | 2 +- include/wx/settings.h | 4 +- include/wx/sizer.h | 20 ++-- include/wx/slider.h | 4 +- include/wx/spinbutt.h | 4 +- include/wx/spinctrl.h | 4 +- include/wx/srchctrl.h | 4 +- include/wx/statbmp.h | 4 +- include/wx/statbox.h | 4 +- include/wx/statline.h | 4 +- include/wx/stattext.h | 4 +- include/wx/statusbr.h | 2 +- include/wx/stockitem.h | 12 +-- include/wx/tbarbase.h | 10 +- include/wx/textctrl.h | 10 +- include/wx/tglbtn.h | 2 +- include/wx/tipwin.h | 2 +- include/wx/toolbook.h | 4 +- include/wx/toplevel.h | 6 +- include/wx/treebase.h | 12 +-- include/wx/treebook.h | 4 +- include/wx/treectrl.h | 2 +- include/wx/univ/app.h | 2 +- include/wx/univ/bmpbuttn.h | 2 +- include/wx/univ/button.h | 2 +- include/wx/univ/checkbox.h | 2 +- include/wx/univ/checklst.h | 2 +- include/wx/univ/choice.h | 2 +- include/wx/univ/colschem.h | 2 +- include/wx/univ/combobox.h | 2 +- include/wx/univ/control.h | 2 +- include/wx/univ/dialog.h | 4 +- include/wx/univ/frame.h | 2 +- include/wx/univ/gauge.h | 2 +- include/wx/univ/inpcons.h | 2 +- include/wx/univ/inphand.h | 4 +- include/wx/univ/listbox.h | 2 +- include/wx/univ/menu.h | 4 +- include/wx/univ/menuitem.h | 2 +- include/wx/univ/notebook.h | 2 +- include/wx/univ/radiobox.h | 2 +- include/wx/univ/radiobut.h | 2 +- include/wx/univ/renderer.h | 8 +- include/wx/univ/scrarrow.h | 4 +- include/wx/univ/scrolbar.h | 6 +- include/wx/univ/scrthumb.h | 4 +- include/wx/univ/scrtimer.h | 2 +- include/wx/univ/slider.h | 2 +- include/wx/univ/spinbutt.h | 4 +- include/wx/univ/statbmp.h | 2 +- include/wx/univ/statbox.h | 2 +- include/wx/univ/statline.h | 2 +- include/wx/univ/stattext.h | 2 +- include/wx/univ/statusbr.h | 2 +- include/wx/univ/textctrl.h | 2 +- include/wx/univ/tglbtn.h | 2 +- include/wx/univ/theme.h | 8 +- include/wx/univ/toolbar.h | 2 +- include/wx/univ/toplevel.h | 2 +- include/wx/univ/window.h | 2 +- include/wx/unix/apptrait.h | 2 +- include/wx/unix/mimetype.h | 4 +- include/wx/utils.h | 46 ++++---- include/wx/valgen.h | 4 +- include/wx/validate.h | 4 +- include/wx/valtext.h | 2 +- include/wx/vidmode.h | 2 +- include/wx/vlbox.h | 2 +- include/wx/vscroll.h | 16 +-- include/wx/window.h | 24 ++--- include/wx/x11/app.h | 2 +- include/wx/x11/colour.h | 2 +- include/wx/x11/dc.h | 2 +- include/wx/x11/dcprint.h | 2 +- include/wx/x11/dnd.h | 10 +- include/wx/x11/minifram.h | 2 +- include/wx/x11/palette.h | 4 +- include/wx/x11/print.h | 4 +- include/wx/x11/privx.h | 2 +- include/wx/x11/textctrl.h | 2 +- include/wx/x11/toplevel.h | 4 +- include/wx/x11/window.h | 2 +- include/wx/xpmdecod.h | 2 +- 638 files changed, 1410 insertions(+), 1412 deletions(-) diff --git a/include/wx/accel.h b/include/wx/accel.h index 0cbf106f7a..fe1ec1a6fa 100644 --- a/include/wx/accel.h +++ b/include/wx/accel.h @@ -44,7 +44,7 @@ enum wxAcceleratorEntryFlags // an entry in wxAcceleratorTable corresponds to one accelerator // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxAcceleratorEntry +class WXDLLIMPEXP_CORE wxAcceleratorEntry { public: wxAcceleratorEntry(int flags = 0, int keyCode = 0, int cmd = 0, @@ -164,7 +164,7 @@ private: #include "wx/os2/accel.h" #endif -extern WXDLLEXPORT_DATA(wxAcceleratorTable) wxNullAcceleratorTable; +extern WXDLLIMPEXP_DATA_CORE(wxAcceleratorTable) wxNullAcceleratorTable; #endif // wxUSE_ACCEL diff --git a/include/wx/access.h b/include/wx/access.h index 2e7c772250..8e3f6d6ccc 100644 --- a/include/wx/access.h +++ b/include/wx/access.h @@ -228,7 +228,7 @@ class WXDLLIMPEXP_FWD_CORE wxAccessible; class WXDLLIMPEXP_FWD_CORE wxWindow; class WXDLLIMPEXP_FWD_CORE wxPoint; class WXDLLIMPEXP_FWD_CORE wxRect; -class WXDLLEXPORT wxAccessibleBase : public wxObject +class WXDLLIMPEXP_CORE wxAccessibleBase : public wxObject { DECLARE_NO_COPY_CLASS(wxAccessibleBase) diff --git a/include/wx/anidecod.h b/include/wx/anidecod.h index ca9914f1aa..733e5b3e1e 100644 --- a/include/wx/anidecod.h +++ b/include/wx/anidecod.h @@ -20,7 +20,7 @@ #include "wx/dynarray.h" -class /*WXDLLEXPORT*/ wxANIFrameInfo; +class /*WXDLLIMPEXP_CORE*/ wxANIFrameInfo; // private implementation detail WX_DECLARE_EXPORTED_OBJARRAY(wxANIFrameInfo, wxANIFrameInfoArray); WX_DECLARE_EXPORTED_OBJARRAY(wxImage, wxImageArray); @@ -29,7 +29,7 @@ WX_DECLARE_EXPORTED_OBJARRAY(wxImage, wxImageArray); // wxANIDecoder class // -------------------------------------------------------------------------- -class WXDLLEXPORT wxANIDecoder : public wxAnimationDecoder +class WXDLLIMPEXP_CORE wxANIDecoder : public wxAnimationDecoder { public: // constructor, destructor, etc. diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h index dc1d1785f9..c31d9d0670 100644 --- a/include/wx/apptrait.h +++ b/include/wx/apptrait.h @@ -246,7 +246,7 @@ public: #if wxUSE_GUI -class WXDLLEXPORT wxGUIAppTraitsBase : public wxAppTraits +class WXDLLIMPEXP_CORE wxGUIAppTraitsBase : public wxAppTraits { public: #if wxUSE_LOG diff --git a/include/wx/artprov.h b/include/wx/artprov.h index e49c3b36d5..34f365a8e9 100644 --- a/include/wx/artprov.h +++ b/include/wx/artprov.h @@ -111,7 +111,7 @@ typedef wxString wxArtID; // wxArtProvider class // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxArtProvider : public wxObject +class WXDLLIMPEXP_CORE wxArtProvider : public wxObject { public: // Dtor removes the provider from providers stack if it's still on it diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h index 6d3d323c4b..42f48524f9 100644 --- a/include/wx/bitmap.h +++ b/include/wx/bitmap.h @@ -33,7 +33,7 @@ class WXDLLIMPEXP_FWD_CORE wxPalette; #if wxUSE_VARIANT #include "wx/variant.h" -DECLARE_VARIANT_OBJECT_EXPORTED(wxBitmap,WXDLLEXPORT) +DECLARE_VARIANT_OBJECT_EXPORTED(wxBitmap,WXDLLIMPEXP_CORE) #endif // ---------------------------------------------------------------------------- @@ -42,7 +42,7 @@ DECLARE_VARIANT_OBJECT_EXPORTED(wxBitmap,WXDLLEXPORT) // TODO: all implementation of wxMask, except the generic one, // do not derive from wxMaskBase,,, they should -class WXDLLEXPORT wxMaskBase : public wxObject +class WXDLLIMPEXP_CORE wxMaskBase : public wxObject { public: // create the mask from bitmap pixels of the given colour @@ -94,7 +94,7 @@ protected: // different formats // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxBitmapHandler : public wxObject +class WXDLLIMPEXP_CORE wxBitmapHandler : public wxObject { public: wxBitmapHandler() { m_type = wxBITMAP_TYPE_INVALID; } @@ -138,7 +138,7 @@ private: // wxBitmap: class which represents platform-dependent bitmap (unlike wxImage) // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxBitmapBase : public wxGDIObject +class WXDLLIMPEXP_CORE wxBitmapBase : public wxGDIObject { public: /* diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h index 27edd94fd0..21412bf425 100644 --- a/include/wx/bmpbuttn.h +++ b/include/wx/bmpbuttn.h @@ -19,14 +19,14 @@ #include "wx/bitmap.h" #include "wx/button.h" -extern WXDLLEXPORT_DATA(const char) wxButtonNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxButtonNameStr[]; // ---------------------------------------------------------------------------- // wxBitmapButton: a button which shows bitmaps instead of the usual string. // It has different bitmaps for different states (focused/disabled/pressed) // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxBitmapButtonBase : public wxButton +class WXDLLIMPEXP_CORE wxBitmapButtonBase : public wxButton { public: wxBitmapButtonBase() diff --git a/include/wx/bookctrl.h b/include/wx/bookctrl.h index f791d2550a..e864221cad 100644 --- a/include/wx/bookctrl.h +++ b/include/wx/bookctrl.h @@ -54,7 +54,7 @@ enum // wxBookCtrlBase // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxBookCtrlBase : public wxControl +class WXDLLIMPEXP_CORE wxBookCtrlBase : public wxControl { public: // construction @@ -344,7 +344,7 @@ private: // wxBookCtrlBaseEvent: page changing events generated by derived classes // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxBookCtrlBaseEvent : public wxNotifyEvent +class WXDLLIMPEXP_CORE wxBookCtrlBaseEvent : public wxNotifyEvent { public: wxBookCtrlBaseEvent(wxEventType commandType = wxEVT_NULL, int winid = 0, diff --git a/include/wx/brush.h b/include/wx/brush.h index 85973acb06..033ace1dd8 100644 --- a/include/wx/brush.h +++ b/include/wx/brush.h @@ -39,7 +39,7 @@ enum wxBrushStyle // wxBrushBase -class WXDLLEXPORT wxBrushBase: public wxGDIObject +class WXDLLIMPEXP_CORE wxBrushBase: public wxGDIObject { public: virtual ~wxBrushBase() { } @@ -94,7 +94,7 @@ public: #endif }; -extern WXDLLEXPORT_DATA(wxBrushList*) wxTheBrushList; +extern WXDLLIMPEXP_DATA_CORE(wxBrushList*) wxTheBrushList; // provide comparison operators to allow code such as // diff --git a/include/wx/button.h b/include/wx/button.h index 58f8ab55fe..250f53129c 100644 --- a/include/wx/button.h +++ b/include/wx/button.h @@ -47,13 +47,13 @@ class WXDLLIMPEXP_FWD_CORE wxBitmap; -extern WXDLLEXPORT_DATA(const char) wxButtonNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxButtonNameStr[]; // ---------------------------------------------------------------------------- // wxButton: a push button // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxButtonBase : public wxControl +class WXDLLIMPEXP_CORE wxButtonBase : public wxControl { public: wxButtonBase() { } diff --git a/include/wx/caret.h b/include/wx/caret.h index c3d3ebd2bd..e65e9deca1 100644 --- a/include/wx/caret.h +++ b/include/wx/caret.h @@ -34,7 +34,7 @@ class WXDLLIMPEXP_FWD_CORE wxWindowBase; // appear. It can be either a solid block or a custom bitmap (TODO) // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxCaretBase +class WXDLLIMPEXP_CORE wxCaretBase { public: // ctors @@ -208,7 +208,7 @@ private: #ifdef wxHAS_CARET_USING_OVERLAYS // we don't need to hide the caret if it's rendered using overlays -class WXDLLEXPORT wxCaretSuspend +class WXDLLIMPEXP_CORE wxCaretSuspend { public: wxCaretSuspend(wxWindow *WXUNUSED(win)) {} @@ -218,7 +218,7 @@ public: #else // !wxHAS_CARET_USING_OVERLAYS -class WXDLLEXPORT wxCaretSuspend +class WXDLLIMPEXP_CORE wxCaretSuspend { public: wxCaretSuspend(wxWindow *win) diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h index 8b0348fe37..96e7c8679d 100644 --- a/include/wx/checkbox.h +++ b/include/wx/checkbox.h @@ -49,13 +49,13 @@ enum wxCheckBoxState }; -extern WXDLLEXPORT_DATA(const char) wxCheckBoxNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxCheckBoxNameStr[]; // ---------------------------------------------------------------------------- // wxCheckBox: a control which shows a label and a box which may be checked // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxCheckBoxBase : public wxControl +class WXDLLIMPEXP_CORE wxCheckBoxBase : public wxControl { public: wxCheckBoxBase() { } diff --git a/include/wx/checklst.h b/include/wx/checklst.h index d30003320e..1d886ba4b0 100644 --- a/include/wx/checklst.h +++ b/include/wx/checklst.h @@ -20,7 +20,7 @@ // wxCheckListBox: a listbox whose items may be checked // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxCheckListBoxBase : public +class WXDLLIMPEXP_CORE wxCheckListBoxBase : public #ifdef __WXWINCE__ // keep virtuals synchronised wxListBoxBase diff --git a/include/wx/choice.h b/include/wx/choice.h index 3127b083a5..e6e85a2241 100644 --- a/include/wx/choice.h +++ b/include/wx/choice.h @@ -26,13 +26,13 @@ // global data // ---------------------------------------------------------------------------- -extern WXDLLEXPORT_DATA(const char) wxChoiceNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxChoiceNameStr[]; // ---------------------------------------------------------------------------- // wxChoice allows to select one of a non-modifiable list of strings // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxChoiceBase : public wxControlWithItems +class WXDLLIMPEXP_CORE wxChoiceBase : public wxControlWithItems { public: wxChoiceBase() { } diff --git a/include/wx/choicebk.h b/include/wx/choicebk.h index 0c06f3c5ff..fc6490cf8a 100644 --- a/include/wx/choicebk.h +++ b/include/wx/choicebk.h @@ -36,7 +36,7 @@ extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING // wxChoicebook // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxChoicebook : public wxBookCtrlBase +class WXDLLIMPEXP_CORE wxChoicebook : public wxBookCtrlBase { public: wxChoicebook() @@ -118,7 +118,7 @@ private: // choicebook event class and related stuff // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxChoicebookEvent : public wxBookCtrlBaseEvent +class WXDLLIMPEXP_CORE wxChoicebookEvent : public wxBookCtrlBaseEvent { public: wxChoicebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0, diff --git a/include/wx/clipbrd.h b/include/wx/clipbrd.h index 886ac3871c..9977256a31 100644 --- a/include/wx/clipbrd.h +++ b/include/wx/clipbrd.h @@ -32,7 +32,7 @@ class WXDLLIMPEXP_FWD_CORE wxClipboard; // with wxDataObject. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxClipboardBase : public wxObject +class WXDLLIMPEXP_CORE wxClipboardBase : public wxObject { public: wxClipboardBase() { m_usePrimary = false; } @@ -129,7 +129,7 @@ public: // helpful class for opening the clipboard and automatically closing it // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxClipboardLocker +class WXDLLIMPEXP_CORE wxClipboardLocker { public: wxClipboardLocker(wxClipboard *clipboard = (wxClipboard *)NULL) diff --git a/include/wx/clrpicker.h b/include/wx/clrpicker.h index 3d07cfa559..59edfe8436 100644 --- a/include/wx/clrpicker.h +++ b/include/wx/clrpicker.h @@ -22,8 +22,8 @@ class WXDLLIMPEXP_FWD_CORE wxColourPickerEvent; -extern WXDLLEXPORT_DATA(const char) wxColourPickerWidgetNameStr[]; -extern WXDLLEXPORT_DATA(const char) wxColourPickerCtrlNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxColourPickerWidgetNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxColourPickerCtrlNameStr[]; // show the colour in HTML form (#AABBCC) as colour button label #define wxCLRBTN_SHOW_LABEL 100 diff --git a/include/wx/cmdproc.h b/include/wx/cmdproc.h index ef5929870f..cba83770dd 100644 --- a/include/wx/cmdproc.h +++ b/include/wx/cmdproc.h @@ -22,7 +22,7 @@ class WXDLLIMPEXP_FWD_CORE wxMenu; // wxCommand: a single command capable of performing itself // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxCommand : public wxObject +class WXDLLIMPEXP_CORE wxCommand : public wxObject { public: wxCommand(bool canUndoIt = false, const wxString& name = wxEmptyString); @@ -49,7 +49,7 @@ private: // wxCommandProcessor: wxCommand manager // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxCommandProcessor : public wxObject +class WXDLLIMPEXP_CORE wxCommandProcessor : public wxObject { public: // if max number of commands is -1, it is unlimited diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h index 630415f4c3..ca69e6e107 100644 --- a/include/wx/cmndata.h +++ b/include/wx/cmndata.h @@ -26,7 +26,7 @@ class WXDLLIMPEXP_FWD_CORE wxPrintNativeDataBase; -class WXDLLEXPORT wxColourData : public wxObject +class WXDLLIMPEXP_CORE wxColourData : public wxObject { public: // number of custom colours we store @@ -64,7 +64,7 @@ private: DECLARE_DYNAMIC_CLASS(wxColourData) }; -class WXDLLEXPORT wxFontData : public wxObject +class WXDLLIMPEXP_CORE wxFontData : public wxObject { public: wxFontData(); @@ -181,7 +181,7 @@ enum wxPrintBin const int wxPRINTMEDIA_DEFAULT = 0; -class WXDLLEXPORT wxPrintData: public wxObject +class WXDLLIMPEXP_CORE wxPrintData: public wxObject { public: wxPrintData(); @@ -274,7 +274,7 @@ private: * from the dialog. */ -class WXDLLEXPORT wxPrintDialogData: public wxObject +class WXDLLIMPEXP_CORE wxPrintDialogData: public wxObject { public: wxPrintDialogData(); @@ -349,7 +349,7 @@ private: // Compatibility with old name #define wxPageSetupData wxPageSetupDialogData -class WXDLLEXPORT wxPageSetupDialogData: public wxObject +class WXDLLIMPEXP_CORE wxPageSetupDialogData: public wxObject { public: wxPageSetupDialogData(); diff --git a/include/wx/cocoa/app.h b/include/wx/cocoa/app.h index 50900b4f18..36c8e57805 100644 --- a/include/wx/cocoa/app.h +++ b/include/wx/cocoa/app.h @@ -22,7 +22,7 @@ typedef const struct __CFString * CFStringRef; // ======================================================================== // Represents the application. Derive OnInit and declare // a new App object to start application -class WXDLLEXPORT wxApp: public wxAppBase +class WXDLLIMPEXP_CORE wxApp: public wxAppBase { DECLARE_DYNAMIC_CLASS(wxApp) // ------------------------------------------------------------------------ diff --git a/include/wx/cocoa/bitmap.h b/include/wx/cocoa/bitmap.h index c7fc972c1c..d3caa0d5a5 100644 --- a/include/wx/cocoa/bitmap.h +++ b/include/wx/cocoa/bitmap.h @@ -26,7 +26,7 @@ class WXDLLIMPEXP_FWD_CORE wxPixelDataBase; // ======================================================================== // A mask is a 1-bit alpha bitmap used for drawing bitmaps transparently. -class WXDLLEXPORT wxMask: public wxObject +class WXDLLIMPEXP_CORE wxMask: public wxObject { DECLARE_DYNAMIC_CLASS(wxMask) public: @@ -62,7 +62,7 @@ protected: // ======================================================================== // wxBitmap // ======================================================================== -class WXDLLEXPORT wxBitmap: public wxGDIObject +class WXDLLIMPEXP_CORE wxBitmap: public wxGDIObject { // ------------------------------------------------------------------------ // initialization diff --git a/include/wx/cocoa/bmpbuttn.h b/include/wx/cocoa/bmpbuttn.h index b26b75a15e..e9c22e908a 100644 --- a/include/wx/cocoa/bmpbuttn.h +++ b/include/wx/cocoa/bmpbuttn.h @@ -17,7 +17,7 @@ // ======================================================================== // wxBitmapButton // ======================================================================== -class WXDLLEXPORT wxBitmapButton : public wxBitmapButtonBase +class WXDLLIMPEXP_CORE wxBitmapButton : public wxBitmapButtonBase { DECLARE_DYNAMIC_CLASS(wxBitmapButton) DECLARE_EVENT_TABLE() diff --git a/include/wx/cocoa/brush.h b/include/wx/cocoa/brush.h index eec16bc96d..965e35f109 100644 --- a/include/wx/cocoa/brush.h +++ b/include/wx/cocoa/brush.h @@ -21,7 +21,7 @@ class WXDLLIMPEXP_FWD_CORE wxBrush; // ======================================================================== // wxBrush // ======================================================================== -class WXDLLEXPORT wxBrush: public wxBrushBase +class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase { DECLARE_DYNAMIC_CLASS(wxBrush) // ------------------------------------------------------------------------ diff --git a/include/wx/cocoa/button.h b/include/wx/cocoa/button.h index aefc9d1369..91a44f0120 100644 --- a/include/wx/cocoa/button.h +++ b/include/wx/cocoa/button.h @@ -17,7 +17,7 @@ // ======================================================================== // wxButton // ======================================================================== -class WXDLLEXPORT wxButton : public wxButtonBase, protected wxCocoaNSButton +class WXDLLIMPEXP_CORE wxButton : public wxButtonBase, protected wxCocoaNSButton { DECLARE_DYNAMIC_CLASS(wxButton) DECLARE_EVENT_TABLE() diff --git a/include/wx/cocoa/checkbox.h b/include/wx/cocoa/checkbox.h index 93c10cb3fc..a65004c33d 100644 --- a/include/wx/cocoa/checkbox.h +++ b/include/wx/cocoa/checkbox.h @@ -17,7 +17,7 @@ // ======================================================================== // wxCheckBox // ======================================================================== -class WXDLLEXPORT wxCheckBox: public wxCheckBoxBase , protected wxCocoaNSButton +class WXDLLIMPEXP_CORE wxCheckBox: public wxCheckBoxBase , protected wxCocoaNSButton { DECLARE_DYNAMIC_CLASS(wxCheckBox) DECLARE_EVENT_TABLE() diff --git a/include/wx/cocoa/checklst.h b/include/wx/cocoa/checklst.h index 1f00752868..183363edc6 100644 --- a/include/wx/cocoa/checklst.h +++ b/include/wx/cocoa/checklst.h @@ -17,7 +17,7 @@ // ======================================================================== // wxCheckListBox // ======================================================================== -class WXDLLEXPORT wxCheckListBox: public wxCheckListBoxBase //, protected wxCocoaNSTableView +class WXDLLIMPEXP_CORE wxCheckListBox: public wxCheckListBoxBase //, protected wxCocoaNSTableView { DECLARE_DYNAMIC_CLASS(wxCheckListBox) DECLARE_EVENT_TABLE() diff --git a/include/wx/cocoa/choice.h b/include/wx/cocoa/choice.h index 045a21cbc1..9d7f6539ed 100644 --- a/include/wx/cocoa/choice.h +++ b/include/wx/cocoa/choice.h @@ -20,7 +20,7 @@ class WXDLLIMPEXP_FWD_BASE wxSortedArrayString; // ======================================================================== // wxChoice // ======================================================================== -class WXDLLEXPORT wxChoice: public wxChoiceBase /*, protected wxCocoaNSPopUpButton */, protected wxCocoaNSMenu +class WXDLLIMPEXP_CORE wxChoice: public wxChoiceBase /*, protected wxCocoaNSPopUpButton */, protected wxCocoaNSMenu { DECLARE_DYNAMIC_CLASS(wxChoice) DECLARE_EVENT_TABLE() diff --git a/include/wx/cocoa/colour.h b/include/wx/cocoa/colour.h index b2bc5796f1..ddec620a9f 100644 --- a/include/wx/cocoa/colour.h +++ b/include/wx/cocoa/colour.h @@ -19,7 +19,7 @@ // wxColour // ======================================================================== -class WXDLLEXPORT wxColour : public wxColourBase +class WXDLLIMPEXP_CORE wxColour : public wxColourBase { public: // constructors diff --git a/include/wx/cocoa/combobox.h b/include/wx/cocoa/combobox.h index 3a8a9e2d71..2b6e0b4882 100644 --- a/include/wx/cocoa/combobox.h +++ b/include/wx/cocoa/combobox.h @@ -40,7 +40,7 @@ public: // ======================================================================== // wxComboBox // ======================================================================== -class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase, protected wxCocoaNSComboBox, protected wxCocoaNSTextField +class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase, protected wxCocoaNSComboBox, protected wxCocoaNSTextField { DECLARE_DYNAMIC_CLASS(wxComboBox) DECLARE_EVENT_TABLE() diff --git a/include/wx/cocoa/control.h b/include/wx/cocoa/control.h index 1921d083ec..c83ea77760 100644 --- a/include/wx/cocoa/control.h +++ b/include/wx/cocoa/control.h @@ -18,7 +18,7 @@ // wxControl // ======================================================================== -class WXDLLEXPORT wxControl : public wxControlBase, public wxCocoaNSControl +class WXDLLIMPEXP_CORE wxControl : public wxControlBase, public wxCocoaNSControl { DECLARE_ABSTRACT_CLASS(wxControl) WX_DECLARE_COCOA_OWNER(NSControl,NSView,NSView) diff --git a/include/wx/cocoa/cursor.h b/include/wx/cocoa/cursor.h index 474d1b8062..eb220b9fa7 100644 --- a/include/wx/cocoa/cursor.h +++ b/include/wx/cocoa/cursor.h @@ -14,7 +14,7 @@ #include "wx/bitmap.h" -class WXDLLEXPORT wxCursorRefData : public wxGDIRefData +class WXDLLIMPEXP_CORE wxCursorRefData : public wxGDIRefData { public: wxCursorRefData(); @@ -34,7 +34,7 @@ protected: #define M_CURSORHANDLERDATA ((wxCursorRefData *)bitmap->m_refData) // Cursor -class WXDLLEXPORT wxCursor: public wxBitmap +class WXDLLIMPEXP_CORE wxCursor: public wxBitmap { public: wxCursor(); @@ -58,7 +58,7 @@ public: DECLARE_DYNAMIC_CLASS(wxCursor) }; -extern WXDLLEXPORT void wxSetCursor(const wxCursor& cursor); +extern WXDLLIMPEXP_CORE void wxSetCursor(const wxCursor& cursor); #endif // _WX_COCOA_CURSOR_H_ diff --git a/include/wx/cocoa/dcmemory.h b/include/wx/cocoa/dcmemory.h index 1e6f66ed71..bb5dc4d916 100644 --- a/include/wx/cocoa/dcmemory.h +++ b/include/wx/cocoa/dcmemory.h @@ -16,7 +16,7 @@ #include "wx/dcmemory.h" -class WXDLLEXPORT wxMemoryDCImpl: public wxCocoaDCImpl +class WXDLLIMPEXP_CORE wxMemoryDCImpl: public wxCocoaDCImpl { DECLARE_DYNAMIC_CLASS(wxMemoryDCImpl) diff --git a/include/wx/cocoa/dcscreen.h b/include/wx/cocoa/dcscreen.h index 0ba2e57133..cd00c5528e 100644 --- a/include/wx/cocoa/dcscreen.h +++ b/include/wx/cocoa/dcscreen.h @@ -15,7 +15,7 @@ #include "wx/dcscreen.h" #include "wx/cocoa/dc.h" -class WXDLLEXPORT wxScreenDCImpl: public wxCocoaDCImpl +class WXDLLIMPEXP_CORE wxScreenDCImpl: public wxCocoaDCImpl { DECLARE_DYNAMIC_CLASS(wxScreenDCImpl) public: diff --git a/include/wx/cocoa/dialog.h b/include/wx/cocoa/dialog.h index 6de08332a3..9bf499f766 100644 --- a/include/wx/cocoa/dialog.h +++ b/include/wx/cocoa/dialog.h @@ -20,7 +20,7 @@ // ======================================================================== // wxDialog // ======================================================================== -class WXDLLEXPORT wxDialog : public wxDialogBase, protected wxCocoaNSPanel +class WXDLLIMPEXP_CORE wxDialog : public wxDialogBase, protected wxCocoaNSPanel { DECLARE_DYNAMIC_CLASS(wxDialog) WX_DECLARE_COCOA_OWNER(NSPanel,NSWindow,NSWindow) diff --git a/include/wx/cocoa/dirdlg.h b/include/wx/cocoa/dirdlg.h index f2df94556b..5a4017d642 100644 --- a/include/wx/cocoa/dirdlg.h +++ b/include/wx/cocoa/dirdlg.h @@ -19,7 +19,7 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSSavePanel); // wxDirDialog //------------------------------------------------------------------------- -class WXDLLEXPORT wxDirDialog: public wxDirDialogBase +class WXDLLIMPEXP_CORE wxDirDialog: public wxDirDialogBase { DECLARE_DYNAMIC_CLASS(wxDirDialog) DECLARE_NO_COPY_CLASS(wxDirDialog) diff --git a/include/wx/cocoa/filedlg.h b/include/wx/cocoa/filedlg.h index 634b98d417..4c168bf14c 100644 --- a/include/wx/cocoa/filedlg.h +++ b/include/wx/cocoa/filedlg.h @@ -19,7 +19,7 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSSavePanel); // wxFileDialog //------------------------------------------------------------------------- -class WXDLLEXPORT wxFileDialog: public wxFileDialogBase +class WXDLLIMPEXP_CORE wxFileDialog: public wxFileDialogBase { DECLARE_DYNAMIC_CLASS(wxFileDialog) DECLARE_NO_COPY_CLASS(wxFileDialog) diff --git a/include/wx/cocoa/font.h b/include/wx/cocoa/font.h index f19d666288..c11e4e3e01 100644 --- a/include/wx/cocoa/font.h +++ b/include/wx/cocoa/font.h @@ -30,7 +30,7 @@ class wxFontRefData; See the documentation in src/cocoa/font.mm for more implementatoin details. */ -class WXDLLEXPORT wxFont : public wxFontBase +class WXDLLIMPEXP_CORE wxFont : public wxFontBase { friend class wxCocoaFontFactory; public: diff --git a/include/wx/cocoa/frame.h b/include/wx/cocoa/frame.h index d75c5c5a0f..b2b68557f3 100644 --- a/include/wx/cocoa/frame.h +++ b/include/wx/cocoa/frame.h @@ -15,7 +15,7 @@ class WXDLLIMPEXP_FWD_CORE wxMenuBar; class WXDLLIMPEXP_FWD_CORE wxStatusBar; -class WXDLLEXPORT wxFrame: public wxFrameBase +class WXDLLIMPEXP_CORE wxFrame: public wxFrameBase { DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxFrame) diff --git a/include/wx/cocoa/gauge.h b/include/wx/cocoa/gauge.h index e629ba56b3..31c73d2e1a 100644 --- a/include/wx/cocoa/gauge.h +++ b/include/wx/cocoa/gauge.h @@ -19,7 +19,7 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSProgressIndicator); // ======================================================================== // wxGauge // ======================================================================== -class WXDLLEXPORT wxGauge: public wxGaugeBase// , protected wxCocoaNSProgressIndicator +class WXDLLIMPEXP_CORE wxGauge: public wxGaugeBase// , protected wxCocoaNSProgressIndicator { DECLARE_DYNAMIC_CLASS(wxGauge) DECLARE_EVENT_TABLE() diff --git a/include/wx/cocoa/icon.h b/include/wx/cocoa/icon.h index be697125de..f054181a9a 100644 --- a/include/wx/cocoa/icon.h +++ b/include/wx/cocoa/icon.h @@ -18,7 +18,7 @@ // ======================================================================== // wxIcon // ======================================================================== -class WXDLLEXPORT wxIcon : public wxGDIObject +class WXDLLIMPEXP_CORE wxIcon : public wxGDIObject { public: wxIcon(); diff --git a/include/wx/cocoa/listbox.h b/include/wx/cocoa/listbox.h index 2d4c74b94e..91cf621212 100644 --- a/include/wx/cocoa/listbox.h +++ b/include/wx/cocoa/listbox.h @@ -19,7 +19,7 @@ // ======================================================================== // wxListBox // ======================================================================== -class WXDLLEXPORT wxListBox: public wxListBoxBase, protected wxCocoaNSTableView +class WXDLLIMPEXP_CORE wxListBox: public wxListBoxBase, protected wxCocoaNSTableView { DECLARE_DYNAMIC_CLASS(wxListBox) DECLARE_EVENT_TABLE() diff --git a/include/wx/cocoa/mbarman.h b/include/wx/cocoa/mbarman.h index 70dc7d3d61..fd6d826da5 100644 --- a/include/wx/cocoa/mbarman.h +++ b/include/wx/cocoa/mbarman.h @@ -21,7 +21,7 @@ DECLARE_WXCOCOA_OBJC_CLASS(wxMenuBarManagerObserver); // ======================================================================== // wxMenuBarManager // ======================================================================== -class WXDLLEXPORT wxMenuBarManager : public wxObject +class WXDLLIMPEXP_CORE wxMenuBarManager : public wxObject { // ------------------------------------------------------------------------ // initialization/destruction diff --git a/include/wx/cocoa/mdi.h b/include/wx/cocoa/mdi.h index c3b12ba595..90165aceed 100644 --- a/include/wx/cocoa/mdi.h +++ b/include/wx/cocoa/mdi.h @@ -24,7 +24,7 @@ WX_DECLARE_EXPORTED_LIST(wxMDIChildFrame, wxCocoaMDIChildFrameList); // ======================================================================== // wxMDIParentFrame // ======================================================================== -class WXDLLEXPORT wxMDIParentFrame: public wxFrame +class WXDLLIMPEXP_CORE wxMDIParentFrame: public wxFrame { friend class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame; DECLARE_EVENT_TABLE() @@ -96,7 +96,7 @@ protected: // ======================================================================== // wxMDIChildFrame // ======================================================================== -class WXDLLEXPORT wxMDIChildFrame: public wxFrame +class WXDLLIMPEXP_CORE wxMDIChildFrame: public wxFrame { friend class WXDLLIMPEXP_FWD_CORE wxMDIParentFrame; DECLARE_EVENT_TABLE() diff --git a/include/wx/cocoa/menu.h b/include/wx/cocoa/menu.h index a2f4fc75bf..6903d190bc 100644 --- a/include/wx/cocoa/menu.h +++ b/include/wx/cocoa/menu.h @@ -22,7 +22,7 @@ // wxMenu // ======================================================================== -class WXDLLEXPORT wxMenu : public wxMenuBase, public wxCocoaNSMenu +class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase, public wxCocoaNSMenu { public: // ctors and dtor @@ -73,7 +73,7 @@ private: // ======================================================================== // wxMenuBar // ======================================================================== -class WXDLLEXPORT wxMenuBar : public wxMenuBarBase +class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase { public: // ctors and dtor diff --git a/include/wx/cocoa/menuitem.h b/include/wx/cocoa/menuitem.h index f0e7d137d1..f69e589853 100644 --- a/include/wx/cocoa/menuitem.h +++ b/include/wx/cocoa/menuitem.h @@ -25,7 +25,7 @@ class wxMenuItemCocoa; WX_DECLARE_HASH_MAP(WX_NSMenuItem,wxMenuItem*,wxPointerHash,wxPointerEqual,wxMenuItemCocoaHash); -class WXDLLEXPORT wxMenuItemCocoa : public wxMenuItemBase +class WXDLLIMPEXP_CORE wxMenuItemCocoa : public wxMenuItemBase { public: // ------------------------------------------------------------------------ diff --git a/include/wx/cocoa/msgdlg.h b/include/wx/cocoa/msgdlg.h index 1a22cb9c23..62c1d1dc7f 100644 --- a/include/wx/cocoa/msgdlg.h +++ b/include/wx/cocoa/msgdlg.h @@ -39,7 +39,7 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSAlert); -class WXDLLEXPORT wxCocoaMessageDialog: public wxMessageDialogBase +class WXDLLIMPEXP_CORE wxCocoaMessageDialog: public wxMessageDialogBase { DECLARE_DYNAMIC_CLASS(wxCocoaMessageDialog) DECLARE_NO_COPY_CLASS(wxCocoaMessageDialog) diff --git a/include/wx/cocoa/notebook.h b/include/wx/cocoa/notebook.h index 8083ec895b..21e6ad3271 100644 --- a/include/wx/cocoa/notebook.h +++ b/include/wx/cocoa/notebook.h @@ -17,7 +17,7 @@ // ======================================================================== // wxNotebook // ======================================================================== -class WXDLLEXPORT wxNotebook: public wxNotebookBase, protected wxCocoaNSTabView +class WXDLLIMPEXP_CORE wxNotebook: public wxNotebookBase, protected wxCocoaNSTabView { DECLARE_DYNAMIC_CLASS(wxNotebook) DECLARE_EVENT_TABLE() diff --git a/include/wx/cocoa/pen.h b/include/wx/cocoa/pen.h index c21325046c..3ee5c2f349 100644 --- a/include/wx/cocoa/pen.h +++ b/include/wx/cocoa/pen.h @@ -21,7 +21,7 @@ class WXDLLIMPEXP_FWD_CORE wxBitmap; // ======================================================================== // wxPen // ======================================================================== -class WXDLLEXPORT wxPen: public wxGDIObject +class WXDLLIMPEXP_CORE wxPen: public wxGDIObject { public: wxPen(); diff --git a/include/wx/cocoa/private/timer.h b/include/wx/cocoa/private/timer.h index accc23910c..9514691c29 100644 --- a/include/wx/cocoa/private/timer.h +++ b/include/wx/cocoa/private/timer.h @@ -20,7 +20,7 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSTimer); -class WXDLLEXPORT wxCocoaTimerImpl : public wxTimerImpl +class WXDLLIMPEXP_CORE wxCocoaTimerImpl : public wxTimerImpl { public: wxCocoaTimerImpl(wxTimer* timer) : wxTimerImpl(timer) { Init(); } diff --git a/include/wx/cocoa/radiobox.h b/include/wx/cocoa/radiobox.h index 86dba5ccbe..9e84110d2d 100644 --- a/include/wx/cocoa/radiobox.h +++ b/include/wx/cocoa/radiobox.h @@ -18,7 +18,7 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSMatrix); // ======================================================================== // wxRadioBox // ======================================================================== -class WXDLLEXPORT wxRadioBox: public wxControl, public wxRadioBoxBase// , protected wxCocoaNSButton +class WXDLLIMPEXP_CORE wxRadioBox: public wxControl, public wxRadioBoxBase// , protected wxCocoaNSButton { DECLARE_DYNAMIC_CLASS(wxRadioBox) DECLARE_EVENT_TABLE() diff --git a/include/wx/cocoa/radiobut.h b/include/wx/cocoa/radiobut.h index 72e6c08fcc..9225022b35 100644 --- a/include/wx/cocoa/radiobut.h +++ b/include/wx/cocoa/radiobut.h @@ -21,7 +21,7 @@ WX_DECLARE_EXPORTED_LIST(wxRadioButton, wxRadioButtonList); // ======================================================================== // wxRadioButton // ======================================================================== -class WXDLLEXPORT wxRadioButton: public wxControl, protected wxCocoaNSButton +class WXDLLIMPEXP_CORE wxRadioButton: public wxControl, protected wxCocoaNSButton { DECLARE_DYNAMIC_CLASS(wxRadioButton) DECLARE_EVENT_TABLE() diff --git a/include/wx/cocoa/region.h b/include/wx/cocoa/region.h index 2789d24e0b..de34bbf747 100644 --- a/include/wx/cocoa/region.h +++ b/include/wx/cocoa/region.h @@ -20,7 +20,7 @@ typedef struct CGRect NSRect; typedef struct _NSRect NSRect; #endif -class WXDLLEXPORT wxRegion : public wxRegionGeneric +class WXDLLIMPEXP_CORE wxRegion : public wxRegionGeneric { public: wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h) @@ -55,7 +55,7 @@ private: DECLARE_DYNAMIC_CLASS(wxRegion); }; -class WXDLLEXPORT wxRegionIterator : public wxRegionIteratorGeneric +class WXDLLIMPEXP_CORE wxRegionIterator : public wxRegionIteratorGeneric { // DECLARE_DYNAMIC_CLASS(wxRegionIteratorGeneric); public: diff --git a/include/wx/cocoa/scrolbar.h b/include/wx/cocoa/scrolbar.h index 2ae9935932..7d449fe2aa 100644 --- a/include/wx/cocoa/scrolbar.h +++ b/include/wx/cocoa/scrolbar.h @@ -17,7 +17,7 @@ // ======================================================================== // wxScrollBar // ======================================================================== -class WXDLLEXPORT wxScrollBar: public wxScrollBarBase, protected wxCocoaNSScroller +class WXDLLIMPEXP_CORE wxScrollBar: public wxScrollBarBase, protected wxCocoaNSScroller { DECLARE_DYNAMIC_CLASS(wxScrollBar) DECLARE_EVENT_TABLE() diff --git a/include/wx/cocoa/slider.h b/include/wx/cocoa/slider.h index 1d2a164666..32950b547f 100644 --- a/include/wx/cocoa/slider.h +++ b/include/wx/cocoa/slider.h @@ -19,7 +19,7 @@ // ======================================================================== // wxSlider // ======================================================================== -class WXDLLEXPORT wxSlider: public wxSliderBase, protected wxCocoaNSSlider +class WXDLLIMPEXP_CORE wxSlider: public wxSliderBase, protected wxCocoaNSSlider { DECLARE_DYNAMIC_CLASS(wxSlider) DECLARE_EVENT_TABLE() diff --git a/include/wx/cocoa/spinbutt.h b/include/wx/cocoa/spinbutt.h index fab76435a0..dd950c00cb 100644 --- a/include/wx/cocoa/spinbutt.h +++ b/include/wx/cocoa/spinbutt.h @@ -17,7 +17,7 @@ // ======================================================================== // wxSpinButton // ======================================================================== -class WXDLLEXPORT wxSpinButton: public wxSpinButtonBase// , protected wxCocoaNSStepper +class WXDLLIMPEXP_CORE wxSpinButton: public wxSpinButtonBase// , protected wxCocoaNSStepper { DECLARE_DYNAMIC_CLASS(wxSpinButton) DECLARE_EVENT_TABLE() diff --git a/include/wx/cocoa/statbmp.h b/include/wx/cocoa/statbmp.h index 48e281b4a0..8b6874803f 100644 --- a/include/wx/cocoa/statbmp.h +++ b/include/wx/cocoa/statbmp.h @@ -17,7 +17,7 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSImageView); // ======================================================================== // wxStaticBitmap // ======================================================================== -class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase //, protected wxCocoaNSxxx +class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase //, protected wxCocoaNSxxx { DECLARE_DYNAMIC_CLASS(wxStaticBitmap) DECLARE_EVENT_TABLE() diff --git a/include/wx/cocoa/statbox.h b/include/wx/cocoa/statbox.h index 35f5506498..2502c03def 100644 --- a/include/wx/cocoa/statbox.h +++ b/include/wx/cocoa/statbox.h @@ -17,7 +17,7 @@ // ======================================================================== // wxStaticBox // ======================================================================== -class WXDLLEXPORT wxStaticBox: public wxStaticBoxBase, protected wxCocoaNSBox +class WXDLLIMPEXP_CORE wxStaticBox: public wxStaticBoxBase, protected wxCocoaNSBox { DECLARE_DYNAMIC_CLASS(wxStaticBox) DECLARE_EVENT_TABLE() diff --git a/include/wx/cocoa/statline.h b/include/wx/cocoa/statline.h index 27b1d8e152..990e5e80bf 100644 --- a/include/wx/cocoa/statline.h +++ b/include/wx/cocoa/statline.h @@ -17,7 +17,7 @@ // ======================================================================== // wxStaticLine // ======================================================================== -class WXDLLEXPORT wxStaticLine: public wxStaticLineBase// , protected wxCocoaNSButton +class WXDLLIMPEXP_CORE wxStaticLine: public wxStaticLineBase// , protected wxCocoaNSButton { DECLARE_DYNAMIC_CLASS(wxStaticLine) DECLARE_EVENT_TABLE() diff --git a/include/wx/cocoa/stattext.h b/include/wx/cocoa/stattext.h index 74f8c1ced5..1acc560474 100644 --- a/include/wx/cocoa/stattext.h +++ b/include/wx/cocoa/stattext.h @@ -17,7 +17,7 @@ // ======================================================================== // wxStaticText // ======================================================================== -class WXDLLEXPORT wxStaticText : public wxStaticTextBase, protected wxCocoaNSTextField +class WXDLLIMPEXP_CORE wxStaticText : public wxStaticTextBase, protected wxCocoaNSTextField { DECLARE_DYNAMIC_CLASS(wxStaticText) DECLARE_EVENT_TABLE() diff --git a/include/wx/cocoa/textctrl.h b/include/wx/cocoa/textctrl.h index 290ac2a485..64e4f32a6c 100644 --- a/include/wx/cocoa/textctrl.h +++ b/include/wx/cocoa/textctrl.h @@ -17,7 +17,7 @@ // ======================================================================== // wxTextCtrl // ======================================================================== -class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase, protected wxCocoaNSTextField +class WXDLLIMPEXP_CORE wxTextCtrl : public wxTextCtrlBase, protected wxCocoaNSTextField { DECLARE_DYNAMIC_CLASS(wxTextCtrl) DECLARE_EVENT_TABLE() diff --git a/include/wx/cocoa/toplevel.h b/include/wx/cocoa/toplevel.h index 0bf28d1056..0e850d6343 100644 --- a/include/wx/cocoa/toplevel.h +++ b/include/wx/cocoa/toplevel.h @@ -20,7 +20,7 @@ class WXDLLIMPEXP_FWD_CORE wxMenuBar; // ======================================================================== // wxTopLevelWindowCocoa // ======================================================================== -class WXDLLEXPORT wxTopLevelWindowCocoa : public wxTopLevelWindowBase, protected wxCocoaNSWindow +class WXDLLIMPEXP_CORE wxTopLevelWindowCocoa : public wxTopLevelWindowBase, protected wxCocoaNSWindow { DECLARE_EVENT_TABLE(); DECLARE_NO_COPY_CLASS(wxTopLevelWindowCocoa); @@ -126,6 +126,6 @@ protected: }; // list of all frames and modeless dialogs -extern WXDLLEXPORT_DATA(wxWindowList) wxModelessWindows; +extern WXDLLIMPEXP_DATA_CORE(wxWindowList) wxModelessWindows; #endif // __WX_COCOA_TOPLEVEL_H__ diff --git a/include/wx/cocoa/window.h b/include/wx/cocoa/window.h index 91e6fd0082..c0ae13a74d 100644 --- a/include/wx/cocoa/window.h +++ b/include/wx/cocoa/window.h @@ -43,7 +43,7 @@ class wxCocoaTrackingRectManager; // ======================================================================== // wxWindowCocoa // ======================================================================== -class WXDLLEXPORT wxWindowCocoa: public wxWindowBase, protected wxCocoaNSView +class WXDLLIMPEXP_CORE wxWindowCocoa: public wxWindowBase, protected wxCocoaNSView { DECLARE_DYNAMIC_CLASS(wxWindowCocoa) DECLARE_NO_COPY_CLASS(wxWindowCocoa) diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h index 6bff18a13b..d0aac1af88 100644 --- a/include/wx/colordlg.h +++ b/include/wx/colordlg.h @@ -33,11 +33,10 @@ class WXDLLIMPEXP_FWD_CORE wxColourData; // get the colour from user and return it -wxColour WXDLLEXPORT -wxGetColourFromUser(wxWindow *parent = (wxWindow *)NULL, - const wxColour& colInit = wxNullColour, - const wxString& caption = wxEmptyString, - wxColourData *data = NULL); +WXDLLIMPEXP_CORE wxColour wxGetColourFromUser(wxWindow *parent = (wxWindow *)NULL, + const wxColour& colInit = wxNullColour, + const wxString& caption = wxEmptyString, + wxColourData *data = NULL); #endif // wxUSE_COLOURDLG diff --git a/include/wx/colour.h b/include/wx/colour.h index c6f0e91f23..9c2fc423b7 100644 --- a/include/wx/colour.h +++ b/include/wx/colour.h @@ -50,7 +50,7 @@ const unsigned char wxALPHA_OPAQUE = 0xff; #if wxUSE_VARIANT #include "wx/variant.h" -DECLARE_VARIANT_OBJECT_EXPORTED(wxColour,WXDLLEXPORT) +DECLARE_VARIANT_OBJECT_EXPORTED(wxColour,WXDLLIMPEXP_CORE) #endif //----------------------------------------------------------------------------- @@ -68,7 +68,7 @@ DECLARE_VARIANT_OBJECT_EXPORTED(wxColour,WXDLLEXPORT) #define wxCOLOUR_IS_GDIOBJECT 1 #endif -class WXDLLEXPORT wxColourBase : public +class WXDLLIMPEXP_CORE wxColourBase : public #if wxCOLOUR_IS_GDIOBJECT wxGDIObject #else @@ -121,7 +121,7 @@ public: #if !wxCOLOUR_IS_GDIOBJECT virtual bool IsOk() const= 0; - + // older version, for backwards compatibility only (but not deprecated // because it's still widely used) bool Ok() const { return IsOk(); } diff --git a/include/wx/combo.h b/include/wx/combo.h index 7d3af18656..a79c3d6192 100644 --- a/include/wx/combo.h +++ b/include/wx/combo.h @@ -137,7 +137,7 @@ struct wxComboCtrlFeatures }; -class WXDLLEXPORT wxComboCtrlBase : public wxControl +class WXDLLIMPEXP_CORE wxComboCtrlBase : public wxControl { friend class wxComboPopup; public: @@ -645,7 +645,7 @@ enum }; -class WXDLLEXPORT wxComboPopup +class WXDLLIMPEXP_CORE wxComboPopup { friend class wxComboCtrlBase; public: diff --git a/include/wx/combobox.h b/include/wx/combobox.h index 4f98670f68..ce7ba61aee 100644 --- a/include/wx/combobox.h +++ b/include/wx/combobox.h @@ -16,7 +16,7 @@ #if wxUSE_COMBOBOX -extern WXDLLEXPORT_DATA(const char) wxComboBoxNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxComboBoxNameStr[]; // ---------------------------------------------------------------------------- // wxComboBoxBase: this interface defines the methods wxComboBox must implement @@ -25,7 +25,7 @@ extern WXDLLEXPORT_DATA(const char) wxComboBoxNameStr[]; #include "wx/ctrlsub.h" #include "wx/textentry.h" -class WXDLLEXPORT wxComboBoxBase : public wxItemContainer, +class WXDLLIMPEXP_CORE wxComboBoxBase : public wxItemContainer, public wxTextEntry { public: diff --git a/include/wx/containr.h b/include/wx/containr.h index 0ba59825c5..7dcf2a048e 100644 --- a/include/wx/containr.h +++ b/include/wx/containr.h @@ -31,7 +31,7 @@ class WXDLLIMPEXP_FWD_CORE wxWindowBase; // wxControlContainerBase: common part used in both native and generic cases // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxControlContainerBase +class WXDLLIMPEXP_CORE wxControlContainerBase { public: // default ctor, SetContainerWindow() must be called later @@ -163,7 +163,7 @@ protected: \ // ---------------------------------------------------------------------------- // this must be a real class as we forward-declare it elsewhere -class WXDLLEXPORT wxControlContainer : public wxControlContainerBase +class WXDLLIMPEXP_CORE wxControlContainer : public wxControlContainerBase { protected: // set the focus to the child which had it the last time @@ -198,7 +198,7 @@ class WXDLLIMPEXP_FWD_CORE wxNavigationKeyEvent; // wxControlContainer for TAB navigation implemented in wx itself // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxControlContainer : public wxControlContainerBase +class WXDLLIMPEXP_CORE wxControlContainer : public wxControlContainerBase { public: // default ctor, SetContainerWindow() must be called later diff --git a/include/wx/control.h b/include/wx/control.h index 08e9aeceea..2a91838078 100644 --- a/include/wx/control.h +++ b/include/wx/control.h @@ -22,13 +22,13 @@ #include "wx/window.h" // base class -extern WXDLLEXPORT_DATA(const char) wxControlNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxControlNameStr[]; // ---------------------------------------------------------------------------- // wxControl is the base class for all controls // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxControlBase : public wxWindow +class WXDLLIMPEXP_CORE wxControlBase : public wxWindow { public: wxControlBase() { } diff --git a/include/wx/cshelp.h b/include/wx/cshelp.h index e80c2d0ab4..a165ab220e 100644 --- a/include/wx/cshelp.h +++ b/include/wx/cshelp.h @@ -36,7 +36,7 @@ * window for the application to display help for. */ -class WXDLLEXPORT wxContextHelp : public wxObject +class WXDLLIMPEXP_CORE wxContextHelp : public wxObject { public: wxContextHelp(wxWindow* win = NULL, bool beginHelp = true); @@ -65,7 +65,7 @@ private: * to put the application into context help mode. */ -class WXDLLEXPORT wxContextHelpButton : public wxBitmapButton +class WXDLLIMPEXP_CORE wxContextHelpButton : public wxBitmapButton { public: wxContextHelpButton(wxWindow* parent, @@ -106,7 +106,7 @@ private: // and overriding ShowHelp() but calling the base class version wouldn't work // any more, which forces us to use a rather ugly hack and pass the extra // parameters of ShowHelpAtPoint() to ShowHelp() via member variables. -class WXDLLEXPORT wxHelpProvider +class WXDLLIMPEXP_CORE wxHelpProvider { public: // get/set the current (application-global) help provider (Set() returns @@ -188,7 +188,7 @@ WX_DECLARE_EXPORTED_HASH_MAP( wxUIntPtr, wxString, wxIntegerHash, // wxSimpleHelpProvider is an implementation of wxHelpProvider which supports // only plain text help strings and shows the string associated with the // control (if any) in a tooltip -class WXDLLEXPORT wxSimpleHelpProvider : public wxHelpProvider +class WXDLLIMPEXP_CORE wxSimpleHelpProvider : public wxHelpProvider { public: // implement wxHelpProvider methods @@ -212,7 +212,7 @@ protected: // both context identifiers and plain text help strings. If the help text is an integer, // it is passed to wxHelpController::DisplayContextPopup. Otherwise, it shows the string // in a tooltip as per wxSimpleHelpProvider. -class WXDLLEXPORT wxHelpControllerHelpProvider : public wxSimpleHelpProvider +class WXDLLIMPEXP_CORE wxHelpControllerHelpProvider : public wxSimpleHelpProvider { public: // Note that it doesn't own the help controller. The help controller @@ -236,7 +236,7 @@ protected: }; // Convenience function for turning context id into wxString -WXDLLEXPORT wxString wxContextId(int id); +WXDLLIMPEXP_CORE wxString wxContextId(int id); #endif // wxUSE_HELP diff --git a/include/wx/ctrlsub.h b/include/wx/ctrlsub.h index 453fe43438..6cdbee1a1f 100644 --- a/include/wx/ctrlsub.h +++ b/include/wx/ctrlsub.h @@ -30,7 +30,7 @@ // implements an extended interface deriving from this one) // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxItemContainerImmutable +class WXDLLIMPEXP_CORE wxItemContainerImmutable { public: wxItemContainerImmutable() { } @@ -97,7 +97,7 @@ protected: // in this case DoInsertItem() needs to be overridden. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxItemContainer : public wxItemContainerImmutable +class WXDLLIMPEXP_CORE wxItemContainer : public wxItemContainerImmutable { private: // AppendItems() and InsertItems() helpers just call DoAppend/InsertItems() @@ -412,7 +412,7 @@ private: wxClientData* GetClientObject(unsigned int n) const \ { return wxItemContainer::GetClientObject(n); } -class WXDLLEXPORT wxControlWithItemsBase : public wxControl, +class WXDLLIMPEXP_CORE wxControlWithItemsBase : public wxControl, public wxItemContainer { public: @@ -446,7 +446,7 @@ private: #elif defined(__WXMOTIF__) #include "wx/motif/ctrlsub.h" #else - class WXDLLEXPORT wxControlWithItems : public wxControlWithItemsBase + class WXDLLIMPEXP_CORE wxControlWithItems : public wxControlWithItemsBase { public: wxControlWithItems() { } diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h index 04fbee454f..f7923c0b65 100644 --- a/include/wx/dataobj.h +++ b/include/wx/dataobj.h @@ -92,7 +92,7 @@ public: // the value for default argument to some functions (corresponds to // wxDF_INVALID) -extern WXDLLEXPORT const wxDataFormat& wxFormatInvalid; +extern WXDLLIMPEXP_CORE const wxDataFormat& wxFormatInvalid; // ---------------------------------------------------------------------------- // wxDataObject represents a piece of data which knows which formats it @@ -114,7 +114,7 @@ extern WXDLLEXPORT const wxDataFormat& wxFormatInvalid; // to be supported by SetData() or GetDataHere(). // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxDataObjectBase +class WXDLLIMPEXP_CORE wxDataObjectBase { public: enum Direction @@ -194,7 +194,7 @@ public: // Otherwise, you should use wxDataObjectComposite or wxDataObject directly. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxDataObjectSimple : public wxDataObject +class WXDLLIMPEXP_CORE wxDataObjectSimple : public wxDataObject { public: // ctor takes the format we support, but it can also be set later with @@ -261,7 +261,7 @@ private: WX_DECLARE_EXPORTED_LIST(wxDataObjectSimple, wxSimpleDataObjectList); -class WXDLLEXPORT wxDataObjectComposite : public wxDataObject +class WXDLLIMPEXP_CORE wxDataObjectComposite : public wxDataObject { public: // ctor @@ -324,7 +324,7 @@ private: // wxTextDataObject contains text data // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxTextDataObject : public wxDataObjectSimple +class WXDLLIMPEXP_CORE wxTextDataObject : public wxDataObjectSimple { public: // ctor: you can specify the text here or in SetText(), or override @@ -392,7 +392,7 @@ private: // wxBitmapDataObject contains a bitmap // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxBitmapDataObjectBase : public wxDataObjectSimple +class WXDLLIMPEXP_CORE wxBitmapDataObjectBase : public wxDataObjectSimple { public: // ctor: you can specify the bitmap here or in SetBitmap(), or override @@ -420,7 +420,7 @@ protected: // data from drag and drop operation. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFileDataObjectBase : public wxDataObjectSimple +class WXDLLIMPEXP_CORE wxFileDataObjectBase : public wxDataObjectSimple { public: // ctor: use AddFile() later to fill the array @@ -441,7 +441,7 @@ protected: // It is understood that this data can be copied bitwise. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxCustomDataObject : public wxDataObjectSimple +class WXDLLIMPEXP_CORE wxCustomDataObject : public wxDataObjectSimple { public: // if you don't specify the format in the ctor, you can still use @@ -523,7 +523,7 @@ private: #endif // wxURLDataObject is simply wxTextDataObject with a different name - class WXDLLEXPORT wxURLDataObject : public wxTextDataObject + class WXDLLIMPEXP_CORE wxURLDataObject : public wxTextDataObject { public: wxURLDataObject(const wxString& url = wxEmptyString) diff --git a/include/wx/dc.h b/include/wx/dc.h index b94afb35c0..f0fe623aa7 100644 --- a/include/wx/dc.h +++ b/include/wx/dc.h @@ -46,7 +46,7 @@ class WXDLLIMPEXP_FWD_CORE wxPrintData; // wxDrawObject helper class //----------------------------------------------------------------------------- -class WXDLLEXPORT wxDrawObject +class WXDLLIMPEXP_CORE wxDrawObject { public: @@ -1108,7 +1108,7 @@ private: // restore it automatically when the object goes out of scope // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxDCTextColourChanger +class WXDLLIMPEXP_CORE wxDCTextColourChanger { public: wxDCTextColourChanger(wxDC& dc) : m_dc(dc), m_colFgOld() { } @@ -1144,7 +1144,7 @@ private: // restore it automatically when the object goes out of scope // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxDCPenChanger +class WXDLLIMPEXP_CORE wxDCPenChanger { public: wxDCPenChanger(wxDC& dc, const wxPen& pen) : m_dc(dc), m_penOld(dc.GetPen()) @@ -1171,7 +1171,7 @@ private: // restore it automatically when the object goes out of scope // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxDCBrushChanger +class WXDLLIMPEXP_CORE wxDCBrushChanger { public: wxDCBrushChanger(wxDC& dc, const wxBrush& brush) : m_dc(dc), m_brushOld(dc.GetBrush()) @@ -1198,7 +1198,7 @@ private: // destroys it in the dtor // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxDCClipper +class WXDLLIMPEXP_CORE wxDCClipper { public: wxDCClipper(wxDC& dc, const wxRegion& r) : m_dc(dc) diff --git a/include/wx/dcgraph.h b/include/wx/dcgraph.h index d51692eb4f..5de63597c0 100644 --- a/include/wx/dcgraph.h +++ b/include/wx/dcgraph.h @@ -21,7 +21,7 @@ class WXDLLIMPEXP_FWD_CORE wxWindowDC; -class WXDLLEXPORT wxGCDC: public wxDC +class WXDLLIMPEXP_CORE wxGCDC: public wxDC { public: wxGCDC( const wxWindowDC& dc ); @@ -37,7 +37,7 @@ public: }; -class WXDLLEXPORT wxGCDCImpl: public wxDCImpl +class WXDLLIMPEXP_CORE wxGCDCImpl: public wxDCImpl { public: wxGCDCImpl( wxDC *owner, const wxWindowDC& dc ); diff --git a/include/wx/dcmirror.h b/include/wx/dcmirror.h index 5ffb9382a5..94e33b2ad5 100644 --- a/include/wx/dcmirror.h +++ b/include/wx/dcmirror.h @@ -18,7 +18,7 @@ // wxMirrorDC allows to write the same code for horz/vertical layout // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMirrorDCImpl : public wxDCImpl +class WXDLLIMPEXP_CORE wxMirrorDCImpl : public wxDCImpl { public: // constructs a mirror DC associated with the given real DC @@ -275,7 +275,7 @@ private: DECLARE_NO_COPY_CLASS(wxMirrorDCImpl) }; -class WXDLLEXPORT wxMirrorDC : public wxDC +class WXDLLIMPEXP_CORE wxMirrorDC : public wxDC { public: wxMirrorDC(wxDC& dc, bool mirror) diff --git a/include/wx/dialog.h b/include/wx/dialog.h index 62bfb79265..9eee12da29 100644 --- a/include/wx/dialog.h +++ b/include/wx/dialog.h @@ -53,9 +53,9 @@ enum wxDialogLayoutAdaptationMode wxDIALOG_ADAPTATION_MODE_DISABLED = 2 // disable this dialog overriding global status }; -extern WXDLLEXPORT_DATA(const char) wxDialogNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxDialogNameStr[]; -class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow +class WXDLLIMPEXP_CORE wxDialogBase : public wxTopLevelWindow { public: enum @@ -235,7 +235,7 @@ private: * a help mechanism. */ -class WXDLLEXPORT wxDialogLayoutAdapter: public wxObject +class WXDLLIMPEXP_CORE wxDialogLayoutAdapter: public wxObject { DECLARE_CLASS(wxDialogLayoutAdapter) public: @@ -253,7 +253,7 @@ public: * */ -class WXDLLEXPORT wxStandardDialogLayoutAdapter: public wxDialogLayoutAdapter +class WXDLLIMPEXP_CORE wxStandardDialogLayoutAdapter: public wxDialogLayoutAdapter { DECLARE_CLASS(wxStandardDialogLayoutAdapter) public: diff --git a/include/wx/dialup.h b/include/wx/dialup.h index 3c8a9dfdf9..73819e1df8 100644 --- a/include/wx/dialup.h +++ b/include/wx/dialup.h @@ -43,7 +43,7 @@ class WXDLLIMPEXP_FWD_BASE wxArrayString; * main thread? */ -class WXDLLEXPORT wxDialUpManager +class WXDLLIMPEXP_CORE wxDialUpManager { public: // this function should create and return the object of the @@ -156,7 +156,7 @@ extern WXDLLIMPEXP_CORE const wxEventType wxEVT_DIALUP_CONNECTED; extern WXDLLIMPEXP_CORE const wxEventType wxEVT_DIALUP_DISCONNECTED; // the event class for the dialup events -class WXDLLEXPORT wxDialUpEvent : public wxEvent +class WXDLLIMPEXP_CORE wxDialUpEvent : public wxEvent { public: wxDialUpEvent(bool isConnected, bool isOwnEvent) : wxEvent(isOwnEvent) diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h index 4258accb07..b7f0b8e890 100644 --- a/include/wx/dirdlg.h +++ b/include/wx/dirdlg.h @@ -20,9 +20,9 @@ // constants // ---------------------------------------------------------------------------- -extern WXDLLEXPORT_DATA(const char) wxDirDialogNameStr[]; -extern WXDLLEXPORT_DATA(const char) wxDirDialogDefaultFolderStr[]; -extern WXDLLEXPORT_DATA(const char) wxDirSelectorPromptStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxDirDialogNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxDirDialogDefaultFolderStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxDirSelectorPromptStr[]; #define wxDD_CHANGE_DIR 0x0100 #define wxDD_DIR_MUST_EXIST 0x0200 @@ -40,7 +40,7 @@ extern WXDLLEXPORT_DATA(const char) wxDirSelectorPromptStr[]; // wxDirDialogBase //------------------------------------------------------------------------- -class WXDLLEXPORT wxDirDialogBase : public wxDialog +class WXDLLIMPEXP_CORE wxDirDialogBase : public wxDialog { public: wxDirDialogBase() {} @@ -128,7 +128,7 @@ protected: // common ::wxDirSelector() function // ---------------------------------------------------------------------------- -WXDLLEXPORT wxString +WXDLLIMPEXP_CORE wxString wxDirSelector(const wxString& message = wxDirSelectorPromptStr, const wxString& defaultPath = wxEmptyString, long style = wxDD_DEFAULT_STYLE, diff --git a/include/wx/display.h b/include/wx/display.h index d91abbaf83..354b95d73c 100644 --- a/include/wx/display.h +++ b/include/wx/display.h @@ -22,7 +22,7 @@ WX_DECLARE_EXPORTED_OBJARRAY(wxVideoMode, wxArrayVideoModes); // default, uninitialized, video mode object - extern WXDLLEXPORT_DATA(const wxVideoMode) wxDefaultVideoMode; + extern WXDLLIMPEXP_DATA_CORE(const wxVideoMode) wxDefaultVideoMode; #endif // wxUSE_DISPLAY class WXDLLIMPEXP_FWD_CORE wxWindow; @@ -37,7 +37,7 @@ class WXDLLIMPEXP_FWD_CORE wxDisplayImpl; // wxDisplay: represents a display/monitor attached to the system // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxDisplay +class WXDLLIMPEXP_CORE wxDisplay { public: // initialize the object containing all information about the given diff --git a/include/wx/display_impl.h b/include/wx/display_impl.h index 4fedb1ffcb..015ffec466 100644 --- a/include/wx/display_impl.h +++ b/include/wx/display_impl.h @@ -17,7 +17,7 @@ // wxDisplayFactory: allows to create wxDisplay objects // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxDisplayFactory +class WXDLLIMPEXP_CORE wxDisplayFactory { public: wxDisplayFactory() { } @@ -44,7 +44,7 @@ public: // wxDisplayImpl: base class for all wxDisplay implementations // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxDisplayImpl +class WXDLLIMPEXP_CORE wxDisplayImpl { public: // virtual dtor for this base class @@ -98,7 +98,7 @@ protected: // this is a stub implementation using single/main display only, it is // available even if wxUSE_DISPLAY == 0 -class WXDLLEXPORT wxDisplayFactorySingle : public wxDisplayFactory +class WXDLLIMPEXP_CORE wxDisplayFactorySingle : public wxDisplayFactory { public: virtual wxDisplayImpl *CreateDisplay(unsigned n); diff --git a/include/wx/dlimpexp.h b/include/wx/dlimpexp.h index 13078ba563..e87c749ab7 100644 --- a/include/wx/dlimpexp.h +++ b/include/wx/dlimpexp.h @@ -67,7 +67,7 @@ support arbitrary combinations of libs/DLLs: either we build all of them as DLLs (in which case WXMAKINGDLL is defined) or none (it isn't). - However we have a problem because we need separate WXDLLEXPORT versions for + However we have a problem because we need separate WXDLLIMPEXP versions for different libraries as, for example, wxString class should be dllexported when compiled in wxBase and dllimported otherwise, so we do define separate WXMAKING/USINGDLL_XYZ constants for each component XYZ. @@ -92,7 +92,7 @@ #endif /* WXMAKINGDLL */ /* - WXDLLEXPORT maps to export declaration when building the DLL, to import + WXDLLIMPEXP_CORE maps to export declaration when building the DLL, to import declaration if using it or to nothing at all if we don't use wxWin as DLL */ #ifdef WXMAKINGDLL_BASE @@ -273,7 +273,7 @@ #else /* We need to disable this warning when using this macro, as - recommended by Microsoft itself: + recommended by Microsoft itself: http://support.microsoft.com/default.aspx?scid=kb%3ben-us%3b168958 */ diff --git a/include/wx/dnd.h b/include/wx/dnd.h index 498bbc7afe..43c418f6ce 100644 --- a/include/wx/dnd.h +++ b/include/wx/dnd.h @@ -47,14 +47,14 @@ enum wxDragResult // return true if res indicates that something was done during a dnd operation, // i.e. is neither error nor none nor cancel -WXDLLEXPORT bool wxIsDragResultOk(wxDragResult res); +WXDLLIMPEXP_CORE bool wxIsDragResultOk(wxDragResult res); // ---------------------------------------------------------------------------- // wxDropSource is the object you need to create (and call DoDragDrop on it) // to initiate a drag-and-drop operation // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxDropSourceBase +class WXDLLIMPEXP_CORE wxDropSourceBase { public: wxDropSourceBase(const wxCursor &cursorCopy = wxNullCursor, @@ -129,7 +129,7 @@ protected: // OnData() is called) // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxDropTargetBase +class WXDLLIMPEXP_CORE wxDropTargetBase { public: // ctor takes a pointer to heap-allocated wxDataObject which will be owned @@ -233,7 +233,7 @@ protected: // A simple wxDropTarget derived class for text data: you only need to // override OnDropText() to get something working -class WXDLLEXPORT wxTextDropTarget : public wxDropTarget +class WXDLLIMPEXP_CORE wxTextDropTarget : public wxDropTarget { public: wxTextDropTarget(); @@ -247,7 +247,7 @@ private: }; // A drop target which accepts files (dragged from File Manager or Explorer) -class WXDLLEXPORT wxFileDropTarget : public wxDropTarget +class WXDLLIMPEXP_CORE wxFileDropTarget : public wxDropTarget { public: wxFileDropTarget(); diff --git a/include/wx/docmdi.h b/include/wx/docmdi.h index e94973701c..a94a48c73d 100644 --- a/include/wx/docmdi.h +++ b/include/wx/docmdi.h @@ -23,7 +23,7 @@ * Use this instead of wxMDIParentFrame */ -class WXDLLEXPORT wxDocMDIParentFrame: public wxMDIParentFrame +class WXDLLIMPEXP_CORE wxDocMDIParentFrame: public wxMDIParentFrame { public: wxDocMDIParentFrame(); @@ -58,7 +58,7 @@ private: * Use this instead of wxMDIChildFrame */ -class WXDLLEXPORT wxDocMDIChildFrame: public wxMDIChildFrame +class WXDLLIMPEXP_CORE wxDocMDIChildFrame: public wxMDIChildFrame { public: wxDocMDIChildFrame(); diff --git a/include/wx/docview.h b/include/wx/docview.h index 5bab609af6..f60233b2ce 100644 --- a/include/wx/docview.h +++ b/include/wx/docview.h @@ -60,7 +60,7 @@ enum #define wxMAX_FILE_HISTORY 9 -class WXDLLEXPORT wxDocument : public wxEvtHandler +class WXDLLIMPEXP_CORE wxDocument : public wxEvtHandler { public: wxDocument(wxDocument *parent = (wxDocument *) NULL); @@ -181,7 +181,7 @@ private: DECLARE_NO_COPY_CLASS(wxDocument) }; -class WXDLLEXPORT wxView: public wxEvtHandler +class WXDLLIMPEXP_CORE wxView: public wxEvtHandler { public: // wxView(wxDocument *doc = (wxDocument *) NULL); @@ -241,7 +241,7 @@ private: }; // Represents user interface (and other) properties of documents and views -class WXDLLEXPORT wxDocTemplate: public wxObject +class WXDLLIMPEXP_CORE wxDocTemplate: public wxObject { friend class WXDLLIMPEXP_FWD_CORE wxDocManager; @@ -322,7 +322,7 @@ private: // One object of this class may be created in an application, to manage all // the templates and documents. -class WXDLLEXPORT wxDocManager: public wxEvtHandler +class WXDLLIMPEXP_CORE wxDocManager: public wxEvtHandler { public: wxDocManager(long flags = wxDEFAULT_DOCMAN_FLAGS, bool initialize = true); @@ -475,7 +475,7 @@ inline size_t wxDocManager::GetNoHistoryFiles() const // A default child frame // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxDocChildFrame : public wxFrame +class WXDLLIMPEXP_CORE wxDocChildFrame : public wxFrame { public: wxDocChildFrame(wxDocument *doc, @@ -515,7 +515,7 @@ private: // A default parent frame // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxDocParentFrame : public wxFrame +class WXDLLIMPEXP_CORE wxDocParentFrame : public wxFrame { public: wxDocParentFrame(); @@ -561,7 +561,7 @@ private: // ---------------------------------------------------------------------------- #if wxUSE_PRINTING_ARCHITECTURE -class WXDLLEXPORT wxDocPrintout : public wxPrintout +class WXDLLIMPEXP_CORE wxDocPrintout : public wxPrintout { public: wxDocPrintout(wxView *view = (wxView *) NULL, const wxString& title = wxT("Printout")); @@ -585,7 +585,7 @@ private: // File history management // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFileHistory : public wxObject +class WXDLLIMPEXP_CORE wxFileHistory : public wxObject { public: wxFileHistory(size_t maxFiles = 9, wxWindowID idBase = wxID_FILE1); @@ -651,13 +651,13 @@ inline size_t wxFileHistory::GetNoHistoryFiles() const #if wxUSE_STD_IOSTREAM // For compatibility with existing file formats: // converts from/to a stream to/from a temporary file. -bool WXDLLEXPORT wxTransferFileToStream(const wxString& filename, wxSTD ostream& stream); -bool WXDLLEXPORT wxTransferStreamToFile(wxSTD istream& stream, const wxString& filename); +bool WXDLLIMPEXP_CORE wxTransferFileToStream(const wxString& filename, wxSTD ostream& stream); +bool WXDLLIMPEXP_CORE wxTransferStreamToFile(wxSTD istream& stream, const wxString& filename); #else // For compatibility with existing file formats: // converts from/to a stream to/from a temporary file. -bool WXDLLEXPORT wxTransferFileToStream(const wxString& filename, wxOutputStream& stream); -bool WXDLLEXPORT wxTransferStreamToFile(wxInputStream& stream, const wxString& filename); +bool WXDLLIMPEXP_CORE wxTransferFileToStream(const wxString& filename, wxOutputStream& stream); +bool WXDLLIMPEXP_CORE wxTransferStreamToFile(wxInputStream& stream, const wxString& filename); #endif // wxUSE_STD_IOSTREAM #endif // wxUSE_DOC_VIEW_ARCHITECTURE diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h index 6dabfa5b2b..f9e5d3e9a2 100644 --- a/include/wx/dynarray.h +++ b/include/wx/dynarray.h @@ -633,7 +633,7 @@ private: \ WX_DECLARE_USER_EXPORTED_BASEARRAY(T, name, wxARRAY_DEFAULT_EXPORT) #define WX_DECLARE_EXPORTED_BASEARRAY(T, name) \ - WX_DECLARE_USER_EXPORTED_BASEARRAY(T, name, WXDLLEXPORT) + WX_DECLARE_USER_EXPORTED_BASEARRAY(T, name, WXDLLIMPEXP_CORE) #define WX_DECLARE_USER_EXPORTED_BASEARRAY(T, name, expmode) \ typedef T _wxArray##name; \ @@ -654,10 +654,10 @@ private: \ WX_DEFINE_TYPEARRAY_WITH_DECL_PTR(T, name, base, class wxARRAY_DEFAULT_EXPORT) #define WX_DEFINE_EXPORTED_TYPEARRAY(T, name, base) \ - WX_DEFINE_TYPEARRAY_WITH_DECL(T, name, base, class WXDLLEXPORT) + WX_DEFINE_TYPEARRAY_WITH_DECL(T, name, base, class WXDLLIMPEXP_CORE) #define WX_DEFINE_EXPORTED_TYPEARRAY_PTR(T, name, base) \ - WX_DEFINE_TYPEARRAY_WITH_DECL_PTR(T, name, base, class WXDLLEXPORT) + WX_DEFINE_TYPEARRAY_WITH_DECL_PTR(T, name, base, class WXDLLIMPEXP_CORE) #define WX_DEFINE_USER_EXPORTED_TYPEARRAY(T, name, base, expdecl) \ WX_DEFINE_TYPEARRAY_WITH_DECL(T, name, base, class expdecl) @@ -710,7 +710,7 @@ private: \ wxARRAY_DEFAULT_EXPORT) #define WX_DEFINE_SORTED_EXPORTED_TYPEARRAY(T, name, base) \ - WX_DEFINE_SORTED_USER_EXPORTED_TYPEARRAY(T, name, base, WXDLLEXPORT) + WX_DEFINE_SORTED_USER_EXPORTED_TYPEARRAY(T, name, base, WXDLLIMPEXP_CORE) #define WX_DEFINE_SORTED_USER_EXPORTED_TYPEARRAY(T, name, base, expmode) \ typedef T _wxArray##name; \ @@ -736,7 +736,7 @@ private: \ #define WX_DEFINE_SORTED_EXPORTED_TYPEARRAY_CMP(T, cmpfunc, name, base) \ WX_DEFINE_SORTED_USER_EXPORTED_TYPEARRAY_CMP(T, cmpfunc, name, base, \ - WXDLLEXPORT) + WXDLLIMPEXP_CORE) #define WX_DEFINE_SORTED_USER_EXPORTED_TYPEARRAY_CMP(T, cmpfunc, name, base, \ expmode) \ @@ -789,7 +789,7 @@ private: \ WX_DECLARE_USER_EXPORTED_OBJARRAY(T, name, wxARRAY_DEFAULT_EXPORT) #define WX_DECLARE_EXPORTED_OBJARRAY(T, name) \ - WX_DECLARE_USER_EXPORTED_OBJARRAY(T, name, WXDLLEXPORT) + WX_DECLARE_USER_EXPORTED_OBJARRAY(T, name, WXDLLIMPEXP_CORE) #define WX_DECLARE_OBJARRAY_WITH_DECL(T, name, decl) \ typedef T _wxObjArray##name; \ diff --git a/include/wx/effects.h b/include/wx/effects.h index 09080653d3..c3e3fcc345 100644 --- a/include/wx/effects.h +++ b/include/wx/effects.h @@ -28,7 +28,7 @@ #include "wx/gdicmn.h" #include "wx/dc.h" -class WXDLLEXPORT wxEffectsImpl: public wxObject +class WXDLLIMPEXP_CORE wxEffectsImpl: public wxObject { public: // Assume system colours diff --git a/include/wx/encinfo.h b/include/wx/encinfo.h index 27550701f4..b35acb1a65 100644 --- a/include/wx/encinfo.h +++ b/include/wx/encinfo.h @@ -32,7 +32,7 @@ // to create a font of non-standard encoding (like KOI8) under Windows - the // facename specifies the encoding then) -struct WXDLLEXPORT wxNativeEncodingInfo +struct WXDLLIMPEXP_CORE wxNativeEncodingInfo { wxString facename; // may be empty meaning "any" #ifndef __WXPALMOS__ diff --git a/include/wx/evtloop.h b/include/wx/evtloop.h index f6d1b55313..6a573d713c 100644 --- a/include/wx/evtloop.h +++ b/include/wx/evtloop.h @@ -123,7 +123,7 @@ protected: class WXDLLIMPEXP_FWD_CORE wxEventLoopImpl; -class WXDLLEXPORT wxGUIEventLoop : public wxEventLoopBase +class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxEventLoopBase { public: wxGUIEventLoop() { m_impl = NULL; } @@ -174,7 +174,7 @@ inline bool wxEventLoopBase::IsRunning() const { return GetActive() == this; } // implement modality, we will surely need platform-specific implementations // too, this generic implementation is here only temporarily to see how it // works -class WXDLLEXPORT wxModalEventLoop : public wxGUIEventLoop +class WXDLLIMPEXP_CORE wxModalEventLoop : public wxGUIEventLoop { public: wxModalEventLoop(wxWindow *winModal) diff --git a/include/wx/fdrepdlg.h b/include/wx/fdrepdlg.h index ed657a5d7a..52175bebe5 100644 --- a/include/wx/fdrepdlg.h +++ b/include/wx/fdrepdlg.h @@ -60,7 +60,7 @@ enum wxFindReplaceDialogStyles // wxFindReplaceData: holds Setup Data/Feedback Data for wxFindReplaceDialog // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFindReplaceData : public wxObject +class WXDLLIMPEXP_CORE wxFindReplaceData : public wxObject { public: wxFindReplaceData() { Init(); } @@ -93,7 +93,7 @@ private: // wxFindReplaceDialogBase // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFindReplaceDialogBase : public wxDialog +class WXDLLIMPEXP_CORE wxFindReplaceDialogBase : public wxDialog { public: // ctors and such @@ -137,7 +137,7 @@ protected: // wxFindReplaceDialog events // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFindDialogEvent : public wxCommandEvent +class WXDLLIMPEXP_CORE wxFindDialogEvent : public wxCommandEvent { public: wxFindDialogEvent(wxEventType commandType = wxEVT_NULL, int id = 0) diff --git a/include/wx/filectrl.h b/include/wx/filectrl.h index ad22cebdcf..b3756ef62c 100644 --- a/include/wx/filectrl.h +++ b/include/wx/filectrl.h @@ -29,7 +29,7 @@ enum }; #define wxFC_DEFAULT_STYLE wxFC_OPEN -extern WXDLLEXPORT_DATA( const wxChar ) wxFileCtrlNameStr[]; // in filectrlcmn.cpp +extern WXDLLIMPEXP_DATA_CORE( const wxChar ) wxFileCtrlNameStr[]; // in filectrlcmn.cpp extern WXDLLIMPEXP_CORE const wxEventType wxEVT_FILECTRL_SELECTIONCHANGED; extern WXDLLIMPEXP_CORE const wxEventType wxEVT_FILECTRL_FILEACTIVATED; diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h index 7abc596350..e939c82d5e 100644 --- a/include/wx/filedlg.h +++ b/include/wx/filedlg.h @@ -58,15 +58,15 @@ enum #define wxFD_DEFAULT_STYLE wxFD_OPEN -extern WXDLLEXPORT_DATA(const char) wxFileDialogNameStr[]; -extern WXDLLEXPORT_DATA(const char) wxFileSelectorPromptStr[]; -extern WXDLLEXPORT_DATA(const char) wxFileSelectorDefaultWildcardStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxFileDialogNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxFileSelectorPromptStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxFileSelectorDefaultWildcardStr[]; //---------------------------------------------------------------------------- // wxFileDialogBase //---------------------------------------------------------------------------- -class WXDLLEXPORT wxFileDialogBase: public wxDialog +class WXDLLIMPEXP_CORE wxFileDialogBase: public wxDialog { public: wxFileDialogBase () { Init(); } @@ -170,7 +170,7 @@ private: //---------------------------------------------------------------------------- // File selector - backward compatibility -WXDLLEXPORT wxString +WXDLLIMPEXP_CORE wxString wxFileSelector(const wxString& message = wxFileSelectorPromptStr, const wxString& default_path = wxEmptyString, const wxString& default_filename = wxEmptyString, @@ -181,7 +181,7 @@ wxFileSelector(const wxString& message = wxFileSelectorPromptStr, int x = wxDefaultCoord, int y = wxDefaultCoord); // An extended version of wxFileSelector -WXDLLEXPORT wxString +WXDLLIMPEXP_CORE wxString wxFileSelectorEx(const wxString& message = wxFileSelectorPromptStr, const wxString& default_path = wxEmptyString, const wxString& default_filename = wxEmptyString, @@ -192,14 +192,14 @@ wxFileSelectorEx(const wxString& message = wxFileSelectorPromptStr, int x = wxDefaultCoord, int y = wxDefaultCoord); // Ask for filename to load -WXDLLEXPORT wxString +WXDLLIMPEXP_CORE wxString wxLoadFileSelector(const wxString& what, const wxString& extension, const wxString& default_name = wxEmptyString, wxWindow *parent = NULL); // Ask for filename to save -WXDLLEXPORT wxString +WXDLLIMPEXP_CORE wxString wxSaveFileSelector(const wxString& what, const wxString& extension, const wxString& default_name = wxEmptyString, diff --git a/include/wx/filepicker.h b/include/wx/filepicker.h index 0f0c7cc57a..d06d94af1e 100644 --- a/include/wx/filepicker.h +++ b/include/wx/filepicker.h @@ -22,15 +22,15 @@ class WXDLLIMPEXP_FWD_CORE wxDialog; class WXDLLIMPEXP_FWD_CORE wxFileDirPickerEvent; -extern WXDLLEXPORT_DATA(const char) wxFilePickerWidgetLabel[]; -extern WXDLLEXPORT_DATA(const char) wxFilePickerWidgetNameStr[]; -extern WXDLLEXPORT_DATA(const char) wxFilePickerCtrlNameStr[]; -extern WXDLLEXPORT_DATA(const char) wxFileSelectorPromptStr[]; - -extern WXDLLEXPORT_DATA(const char) wxDirPickerWidgetLabel[]; -extern WXDLLEXPORT_DATA(const char) wxDirPickerWidgetNameStr[]; -extern WXDLLEXPORT_DATA(const char) wxDirPickerCtrlNameStr[]; -extern WXDLLEXPORT_DATA(const char) wxDirSelectorPromptStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxFilePickerWidgetLabel[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxFilePickerWidgetNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxFilePickerCtrlNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxFileSelectorPromptStr[]; + +extern WXDLLIMPEXP_DATA_CORE(const char) wxDirPickerWidgetLabel[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxDirPickerWidgetNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxDirPickerCtrlNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxDirSelectorPromptStr[]; // ---------------------------------------------------------------------------- diff --git a/include/wx/font.h b/include/wx/font.h index 3ef53d3580..c97ea06194 100644 --- a/include/wx/font.h +++ b/include/wx/font.h @@ -108,7 +108,7 @@ enum class WXDLLIMPEXP_FWD_CORE wxNativeFontInfo; -class WXDLLEXPORT wxFontBase : public wxGDIObject +class WXDLLIMPEXP_CORE wxFontBase : public wxGDIObject { public: // creator function @@ -276,7 +276,7 @@ public: #endif }; -extern WXDLLEXPORT_DATA(wxFontList*) wxTheFontList; +extern WXDLLIMPEXP_DATA_CORE(wxFontList*) wxTheFontList; #endif // _WX_FONT_H_BASE_ diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h index 00f2d19f01..dfeacdc4d7 100644 --- a/include/wx/fontdlg.h +++ b/include/wx/fontdlg.h @@ -23,7 +23,7 @@ // wxFontDialog interface // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFontDialogBase : public wxDialog +class WXDLLIMPEXP_CORE wxFontDialogBase : public wxDialog { public: // create the font dialog @@ -74,7 +74,7 @@ inline bool wxFontDialogBase::Create(wxWindow *parent, const wxFontData *data) // platform-specific wxFontDialog implementation // ---------------------------------------------------------------------------- -#if defined( __WXMAC_OSX__ ) +#if defined( __WXMAC_OSX__ ) //set to 1 to use native mac font and color dialogs #define USE_NATIVE_FONT_DIALOG_FOR_MACOSX 1 #else @@ -108,9 +108,9 @@ inline bool wxFontDialogBase::Create(wxWindow *parent, const wxFontData *data) // get the font from user and return it, returns wxNullFont if the dialog was // cancelled -wxFont WXDLLEXPORT -wxGetFontFromUser(wxWindow *parent = (wxWindow *)NULL, - const wxFont& fontInit = wxNullFont, const wxString& caption = wxEmptyString); +WXDLLIMPEXP_CORE wxFont wxGetFontFromUser(wxWindow *parent = (wxWindow *)NULL, + const wxFont& fontInit = wxNullFont, + const wxString& caption = wxEmptyString); #endif // wxUSE_FONTDLG diff --git a/include/wx/fontenum.h b/include/wx/fontenum.h index 29127061a8..ca127b3c8a 100644 --- a/include/wx/fontenum.h +++ b/include/wx/fontenum.h @@ -25,7 +25,7 @@ // fonts with given attributes // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFontEnumerator +class WXDLLIMPEXP_CORE wxFontEnumerator { public: wxFontEnumerator() {} diff --git a/include/wx/fontpicker.h b/include/wx/fontpicker.h index a2ff40e953..36cbacedec 100644 --- a/include/wx/fontpicker.h +++ b/include/wx/fontpicker.h @@ -22,8 +22,8 @@ class WXDLLIMPEXP_FWD_CORE wxFontPickerEvent; -extern WXDLLEXPORT_DATA(const char) wxFontPickerWidgetNameStr[]; -extern WXDLLEXPORT_DATA(const char) wxFontPickerCtrlNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxFontPickerWidgetNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxFontPickerCtrlNameStr[]; // ---------------------------------------------------------------------------- diff --git a/include/wx/fontutil.h b/include/wx/fontutil.h index 21a4f8b887..3efd2d1e2c 100644 --- a/include/wx/fontutil.h +++ b/include/wx/fontutil.h @@ -65,7 +65,7 @@ enum wxXLFDField // functions, the user code can only get the objects of this type from // somewhere and pass it somewhere else (possibly save them somewhere using // ToString() and restore them using FromString()) -class WXDLLEXPORT wxNativeFontInfo +class WXDLLIMPEXP_CORE wxNativeFontInfo { public: #if wxUSE_PANGO diff --git a/include/wx/frame.h b/include/wx/frame.h index 3c2c3888d8..a84dbcd302 100644 --- a/include/wx/frame.h +++ b/include/wx/frame.h @@ -19,8 +19,8 @@ #include "wx/toplevel.h" // the base class // the default names for various classs -extern WXDLLEXPORT_DATA(const char) wxStatusLineNameStr[]; -extern WXDLLEXPORT_DATA(const char) wxToolBarNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxStatusLineNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxToolBarNameStr[]; class WXDLLIMPEXP_FWD_CORE wxFrame; class WXDLLIMPEXP_FWD_CORE wxMenuBar; @@ -50,7 +50,7 @@ class WXDLLIMPEXP_FWD_CORE wxToolBar; // CreateXXXBar() is called. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFrameBase : public wxTopLevelWindow +class WXDLLIMPEXP_CORE wxFrameBase : public wxTopLevelWindow { public: // construction diff --git a/include/wx/gauge.h b/include/wx/gauge.h index 6a6317a5f2..bfb9f70eb2 100644 --- a/include/wx/gauge.h +++ b/include/wx/gauge.h @@ -41,13 +41,13 @@ #define wxGAUGE_EMULATE_INDETERMINATE_MODE 0 #endif -extern WXDLLEXPORT_DATA(const char) wxGaugeNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxGaugeNameStr[]; // ---------------------------------------------------------------------------- // wxGauge: a progress bar // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxGaugeBase : public wxControl +class WXDLLIMPEXP_CORE wxGaugeBase : public wxControl { public: wxGaugeBase() { m_rangeMax = m_gaugePos = 0; } diff --git a/include/wx/gbsizer.h b/include/wx/gbsizer.h index 45812f8f22..2779243f52 100644 --- a/include/wx/gbsizer.h +++ b/include/wx/gbsizer.h @@ -28,7 +28,7 @@ // is used for this and also for wxGridCellCoords. //--------------------------------------------------------------------------- -class WXDLLEXPORT wxGBPosition +class WXDLLIMPEXP_CORE wxGBPosition { public: wxGBPosition() : m_row(0), m_col(0) {} @@ -50,7 +50,7 @@ private: }; -class WXDLLEXPORT wxGBSpan +class WXDLLIMPEXP_CORE wxGBSpan { public: wxGBSpan() : m_rowspan(1), m_colspan(1) {} @@ -72,7 +72,7 @@ private: }; -extern WXDLLEXPORT_DATA(const wxGBSpan) wxDefaultSpan; +extern WXDLLIMPEXP_DATA_CORE(const wxGBSpan) wxDefaultSpan; //--------------------------------------------------------------------------- @@ -82,7 +82,7 @@ extern WXDLLEXPORT_DATA(const wxGBSpan) wxDefaultSpan; class WXDLLIMPEXP_FWD_CORE wxGridBagSizer; -class WXDLLEXPORT wxGBSizerItem : public wxSizerItem +class WXDLLIMPEXP_CORE wxGBSizerItem : public wxSizerItem { public: // spacer @@ -165,7 +165,7 @@ private: //--------------------------------------------------------------------------- -class WXDLLEXPORT wxGridBagSizer : public wxFlexGridSizer +class WXDLLIMPEXP_CORE wxGridBagSizer : public wxFlexGridSizer { public: wxGridBagSizer(int vgap = 0, int hgap = 0 ); diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h index dfad910181..acc4cf32c5 100644 --- a/include/wx/gdicmn.h +++ b/include/wx/gdicmn.h @@ -206,7 +206,7 @@ enum wxStockCursor // wxSize // --------------------------------------------------------------------------- -class WXDLLEXPORT wxSize +class WXDLLIMPEXP_CORE wxSize { public: // members are public for compatibility, don't use them directly. @@ -313,7 +313,7 @@ inline wxSize operator*(int i, const wxSize& s) // Point classes: with real or integer coordinates // --------------------------------------------------------------------------- -class WXDLLEXPORT wxRealPoint +class WXDLLIMPEXP_CORE wxRealPoint { public: double x; @@ -352,7 +352,7 @@ inline wxRealPoint operator-(const wxRealPoint& p1, const wxRealPoint& p2) // wxPoint: 2D point with integer coordinates // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxPoint +class WXDLLIMPEXP_CORE wxPoint { public: int x, y; @@ -425,7 +425,7 @@ WX_DECLARE_LIST_WITH_DECL(wxPoint, wxPointList, class WXDLLIMPEXP_CORE); // wxRect // --------------------------------------------------------------------------- -class WXDLLEXPORT wxRect +class WXDLLIMPEXP_CORE wxRect { public: wxRect() @@ -620,7 +620,7 @@ protected: WX_DECLARE_STRING_HASH_MAP(wxColour*, wxStringToColourHashMap); -class WXDLLEXPORT wxColourDatabase +class WXDLLIMPEXP_CORE wxColourDatabase { public: wxColourDatabase(); @@ -653,7 +653,7 @@ private: wxStringToColourHashMap *m_map; }; -class WXDLLEXPORT wxResourceCache: public wxList +class WXDLLIMPEXP_CORE wxResourceCache: public wxList { public: wxResourceCache() { } @@ -780,50 +780,50 @@ protected: #define wxSTANDARD_CURSOR wxStockGDI::GetCursor(wxStockGDI::CURSOR_STANDARD) // 'Null' objects -extern WXDLLEXPORT_DATA(wxBitmap) wxNullBitmap; -extern WXDLLEXPORT_DATA(wxIcon) wxNullIcon; -extern WXDLLEXPORT_DATA(wxCursor) wxNullCursor; -extern WXDLLEXPORT_DATA(wxPen) wxNullPen; -extern WXDLLEXPORT_DATA(wxBrush) wxNullBrush; -extern WXDLLEXPORT_DATA(wxPalette) wxNullPalette; -extern WXDLLEXPORT_DATA(wxFont) wxNullFont; -extern WXDLLEXPORT_DATA(wxColour) wxNullColour; -extern WXDLLEXPORT_DATA(wxIconBundle) wxNullIconBundle; +extern WXDLLIMPEXP_DATA_CORE(wxBitmap) wxNullBitmap; +extern WXDLLIMPEXP_DATA_CORE(wxIcon) wxNullIcon; +extern WXDLLIMPEXP_DATA_CORE(wxCursor) wxNullCursor; +extern WXDLLIMPEXP_DATA_CORE(wxPen) wxNullPen; +extern WXDLLIMPEXP_DATA_CORE(wxBrush) wxNullBrush; +extern WXDLLIMPEXP_DATA_CORE(wxPalette) wxNullPalette; +extern WXDLLIMPEXP_DATA_CORE(wxFont) wxNullFont; +extern WXDLLIMPEXP_DATA_CORE(wxColour) wxNullColour; +extern WXDLLIMPEXP_DATA_CORE(wxIconBundle) wxNullIconBundle; -extern WXDLLEXPORT_DATA(wxColourDatabase*) wxTheColourDatabase; +extern WXDLLIMPEXP_DATA_CORE(wxColourDatabase*) wxTheColourDatabase; -extern WXDLLEXPORT_DATA(const char) wxPanelNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxPanelNameStr[]; -extern WXDLLEXPORT_DATA(const wxSize) wxDefaultSize; -extern WXDLLEXPORT_DATA(const wxPoint) wxDefaultPosition; +extern WXDLLIMPEXP_DATA_CORE(const wxSize) wxDefaultSize; +extern WXDLLIMPEXP_DATA_CORE(const wxPoint) wxDefaultPosition; // --------------------------------------------------------------------------- // global functions // --------------------------------------------------------------------------- // resource management -extern void WXDLLEXPORT wxInitializeStockLists(); -extern void WXDLLEXPORT wxDeleteStockLists(); +extern void WXDLLIMPEXP_CORE wxInitializeStockLists(); +extern void WXDLLIMPEXP_CORE wxDeleteStockLists(); // is the display colour (or monochrome)? -extern bool WXDLLEXPORT wxColourDisplay(); +extern bool WXDLLIMPEXP_CORE wxColourDisplay(); // Returns depth of screen -extern int WXDLLEXPORT wxDisplayDepth(); +extern int WXDLLIMPEXP_CORE wxDisplayDepth(); #define wxGetDisplayDepth wxDisplayDepth // get the display size -extern void WXDLLEXPORT wxDisplaySize(int *width, int *height); -extern wxSize WXDLLEXPORT wxGetDisplaySize(); -extern void WXDLLEXPORT wxDisplaySizeMM(int *width, int *height); -extern wxSize WXDLLEXPORT wxGetDisplaySizeMM(); +extern void WXDLLIMPEXP_CORE wxDisplaySize(int *width, int *height); +extern wxSize WXDLLIMPEXP_CORE wxGetDisplaySize(); +extern void WXDLLIMPEXP_CORE wxDisplaySizeMM(int *width, int *height); +extern wxSize WXDLLIMPEXP_CORE wxGetDisplaySizeMM(); // Get position and size of the display workarea -extern void WXDLLEXPORT wxClientDisplayRect(int *x, int *y, int *width, int *height); -extern wxRect WXDLLEXPORT wxGetClientDisplayRect(); +extern void WXDLLIMPEXP_CORE wxClientDisplayRect(int *x, int *y, int *width, int *height); +extern wxRect WXDLLIMPEXP_CORE wxGetClientDisplayRect(); // set global cursor -extern void WXDLLEXPORT wxSetCursor(const wxCursor& cursor); +extern void WXDLLIMPEXP_CORE wxSetCursor(const wxCursor& cursor); #endif // _WX_GDICMNH__ diff --git a/include/wx/generic/accel.h b/include/wx/generic/accel.h index 04ca07ed55..a17e5a3ef9 100644 --- a/include/wx/generic/accel.h +++ b/include/wx/generic/accel.h @@ -16,7 +16,7 @@ class WXDLLIMPEXP_FWD_CORE wxKeyEvent; // wxAcceleratorTable // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxAcceleratorTable : public wxObject +class WXDLLIMPEXP_CORE wxAcceleratorTable : public wxObject { public: wxAcceleratorTable(); diff --git a/include/wx/generic/busyinfo.h b/include/wx/generic/busyinfo.h index feaa431831..a48067b175 100644 --- a/include/wx/generic/busyinfo.h +++ b/include/wx/generic/busyinfo.h @@ -23,7 +23,7 @@ class WXDLLIMPEXP_FWD_CORE wxWindow; // Can be used in exactly same way as wxBusyCursor //-------------------------------------------------------------------------------- -class WXDLLEXPORT wxBusyInfo : public wxObject +class WXDLLIMPEXP_CORE wxBusyInfo : public wxObject { public: wxBusyInfo(const wxString& message, wxWindow *parent = NULL); diff --git a/include/wx/generic/buttonbar.h b/include/wx/generic/buttonbar.h index 165c962d93..3a4a464a45 100644 --- a/include/wx/generic/buttonbar.h +++ b/include/wx/generic/buttonbar.h @@ -22,7 +22,7 @@ class WXDLLIMPEXP_FWD_CORE wxButtonToolBarTool; // wxButtonToolBar // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxButtonToolBar : public wxToolBarBase +class WXDLLIMPEXP_CORE wxButtonToolBar : public wxToolBarBase { public: // construction/destruction diff --git a/include/wx/generic/caret.h b/include/wx/generic/caret.h index 63166298dc..15f5469bb4 100644 --- a/include/wx/generic/caret.h +++ b/include/wx/generic/caret.h @@ -22,7 +22,7 @@ class WXDLLIMPEXP_FWD_CORE wxCaret; -class WXDLLEXPORT wxCaretTimer : public wxTimer +class WXDLLIMPEXP_CORE wxCaretTimer : public wxTimer { public: wxCaretTimer(wxCaret *caret); diff --git a/include/wx/generic/choicdgg.h b/include/wx/generic/choicdgg.h index 57fc94131f..e2f637305b 100644 --- a/include/wx/generic/choicdgg.h +++ b/include/wx/generic/choicdgg.h @@ -36,7 +36,7 @@ class WXDLLIMPEXP_FWD_CORE wxListBoxBase; // wxAnyChoiceDialog: a base class for dialogs containing a listbox // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxAnyChoiceDialog : public wxDialog +class WXDLLIMPEXP_CORE wxAnyChoiceDialog : public wxDialog { public: wxAnyChoiceDialog() { } @@ -93,7 +93,7 @@ protected: // wxSingleChoiceDialog: a dialog with single selection listbox // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxSingleChoiceDialog : public wxAnyChoiceDialog +class WXDLLIMPEXP_CORE wxSingleChoiceDialog : public wxAnyChoiceDialog { public: wxSingleChoiceDialog() @@ -164,7 +164,7 @@ private: // wxMultiChoiceDialog: a dialog with multi selection listbox // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMultiChoiceDialog : public wxAnyChoiceDialog +class WXDLLIMPEXP_CORE wxMultiChoiceDialog : public wxAnyChoiceDialog { public: wxMultiChoiceDialog() { } @@ -227,7 +227,7 @@ private: // ---------------------------------------------------------------------------- // get the user selection as a string -WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message, +WXDLLIMPEXP_CORE wxString wxGetSingleChoice(const wxString& message, const wxString& caption, const wxArrayString& choices, wxWindow *parent = NULL, @@ -237,7 +237,7 @@ WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message, int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT); -WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message, +WXDLLIMPEXP_CORE wxString wxGetSingleChoice(const wxString& message, const wxString& caption, int n, const wxString *choices, wxWindow *parent = NULL, @@ -249,7 +249,7 @@ WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message, // Same as above but gets position in list of strings, instead of string, // or -1 if no selection -WXDLLEXPORT int wxGetSingleChoiceIndex(const wxString& message, +WXDLLIMPEXP_CORE int wxGetSingleChoiceIndex(const wxString& message, const wxString& caption, const wxArrayString& choices, wxWindow *parent = NULL, @@ -259,7 +259,7 @@ WXDLLEXPORT int wxGetSingleChoiceIndex(const wxString& message, int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT); -WXDLLEXPORT int wxGetSingleChoiceIndex(const wxString& message, +WXDLLIMPEXP_CORE int wxGetSingleChoiceIndex(const wxString& message, const wxString& caption, int n, const wxString *choices, wxWindow *parent = NULL, @@ -270,7 +270,7 @@ WXDLLEXPORT int wxGetSingleChoiceIndex(const wxString& message, int height = wxCHOICE_HEIGHT); // Return client data instead or NULL if cancelled -WXDLLEXPORT void* wxGetSingleChoiceData(const wxString& message, +WXDLLIMPEXP_CORE void* wxGetSingleChoiceData(const wxString& message, const wxString& caption, const wxArrayString& choices, void **client_data, @@ -281,7 +281,7 @@ WXDLLEXPORT void* wxGetSingleChoiceData(const wxString& message, int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT); -WXDLLEXPORT void* wxGetSingleChoiceData(const wxString& message, +WXDLLIMPEXP_CORE void* wxGetSingleChoiceData(const wxString& message, const wxString& caption, int n, const wxString *choices, void **client_data, @@ -295,7 +295,7 @@ WXDLLEXPORT void* wxGetSingleChoiceData(const wxString& message, // fill the array with the indices of the chosen items, it will be empty // if no items were selected or Cancel was pressed - return the number of // selections -WXDLLEXPORT size_t wxGetMultipleChoices(wxArrayInt& selections, +WXDLLIMPEXP_CORE size_t wxGetMultipleChoices(wxArrayInt& selections, const wxString& message, const wxString& caption, int n, const wxString *choices, @@ -306,7 +306,7 @@ WXDLLEXPORT size_t wxGetMultipleChoices(wxArrayInt& selections, int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT); -WXDLLEXPORT size_t wxGetMultipleChoices(wxArrayInt& selections, +WXDLLIMPEXP_CORE size_t wxGetMultipleChoices(wxArrayInt& selections, const wxString& message, const wxString& caption, const wxArrayString& choices, diff --git a/include/wx/generic/colour.h b/include/wx/generic/colour.h index ca1ebf05b9..edaf6a19e3 100644 --- a/include/wx/generic/colour.h +++ b/include/wx/generic/colour.h @@ -15,7 +15,7 @@ #include "wx/object.h" // Colour -class WXDLLEXPORT wxColour: public wxColourBase +class WXDLLIMPEXP_CORE wxColour: public wxColourBase { public: // constructors diff --git a/include/wx/generic/colrdlgg.h b/include/wx/generic/colrdlgg.h index 0d59436e90..4db6b82c93 100644 --- a/include/wx/generic/colrdlgg.h +++ b/include/wx/generic/colrdlgg.h @@ -29,7 +29,7 @@ #endif // wxUSE_SLIDER -class WXDLLEXPORT wxGenericColourDialog : public wxDialog +class WXDLLIMPEXP_CORE wxGenericColourDialog : public wxDialog { public: wxGenericColourDialog(); diff --git a/include/wx/generic/combo.h b/include/wx/generic/combo.h index fc7bb10882..913511fcbf 100644 --- a/include/wx/generic/combo.h +++ b/include/wx/generic/combo.h @@ -33,7 +33,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxComboBoxNameStr[]; -class WXDLLEXPORT wxGenericComboCtrl : public wxComboCtrlBase +class WXDLLIMPEXP_CORE wxGenericComboCtrl : public wxComboCtrlBase { public: // ctors and such @@ -101,7 +101,7 @@ private: // If native wxComboCtrl was not defined, then prepare a simple // front-end so that wxRTTI works as expected. -class WXDLLEXPORT wxComboCtrl : public wxGenericComboCtrl +class WXDLLIMPEXP_CORE wxComboCtrl : public wxGenericComboCtrl { public: wxComboCtrl() : wxGenericComboCtrl() {} diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h index 3cfbba636a..b8847fa31f 100644 --- a/include/wx/generic/dcpsg.h +++ b/include/wx/generic/dcpsg.h @@ -27,7 +27,7 @@ //----------------------------------------------------------------------------- -class WXDLLEXPORT wxPostScriptDC : public wxDC +class WXDLLIMPEXP_CORE wxPostScriptDC : public wxDC { public: wxPostScriptDC(); @@ -39,7 +39,7 @@ private: DECLARE_DYNAMIC_CLASS(wxPostScriptDC) }; -class WXDLLEXPORT wxPostScriptDCImpl : public wxDCImpl +class WXDLLIMPEXP_CORE wxPostScriptDCImpl : public wxDCImpl { public: wxPostScriptDCImpl( wxPrinterDC *owner ); diff --git a/include/wx/generic/dirctrlg.h b/include/wx/generic/dirctrlg.h index 00eef8c991..bd09b3c8a6 100644 --- a/include/wx/generic/dirctrlg.h +++ b/include/wx/generic/dirctrlg.h @@ -58,7 +58,7 @@ enum // wxDirItemData //----------------------------------------------------------------------------- -class WXDLLEXPORT wxDirItemData : public wxTreeItemData +class WXDLLIMPEXP_CORE wxDirItemData : public wxTreeItemData { public: wxDirItemData(const wxString& path, const wxString& name, bool isDir); @@ -80,7 +80,7 @@ public: class WXDLLIMPEXP_FWD_CORE wxDirFilterListCtrl; -class WXDLLEXPORT wxGenericDirCtrl: public wxControl +class WXDLLIMPEXP_CORE wxGenericDirCtrl: public wxControl { public: wxGenericDirCtrl(); @@ -206,7 +206,7 @@ private: // wxDirFilterListCtrl //----------------------------------------------------------------------------- -class WXDLLEXPORT wxDirFilterListCtrl: public wxChoice +class WXDLLIMPEXP_CORE wxDirFilterListCtrl: public wxChoice { public: wxDirFilterListCtrl() { Init(); } @@ -258,7 +258,7 @@ protected: #if wxUSE_DIRDLG || wxUSE_FILEDLG -class WXDLLEXPORT wxFileIconsTable +class WXDLLIMPEXP_CORE wxFileIconsTable { public: wxFileIconsTable(); @@ -288,7 +288,7 @@ protected: }; // The global fileicons table -extern WXDLLEXPORT_DATA(wxFileIconsTable *) wxTheFileIconsTable; +extern WXDLLIMPEXP_DATA_CORE(wxFileIconsTable *) wxTheFileIconsTable; #endif // wxUSE_DIRDLG || wxUSE_FILEDLG diff --git a/include/wx/generic/dirdlgg.h b/include/wx/generic/dirdlgg.h index 96dd920354..79c15b278d 100644 --- a/include/wx/generic/dirdlgg.h +++ b/include/wx/generic/dirdlgg.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_FWD_CORE wxTextCtrl; class WXDLLIMPEXP_FWD_CORE wxTreeEvent; // we may be included directly as well as from wx/dirdlg.h (FIXME) -extern WXDLLEXPORT_DATA(const char) wxDirDialogNameStr[]; -extern WXDLLEXPORT_DATA(const char) wxDirSelectorPromptStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxDirDialogNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxDirSelectorPromptStr[]; #ifndef wxDD_DEFAULT_STYLE #ifdef __WXWINCE__ @@ -37,7 +37,7 @@ extern WXDLLEXPORT_DATA(const char) wxDirSelectorPromptStr[]; // wxGenericDirDialog //----------------------------------------------------------------------------- -class WXDLLEXPORT wxGenericDirDialog : public wxDirDialogBase +class WXDLLIMPEXP_CORE wxGenericDirDialog : public wxDirDialogBase { public: wxGenericDirDialog() : wxDirDialogBase() { } diff --git a/include/wx/generic/dragimgg.h b/include/wx/generic/dragimgg.h index 583cc0a182..7c1c72a239 100644 --- a/include/wx/generic/dragimgg.h +++ b/include/wx/generic/dragimgg.h @@ -88,7 +88,7 @@ * wxGenericDragImage */ -class WXDLLEXPORT wxGenericDragImage: public wxObject +class WXDLLIMPEXP_CORE wxGenericDragImage: public wxObject { public: diff --git a/include/wx/generic/fdrepdlg.h b/include/wx/generic/fdrepdlg.h index 1a796709ca..83c3e805ab 100644 --- a/include/wx/generic/fdrepdlg.h +++ b/include/wx/generic/fdrepdlg.h @@ -20,7 +20,7 @@ class WXDLLIMPEXP_FWD_CORE wxTextCtrl; // wxGenericFindReplaceDialog: dialog for searching / replacing text // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxGenericFindReplaceDialog : public wxFindReplaceDialogBase +class WXDLLIMPEXP_CORE wxGenericFindReplaceDialog : public wxFindReplaceDialogBase { public: wxGenericFindReplaceDialog() { Init(); } diff --git a/include/wx/generic/filectrlg.h b/include/wx/generic/filectrlg.h index c2696f35ec..c1af5c2631 100644 --- a/include/wx/generic/filectrlg.h +++ b/include/wx/generic/filectrlg.h @@ -24,13 +24,13 @@ class WXDLLIMPEXP_FWD_CORE wxChoice; class WXDLLIMPEXP_FWD_CORE wxStaticText; class WXDLLIMPEXP_FWD_CORE wxTextCtrl; -extern WXDLLEXPORT_DATA(const char) wxFileSelectorDefaultWildcardStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxFileSelectorDefaultWildcardStr[]; //----------------------------------------------------------------------------- // wxFileData - a class to hold the file info for the wxFileListCtrl //----------------------------------------------------------------------------- -class WXDLLEXPORT wxFileData +class WXDLLIMPEXP_CORE wxFileData { public: enum fileType @@ -125,7 +125,7 @@ private: // wxFileListCtrl //----------------------------------------------------------------------------- -class WXDLLEXPORT wxFileListCtrl : public wxListCtrl +class WXDLLIMPEXP_CORE wxFileListCtrl : public wxListCtrl { public: wxFileListCtrl(); diff --git a/include/wx/generic/filedlgg.h b/include/wx/generic/filedlgg.h index 45f37b666d..e27901cee5 100644 --- a/include/wx/generic/filedlgg.h +++ b/include/wx/generic/filedlgg.h @@ -32,7 +32,7 @@ class WXDLLIMPEXP_FWD_CORE wxFileCtrlEvent; // wxGenericFileDialog //------------------------------------------------------------------------- -class WXDLLEXPORT wxGenericFileDialog: public wxFileDialogBase +class WXDLLIMPEXP_CORE wxGenericFileDialog: public wxFileDialogBase { public: wxGenericFileDialog() : wxFileDialogBase() { Init(); } @@ -128,7 +128,7 @@ private: #ifdef wxHAS_GENERIC_FILEDIALOG -class WXDLLEXPORT wxFileDialog: public wxGenericFileDialog +class WXDLLIMPEXP_CORE wxFileDialog: public wxGenericFileDialog { public: wxFileDialog() {} diff --git a/include/wx/generic/filepickerg.h b/include/wx/generic/filepickerg.h index ee1e83910b..6206ba0ebb 100644 --- a/include/wx/generic/filepickerg.h +++ b/include/wx/generic/filepickerg.h @@ -17,8 +17,8 @@ #include "wx/dirdlg.h" -extern WXDLLEXPORT_DATA(const wxEventType) wxEVT_COMMAND_DIRPICKER_CHANGED; -extern WXDLLEXPORT_DATA(const wxEventType) wxEVT_COMMAND_FILEPICKER_CHANGED; +extern WXDLLIMPEXP_DATA_CORE(const wxEventType) wxEVT_COMMAND_DIRPICKER_CHANGED; +extern WXDLLIMPEXP_DATA_CORE(const wxEventType) wxEVT_COMMAND_FILEPICKER_CHANGED; //----------------------------------------------------------------------------- diff --git a/include/wx/generic/fontdlgg.h b/include/wx/generic/fontdlgg.h index 9668f77676..892d840008 100644 --- a/include/wx/generic/fontdlgg.h +++ b/include/wx/generic/fontdlgg.h @@ -44,7 +44,7 @@ enum wxID_FONT_SIZE }; -class WXDLLEXPORT wxGenericFontDialog : public wxFontDialogBase +class WXDLLIMPEXP_CORE wxGenericFontDialog : public wxFontDialogBase { public: wxGenericFontDialog() { Init(); } diff --git a/include/wx/generic/imaglist.h b/include/wx/generic/imaglist.h index 418aa96438..4d42a170d1 100644 --- a/include/wx/generic/imaglist.h +++ b/include/wx/generic/imaglist.h @@ -20,7 +20,7 @@ class WXDLLIMPEXP_FWD_CORE wxBitmap; class WXDLLIMPEXP_FWD_CORE wxColour; -class WXDLLEXPORT wxGenericImageList: public wxObject +class WXDLLIMPEXP_CORE wxGenericImageList: public wxObject { public: wxGenericImageList() { m_width = m_height = 0; } @@ -64,7 +64,7 @@ private: * the run-time information. */ -class WXDLLEXPORT wxImageList: public wxGenericImageList +class WXDLLIMPEXP_CORE wxImageList: public wxGenericImageList { DECLARE_DYNAMIC_CLASS(wxImageList) diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h index b3dcb0260b..7d4b995b15 100644 --- a/include/wx/generic/listctrl.h +++ b/include/wx/generic/listctrl.h @@ -35,7 +35,7 @@ class WXDLLIMPEXP_FWD_CORE wxListMainWindow; // wxListCtrl //----------------------------------------------------------------------------- -class WXDLLEXPORT wxGenericListCtrl: public wxControl +class WXDLLIMPEXP_CORE wxGenericListCtrl: public wxControl { public: @@ -253,7 +253,7 @@ private: * the run-time information. */ -class WXDLLEXPORT wxListCtrl: public wxGenericListCtrl +class WXDLLIMPEXP_CORE wxListCtrl: public wxGenericListCtrl { DECLARE_DYNAMIC_CLASS(wxListCtrl) diff --git a/include/wx/generic/logg.h b/include/wx/generic/logg.h index ae66dd0ada..0227317323 100644 --- a/include/wx/generic/logg.h +++ b/include/wx/generic/logg.h @@ -23,7 +23,7 @@ #if wxUSE_TEXTCTRL // log everything to a text window (GUI only of course) -class WXDLLEXPORT wxLogTextCtrl : public wxLog +class WXDLLIMPEXP_CORE wxLogTextCtrl : public wxLog { public: wxLogTextCtrl(wxTextCtrl *pTextCtrl); @@ -49,7 +49,7 @@ private: #if wxUSE_LOGGUI -class WXDLLEXPORT wxLogGui : public wxLog +class WXDLLIMPEXP_CORE wxLogGui : public wxLog { public: // ctor @@ -86,7 +86,7 @@ protected: #if wxUSE_LOGWINDOW -class WXDLLEXPORT wxLogWindow : public wxLogPassThrough +class WXDLLIMPEXP_CORE wxLogWindow : public wxLogPassThrough { public: wxLogWindow(wxWindow *pParent, // the parent frame (can be NULL) diff --git a/include/wx/generic/mask.h b/include/wx/generic/mask.h index b6c7b954fc..6516e5ab28 100644 --- a/include/wx/generic/mask.h +++ b/include/wx/generic/mask.h @@ -15,7 +15,7 @@ // generic wxMask implementation // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMask : public wxMaskBase +class WXDLLIMPEXP_CORE wxMask : public wxMaskBase { public: wxMask() { } diff --git a/include/wx/generic/mdig.h b/include/wx/generic/mdig.h index f4366808cc..bc4bb52f2d 100644 --- a/include/wx/generic/mdig.h +++ b/include/wx/generic/mdig.h @@ -23,7 +23,7 @@ class WXDLLIMPEXP_FWD_CORE wxIcon; class WXDLLIMPEXP_FWD_CORE wxIconBundle; -extern WXDLLEXPORT_DATA(const char) wxStatusLineNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxStatusLineNameStr[]; //----------------------------------------------------------------------------- @@ -38,7 +38,7 @@ class WXDLLIMPEXP_FWD_CORE wxGenericMDIChildFrame; // wxGenericMDIParentFrame //----------------------------------------------------------------------------- -class WXDLLEXPORT wxGenericMDIParentFrame: public wxFrame +class WXDLLIMPEXP_CORE wxGenericMDIParentFrame: public wxFrame { public: wxGenericMDIParentFrame(); @@ -111,7 +111,7 @@ private: // wxGenericMDIChildFrame //----------------------------------------------------------------------------- -class WXDLLEXPORT wxGenericMDIChildFrame: public wxPanel +class WXDLLIMPEXP_CORE wxGenericMDIChildFrame: public wxPanel { public: wxGenericMDIChildFrame(); @@ -224,7 +224,7 @@ private: // wxGenericMDIClientWindow //----------------------------------------------------------------------------- -class WXDLLEXPORT wxGenericMDIClientWindow: public wxNotebook +class WXDLLIMPEXP_CORE wxGenericMDIClientWindow: public wxNotebook { public: wxGenericMDIClientWindow(); @@ -266,7 +266,7 @@ class wxMDIChildFrame ; // wxMDIParentFrame //----------------------------------------------------------------------------- -class WXDLLEXPORT wxMDIParentFrame: public wxGenericMDIParentFrame +class WXDLLIMPEXP_CORE wxMDIParentFrame: public wxGenericMDIParentFrame { public: wxMDIParentFrame() {} @@ -292,7 +292,7 @@ private: // wxMDIChildFrame //----------------------------------------------------------------------------- -class WXDLLEXPORT wxMDIChildFrame: public wxGenericMDIChildFrame +class WXDLLIMPEXP_CORE wxMDIChildFrame: public wxGenericMDIChildFrame { public: wxMDIChildFrame() {} @@ -315,7 +315,7 @@ private: // wxMDIClientWindow //----------------------------------------------------------------------------- -class WXDLLEXPORT wxMDIClientWindow: public wxGenericMDIClientWindow +class WXDLLIMPEXP_CORE wxMDIClientWindow: public wxGenericMDIClientWindow { public: wxMDIClientWindow() {} diff --git a/include/wx/generic/msgdlgg.h b/include/wx/generic/msgdlgg.h index 9e3bbcff9d..be63dcd910 100644 --- a/include/wx/generic/msgdlgg.h +++ b/include/wx/generic/msgdlgg.h @@ -12,7 +12,7 @@ #ifndef _WX_GENERIC_MSGDLGG_H_ #define _WX_GENERIC_MSGDLGG_H_ -class WXDLLEXPORT wxGenericMessageDialog : public wxMessageDialogBase +class WXDLLIMPEXP_CORE wxGenericMessageDialog : public wxMessageDialogBase { public: wxGenericMessageDialog(wxWindow *parent, diff --git a/include/wx/generic/numdlgg.h b/include/wx/generic/numdlgg.h index 11d9cfb072..1ac15c680f 100644 --- a/include/wx/generic/numdlgg.h +++ b/include/wx/generic/numdlgg.h @@ -28,7 +28,7 @@ // wxNumberEntryDialog: a dialog with spin control, [ok] and [cancel] buttons // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxNumberEntryDialog : public wxDialog +class WXDLLIMPEXP_CORE wxNumberEntryDialog : public wxDialog { public: wxNumberEntryDialog(wxWindow *parent, @@ -64,15 +64,15 @@ private: // function to get a number from user // ---------------------------------------------------------------------------- -long WXDLLEXPORT -wxGetNumberFromUser(const wxString& message, - const wxString& prompt, - const wxString& caption, - long value = 0, - long min = 0, - long max = 100, - wxWindow *parent = (wxWindow *)NULL, - const wxPoint& pos = wxDefaultPosition); +WXDLLIMPEXP_CORE long + wxGetNumberFromUser(const wxString& message, + const wxString& prompt, + const wxString& caption, + long value = 0, + long min = 0, + long max = 100, + wxWindow *parent = (wxWindow *)NULL, + const wxPoint& pos = wxDefaultPosition); #endif // wxUSE_NUMBERDLG diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h index b5d5553814..8d5475a46d 100644 --- a/include/wx/generic/panelg.h +++ b/include/wx/generic/panelg.h @@ -21,13 +21,13 @@ class WXDLLIMPEXP_FWD_CORE wxControlContainer; -extern WXDLLEXPORT_DATA(const char) wxPanelNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxPanelNameStr[]; // ---------------------------------------------------------------------------- // wxPanel contains other controls and implements TAB traversal between them // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxPanel : public wxWindow +class WXDLLIMPEXP_CORE wxPanel : public wxWindow { public: wxPanel() { Init(); } diff --git a/include/wx/generic/printps.h b/include/wx/generic/printps.h index ba97deea53..e2ae6ece3b 100644 --- a/include/wx/generic/printps.h +++ b/include/wx/generic/printps.h @@ -21,7 +21,7 @@ // Represents the printer: manages printing a wxPrintout object // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxPostScriptPrinter : public wxPrinterBase +class WXDLLIMPEXP_CORE wxPostScriptPrinter : public wxPrinterBase { public: wxPostScriptPrinter(wxPrintDialogData *data = (wxPrintDialogData *) NULL); @@ -40,7 +40,7 @@ private: // wxPrintout. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxPostScriptPrintPreview : public wxPrintPreviewBase +class WXDLLIMPEXP_CORE wxPostScriptPrintPreview : public wxPrintPreviewBase { public: wxPostScriptPrintPreview(wxPrintout *printout, diff --git a/include/wx/generic/prntdlgg.h b/include/wx/generic/prntdlgg.h index 79e3c9d099..6880629ce4 100644 --- a/include/wx/generic/prntdlgg.h +++ b/include/wx/generic/prntdlgg.h @@ -78,7 +78,7 @@ enum // wxPostScriptNativeData //---------------------------------------------------------------------------- -class WXDLLEXPORT wxPostScriptPrintNativeData: public wxPrintNativeDataBase +class WXDLLIMPEXP_CORE wxPostScriptPrintNativeData: public wxPrintNativeDataBase { public: wxPostScriptPrintNativeData(); @@ -137,7 +137,7 @@ private: // Windows using PostScript print/preview) // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxGenericPrintDialog : public wxPrintDialogBase +class WXDLLIMPEXP_CORE wxGenericPrintDialog : public wxPrintDialogBase { public: wxGenericPrintDialog(wxWindow *parent, @@ -182,7 +182,7 @@ private: DECLARE_DYNAMIC_CLASS(wxGenericPrintDialog) }; -class WXDLLEXPORT wxGenericPrintSetupDialog : public wxDialog +class WXDLLIMPEXP_CORE wxGenericPrintSetupDialog : public wxDialog { public: // There are no configuration options for the dialog, so we @@ -220,7 +220,7 @@ private: #endif // wxUSE_POSTSCRIPT -class WXDLLEXPORT wxGenericPageSetupDialog : public wxPageSetupDialogBase +class WXDLLIMPEXP_CORE wxGenericPageSetupDialog : public wxPageSetupDialogBase { public: wxGenericPageSetupDialog(wxWindow *parent = NULL, diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h index 5b9cee440a..32383adb59 100644 --- a/include/wx/generic/progdlgg.h +++ b/include/wx/generic/progdlgg.h @@ -26,7 +26,7 @@ class WXDLLIMPEXP_FWD_CORE wxStaticText; /* Progress dialog which shows a moving progress bar. Taken from the Mahogany project.*/ -class WXDLLEXPORT wxProgressDialog : public wxDialog +class WXDLLIMPEXP_CORE wxProgressDialog : public wxDialog { DECLARE_DYNAMIC_CLASS(wxProgressDialog) public: diff --git a/include/wx/generic/region.h b/include/wx/generic/region.h index 7a6dc2473f..0dc9494316 100644 --- a/include/wx/generic/region.h +++ b/include/wx/generic/region.h @@ -12,7 +12,7 @@ #ifndef _WX_GENERIC_REGION_H__ #define _WX_GENERIC_REGION_H__ -class WXDLLEXPORT wxRegionGeneric : public wxRegionBase +class WXDLLIMPEXP_CORE wxRegionGeneric : public wxRegionBase { public: wxRegionGeneric(wxCoord x, wxCoord y, wxCoord w, wxCoord h); @@ -45,7 +45,7 @@ protected: friend class WXDLLIMPEXP_FWD_CORE wxRegionIteratorGeneric; }; -class WXDLLEXPORT wxRegionIteratorGeneric : public wxObject +class WXDLLIMPEXP_CORE wxRegionIteratorGeneric : public wxObject { public: wxRegionIteratorGeneric(); diff --git a/include/wx/generic/spinctlg.h b/include/wx/generic/spinctlg.h index c5078faa75..89a0501f0d 100644 --- a/include/wx/generic/spinctlg.h +++ b/include/wx/generic/spinctlg.h @@ -40,7 +40,7 @@ class wxSpinCtrlTextGeneric; // wxTextCtrl used for the wxSpinCtrlGenericBase // function ambiguity. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxSpinCtrlGenericBase : public wxSpinCtrlBase +class WXDLLIMPEXP_CORE wxSpinCtrlGenericBase : public wxSpinCtrlBase { public: wxSpinCtrlGenericBase() { Init(); } @@ -140,7 +140,7 @@ private: #include "wx/textctrl.h" -class WXDLLEXPORT wxSpinCtrlGenericBase : public wxTextCtrl +class WXDLLIMPEXP_CORE wxSpinCtrlGenericBase : public wxTextCtrl { public: wxSpinCtrlGenericBase() : m_value(0), m_min(0), m_max(100), diff --git a/include/wx/generic/splitter.h b/include/wx/generic/splitter.h index 0e7c694f7c..498471fa99 100644 --- a/include/wx/generic/splitter.h +++ b/include/wx/generic/splitter.h @@ -49,7 +49,7 @@ enum // to prevent flickering. (WS_CLIPCHILDREN doesn't work in all cases so can't be // standard). -class WXDLLEXPORT wxSplitterWindow: public wxWindow +class WXDLLIMPEXP_CORE wxSplitterWindow: public wxWindow { public: @@ -312,7 +312,7 @@ private: // usual wxWin convention, but the three event types have different kind of // data associated with them, so the accessors can be only used if the real // event type matches with the one for which the accessors make sense -class WXDLLEXPORT wxSplitterEvent : public wxNotifyEvent +class WXDLLIMPEXP_CORE wxSplitterEvent : public wxNotifyEvent { public: wxSplitterEvent(wxEventType type = wxEVT_NULL, diff --git a/include/wx/generic/srchctlg.h b/include/wx/generic/srchctlg.h index a520b52071..407783f957 100644 --- a/include/wx/generic/srchctlg.h +++ b/include/wx/generic/srchctlg.h @@ -22,7 +22,7 @@ class WXDLLIMPEXP_FWD_CORE wxSearchTextCtrl; // wxSearchCtrl is a combination of wxTextCtrl and wxSearchButton // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxSearchCtrl : public wxSearchCtrlBase +class WXDLLIMPEXP_CORE wxSearchCtrl : public wxSearchCtrlBase { public: // creation diff --git a/include/wx/generic/statline.h b/include/wx/generic/statline.h index ae1ce7aa00..bc1aa29429 100644 --- a/include/wx/generic/statline.h +++ b/include/wx/generic/statline.h @@ -17,7 +17,7 @@ class wxStaticBox; // wxStaticLine // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxStaticLine : public wxStaticLineBase +class WXDLLIMPEXP_CORE wxStaticLine : public wxStaticLineBase { DECLARE_DYNAMIC_CLASS(wxStaticLine) diff --git a/include/wx/generic/statusbr.h b/include/wx/generic/statusbr.h index d2b1343918..2f58f2b93e 100644 --- a/include/wx/generic/statusbr.h +++ b/include/wx/generic/statusbr.h @@ -19,7 +19,7 @@ #include "wx/pen.h" #include "wx/arrstr.h" -class WXDLLEXPORT wxStatusBarGeneric : public wxStatusBarBase +class WXDLLIMPEXP_CORE wxStatusBarGeneric : public wxStatusBarBase { public: wxStatusBarGeneric() { Init(); } diff --git a/include/wx/generic/tabg.h b/include/wx/generic/tabg.h index 4ab53af0e7..2666ffd601 100644 --- a/include/wx/generic/tabg.h +++ b/include/wx/generic/tabg.h @@ -27,7 +27,7 @@ class WXDLLIMPEXP_FWD_CORE wxTabView; * of the tab. */ -class WXDLLEXPORT wxTabControl: public wxObject +class WXDLLIMPEXP_CORE wxTabControl: public wxObject { DECLARE_DYNAMIC_CLASS(wxTabControl) public: @@ -81,7 +81,7 @@ protected: * are 3 layers in the MS Word Options dialog. */ -class WXDLLEXPORT wxTabLayer: public wxList +class WXDLLIMPEXP_CORE wxTabLayer: public wxList { }; @@ -94,7 +94,7 @@ WX_DECLARE_LIST(wxTabLayer, wxTabLayerList); #define wxTAB_STYLE_DRAW_BOX 1 // Draws 3D boxes round tab layers #define wxTAB_STYLE_COLOUR_INTERIOR 2 // Colours interior of tabs, otherwise draws outline -class WXDLLEXPORT wxTabView: public wxObject +class WXDLLIMPEXP_CORE wxTabView: public wxObject { DECLARE_DYNAMIC_CLASS(wxTabView) public: @@ -266,7 +266,7 @@ protected: * A dialog box class that is tab-friendly */ -class WXDLLEXPORT wxTabbedDialog : public wxDialog +class WXDLLIMPEXP_CORE wxTabbedDialog : public wxDialog { DECLARE_DYNAMIC_CLASS(wxTabbedDialog) @@ -298,7 +298,7 @@ private: * A panel class that is tab-friendly */ -class WXDLLEXPORT wxTabbedPanel : public wxPanel +class WXDLLIMPEXP_CORE wxTabbedPanel : public wxPanel { DECLARE_DYNAMIC_CLASS(wxTabbedPanel) @@ -327,7 +327,7 @@ private: WX_DECLARE_HASH_MAP(int, wxWindow*, wxIntegerHash, wxIntegerEqual, wxIntToWindowHashMap); -class WXDLLEXPORT wxPanelTabView : public wxTabView +class WXDLLIMPEXP_CORE wxPanelTabView : public wxTabView { DECLARE_DYNAMIC_CLASS(wxPanelTabView) diff --git a/include/wx/generic/textdlgg.h b/include/wx/generic/textdlgg.h index 55e290eaae..5fd6056dda 100644 --- a/include/wx/generic/textdlgg.h +++ b/include/wx/generic/textdlgg.h @@ -25,8 +25,8 @@ class WXDLLIMPEXP_FWD_CORE wxTextCtrl; -extern WXDLLEXPORT_DATA(const char) wxGetTextFromUserPromptStr[]; -extern WXDLLEXPORT_DATA(const char) wxGetPasswordFromUserPromptStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxGetTextFromUserPromptStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxGetPasswordFromUserPromptStr[]; #define wxTextEntryDialogStyle (wxOK | wxCANCEL | wxCENTRE | wxWS_EX_VALIDATE_RECURSIVELY) @@ -34,7 +34,7 @@ extern WXDLLEXPORT_DATA(const char) wxGetPasswordFromUserPromptStr[]; // wxTextEntryDialog: a dialog with text control, [ok] and [cancel] buttons // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxTextEntryDialog : public wxDialog +class WXDLLIMPEXP_CORE wxTextEntryDialog : public wxDialog { public: wxTextEntryDialog(wxWindow *parent, @@ -72,7 +72,7 @@ private: // wxPasswordEntryDialog: dialog with password control, [ok] and [cancel] // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxPasswordEntryDialog : public wxTextEntryDialog +class WXDLLIMPEXP_CORE wxPasswordEntryDialog : public wxTextEntryDialog { public: wxPasswordEntryDialog(wxWindow *parent, @@ -90,23 +90,23 @@ private: // function to get a string from user // ---------------------------------------------------------------------------- -wxString WXDLLEXPORT -wxGetTextFromUser(const wxString& message, - const wxString& caption = wxGetTextFromUserPromptStr, - const wxString& default_value = wxEmptyString, - wxWindow *parent = (wxWindow *) NULL, - wxCoord x = wxDefaultCoord, - wxCoord y = wxDefaultCoord, - bool centre = true); - -wxString WXDLLEXPORT -wxGetPasswordFromUser(const wxString& message, - const wxString& caption = wxGetPasswordFromUserPromptStr, - const wxString& default_value = wxEmptyString, - wxWindow *parent = (wxWindow *) NULL, - wxCoord x = wxDefaultCoord, - wxCoord y = wxDefaultCoord, - bool centre = true); +WXDLLIMPEXP_CORE wxString + wxGetTextFromUser(const wxString& message, + const wxString& caption = wxGetTextFromUserPromptStr, + const wxString& default_value = wxEmptyString, + wxWindow *parent = (wxWindow *) NULL, + wxCoord x = wxDefaultCoord, + wxCoord y = wxDefaultCoord, + bool centre = true); + +WXDLLIMPEXP_CORE wxString + wxGetPasswordFromUser(const wxString& message, + const wxString& caption = wxGetPasswordFromUserPromptStr, + const wxString& default_value = wxEmptyString, + wxWindow *parent = (wxWindow *) NULL, + wxCoord x = wxDefaultCoord, + wxCoord y = wxDefaultCoord, + bool centre = true); #endif // wxUSE_TEXTDLG diff --git a/include/wx/generic/treectlg.h b/include/wx/generic/treectlg.h index c21b331fe6..b039951de3 100644 --- a/include/wx/generic/treectlg.h +++ b/include/wx/generic/treectlg.h @@ -34,7 +34,7 @@ class WXDLLIMPEXP_FWD_CORE wxTextCtrl; // wxGenericTreeCtrl - the tree control // ----------------------------------------------------------------------------- -class WXDLLEXPORT wxGenericTreeCtrl : public wxTreeCtrlBase, +class WXDLLIMPEXP_CORE wxGenericTreeCtrl : public wxTreeCtrlBase, public wxScrollHelper { public: @@ -350,7 +350,7 @@ private: * the run-time information. */ -class WXDLLEXPORT wxTreeCtrl: public wxGenericTreeCtrl +class WXDLLIMPEXP_CORE wxTreeCtrl: public wxGenericTreeCtrl { DECLARE_DYNAMIC_CLASS(wxTreeCtrl) diff --git a/include/wx/geometry.h b/include/wx/geometry.h index 237f84dca5..80ab7d9bd2 100644 --- a/include/wx/geometry.h +++ b/include/wx/geometry.h @@ -34,7 +34,7 @@ enum wxOutCode wxOutBottom = 0x04 }; -class WXDLLEXPORT wxPoint2DInt +class WXDLLIMPEXP_CORE wxPoint2DInt { public : inline wxPoint2DInt(); @@ -278,7 +278,7 @@ inline wxPoint2DInt operator/(const wxPoint2DInt& pt , wxDouble n) // wxPoint2Ds represent a point or a vector in a 2d coordinate system -class WXDLLEXPORT wxPoint2DDouble +class WXDLLIMPEXP_CORE wxPoint2DDouble { public : inline wxPoint2DDouble(); @@ -509,7 +509,7 @@ inline wxPoint2DDouble operator/(const wxPoint2DDouble& pt , wxInt32 n) // top left and bottom right corner, or by the top left corner and size. A point is contained within the rectangle if // left <= x < right and top <= m_y < bottom , thus it is a half open interval. -class WXDLLEXPORT wxRect2DDouble +class WXDLLIMPEXP_CORE wxRect2DDouble { public: wxRect2DDouble() @@ -640,7 +640,7 @@ public: // top left and bottom right corner, or by the top left corner and size. A point is contained within the rectangle if // left <= x < right and top <= m_y < bottom , thus it is a half open interval. -class WXDLLEXPORT wxRect2DInt +class WXDLLIMPEXP_CORE wxRect2DInt { public: wxRect2DInt() { m_x = m_y = m_width = m_height = 0; } diff --git a/include/wx/gifdecod.h b/include/wx/gifdecod.h index fcdf76d5fc..86abb16cd6 100644 --- a/include/wx/gifdecod.h +++ b/include/wx/gifdecod.h @@ -46,7 +46,7 @@ enum wxGIFErrorCode // wxGIFDecoder class // -------------------------------------------------------------------------- -class WXDLLEXPORT wxGIFDecoder : public wxAnimationDecoder +class WXDLLIMPEXP_CORE wxGIFDecoder : public wxAnimationDecoder { public: // constructor, destructor, etc. diff --git a/include/wx/graphics.h b/include/wx/graphics.h index 9dfea11e27..f26ae667f1 100644 --- a/include/wx/graphics.h +++ b/include/wx/graphics.h @@ -80,7 +80,7 @@ private : DECLARE_DYNAMIC_CLASS(wxGraphicsPen) } ; -extern WXDLLEXPORT_DATA(wxGraphicsPen) wxNullGraphicsPen; +extern WXDLLIMPEXP_DATA_CORE(wxGraphicsPen) wxNullGraphicsPen; class WXDLLIMPEXP_CORE wxGraphicsBrush : public wxGraphicsObject { @@ -91,7 +91,7 @@ private : DECLARE_DYNAMIC_CLASS(wxGraphicsBrush) } ; -extern WXDLLEXPORT_DATA(wxGraphicsBrush) wxNullGraphicsBrush; +extern WXDLLIMPEXP_DATA_CORE(wxGraphicsBrush) wxNullGraphicsBrush; class WXDLLIMPEXP_CORE wxGraphicsFont : public wxGraphicsObject { @@ -102,7 +102,7 @@ private : DECLARE_DYNAMIC_CLASS(wxGraphicsFont) } ; -extern WXDLLEXPORT_DATA(wxGraphicsFont) wxNullGraphicsFont; +extern WXDLLIMPEXP_DATA_CORE(wxGraphicsFont) wxNullGraphicsFont; class WXDLLIMPEXP_CORE wxGraphicsBitmap : public wxGraphicsObject { @@ -113,7 +113,7 @@ private : DECLARE_DYNAMIC_CLASS(wxGraphicsBitmap) } ; -extern WXDLLEXPORT_DATA(wxGraphicsBitmap) wxNullGraphicsBitmap; +extern WXDLLIMPEXP_DATA_CORE(wxGraphicsBitmap) wxNullGraphicsBitmap; class WXDLLIMPEXP_CORE wxGraphicsMatrix : public wxGraphicsObject { @@ -179,7 +179,7 @@ private : DECLARE_DYNAMIC_CLASS(wxGraphicsMatrix) } ; -extern WXDLLEXPORT_DATA(wxGraphicsMatrix) wxNullGraphicsMatrix; +extern WXDLLIMPEXP_DATA_CORE(wxGraphicsMatrix) wxNullGraphicsMatrix; class WXDLLIMPEXP_CORE wxGraphicsPath : public wxGraphicsObject { @@ -265,7 +265,7 @@ private : DECLARE_DYNAMIC_CLASS(wxGraphicsPath) } ; -extern WXDLLEXPORT_DATA(wxGraphicsPath) wxNullGraphicsPath; +extern WXDLLIMPEXP_DATA_CORE(wxGraphicsPath) wxNullGraphicsPath; class WXDLLIMPEXP_CORE wxGraphicsContext : public wxGraphicsObject diff --git a/include/wx/gtk/colordlg.h b/include/wx/gtk/colordlg.h index 121477410f..03998084fd 100644 --- a/include/wx/gtk/colordlg.h +++ b/include/wx/gtk/colordlg.h @@ -15,7 +15,7 @@ #include "wx/dialog.h" #include "wx/cmndata.h" -class WXDLLEXPORT wxColourDialog : public wxDialog +class WXDLLIMPEXP_CORE wxColourDialog : public wxDialog { public: wxColourDialog() {} diff --git a/include/wx/gtk/filectrl.h b/include/wx/gtk/filectrl.h index 9192a5987b..d5a462ef81 100644 --- a/include/wx/gtk/filectrl.h +++ b/include/wx/gtk/filectrl.h @@ -16,7 +16,7 @@ #include "wx/control.h" #include "wx/filectrl.h" -extern WXDLLEXPORT_DATA(const char) wxFileSelectorDefaultWildcardStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxFileSelectorDefaultWildcardStr[]; typedef struct _GtkFileChooser GtkFileChooser; diff --git a/include/wx/gtk/msgdlg.h b/include/wx/gtk/msgdlg.h index 98c48c80a8..97998869d0 100644 --- a/include/wx/gtk/msgdlg.h +++ b/include/wx/gtk/msgdlg.h @@ -12,7 +12,7 @@ #ifndef _WX_GTK_MSGDLG_H_ #define _WX_GTK_MSGDLG_H_ -class WXDLLEXPORT wxMessageDialog : public wxMessageDialogBase +class WXDLLIMPEXP_CORE wxMessageDialog : public wxMessageDialogBase { public: wxMessageDialog(wxWindow *parent, const wxString& message, diff --git a/include/wx/gtk/scrolwin.h b/include/wx/gtk/scrolwin.h index 909b616097..f99fb60c62 100644 --- a/include/wx/gtk/scrolwin.h +++ b/include/wx/gtk/scrolwin.h @@ -16,7 +16,7 @@ // wxScrolledWindow // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxScrollHelperNative : public wxScrollHelper +class WXDLLIMPEXP_CORE wxScrollHelperNative : public wxScrollHelper { public: // default ctor doesn't do anything diff --git a/include/wx/gtk/treectrl.h b/include/wx/gtk/treectrl.h index c45ecf4eed..4499b73410 100644 --- a/include/wx/gtk/treectrl.h +++ b/include/wx/gtk/treectrl.h @@ -76,7 +76,7 @@ static const int wxTREE_HITTEST_ONITEM = wxTREE_HITTEST_ONITEMICON | // just a trivial wrapper around GTK GtkTreeItem *. It's opaque for the // application. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxTreeItemId { +class WXDLLIMPEXP_CORE wxTreeItemId { public: // ctors wxTreeItemId() { m_itemId = NULL; } @@ -113,7 +113,7 @@ protected: // Because the objects of this class are deleted by the tree, they should // always be allocated on the heap! // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxTreeItemData : private wxTreeItemId { +class WXDLLIMPEXP_CORE wxTreeItemData : private wxTreeItemId { public: // default ctor/copy ctor/assignment operator are ok @@ -127,7 +127,7 @@ public: const wxTreeItemId& GetId() const { return (wxTreeItemId&) m_itemId; } }; -class WXDLLEXPORT wxTreeCtrl: public wxControl +class WXDLLIMPEXP_CORE wxTreeCtrl: public wxControl { public: // creation diff --git a/include/wx/gtk1/colordlg.h b/include/wx/gtk1/colordlg.h index 467ecd91d3..5da29e6af3 100644 --- a/include/wx/gtk1/colordlg.h +++ b/include/wx/gtk1/colordlg.h @@ -18,7 +18,7 @@ #include "wx/cmndata.h" -class WXDLLEXPORT wxColourDialog : public wxDialog +class WXDLLIMPEXP_CORE wxColourDialog : public wxDialog { public: wxColourDialog() {} diff --git a/include/wx/gtk1/combobox.h b/include/wx/gtk1/combobox.h index 56c7709c88..d064f57a33 100644 --- a/include/wx/gtk1/combobox.h +++ b/include/wx/gtk1/combobox.h @@ -27,7 +27,7 @@ class WXDLLIMPEXP_FWD_CORE wxComboBox; // global data //----------------------------------------------------------------------------- -extern WXDLLEXPORT_DATA(const char) wxComboBoxNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxComboBoxNameStr[]; extern WXDLLIMPEXP_BASE const wxChar* wxEmptyString; //----------------------------------------------------------------------------- diff --git a/include/wx/gtk1/mdi.h b/include/wx/gtk1/mdi.h index 94ff72e894..09f00d605c 100644 --- a/include/wx/gtk1/mdi.h +++ b/include/wx/gtk1/mdi.h @@ -30,7 +30,7 @@ class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame; // global data //----------------------------------------------------------------------------- -extern WXDLLEXPORT_DATA(const char) wxStatusLineNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxStatusLineNameStr[]; //----------------------------------------------------------------------------- // wxMDIParentFrame diff --git a/include/wx/gtk1/msgdlg.h b/include/wx/gtk1/msgdlg.h index 2e2879af5e..90a80811b5 100644 --- a/include/wx/gtk1/msgdlg.h +++ b/include/wx/gtk1/msgdlg.h @@ -18,9 +18,9 @@ // type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO // Returns wxYES/NO/OK/CANCEL -WXDLLEXPORT_DATA(extern const wxChar) wxMessageBoxCaptionStr[]; +WXDLLIMPEXP_DATA_CORE(extern const wxChar) wxMessageBoxCaptionStr[]; -class WXDLLEXPORT wxMessageDialog: public wxDialog, public wxMessageDialogBase +class WXDLLIMPEXP_CORE wxMessageDialog: public wxDialog, public wxMessageDialogBase { public: wxMessageDialog(wxWindow *parent, const wxString& message, diff --git a/include/wx/gtk1/scrolwin.h b/include/wx/gtk1/scrolwin.h index 4142805d1a..c7bd4bb8e2 100644 --- a/include/wx/gtk1/scrolwin.h +++ b/include/wx/gtk1/scrolwin.h @@ -16,7 +16,7 @@ // wxScrolledWindow // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxScrollHelperNative : public wxScrollHelper +class WXDLLIMPEXP_CORE wxScrollHelperNative : public wxScrollHelper { public: // default ctor doesn't do anything diff --git a/include/wx/gtk1/treectrl.h b/include/wx/gtk1/treectrl.h index 09ee499296..453f1f735e 100644 --- a/include/wx/gtk1/treectrl.h +++ b/include/wx/gtk1/treectrl.h @@ -76,7 +76,7 @@ static const int wxTREE_HITTEST_ONITEM = wxTREE_HITTEST_ONITEMICON | // just a trivial wrapper around GTK GtkTreeItem *. It's opaque for the // application. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxTreeItemId { +class WXDLLIMPEXP_CORE wxTreeItemId { public: // ctors wxTreeItemId() { m_itemId = NULL; } @@ -113,7 +113,7 @@ protected: // Because the objects of this class are deleted by the tree, they should // always be allocated on the heap! // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxTreeItemData : private wxTreeItemId { +class WXDLLIMPEXP_CORE wxTreeItemData : private wxTreeItemId { public: // default ctor/copy ctor/assignment operator are ok @@ -127,7 +127,7 @@ public: const wxTreeItemId& GetId() const { return (wxTreeItemId&) m_itemId; } }; -class WXDLLEXPORT wxTreeCtrl: public wxControl { +class WXDLLIMPEXP_CORE wxTreeCtrl: public wxControl { public: // creation // -------- diff --git a/include/wx/hash.h b/include/wx/hash.h index e825e0c2d1..3eb539e9d3 100644 --- a/include/wx/hash.h +++ b/include/wx/hash.h @@ -287,7 +287,7 @@ private: // and this one does exactly the same thing but should be used inside the // library #define WX_DECLARE_EXPORTED_HASH(el, list, hash) \ - _WX_DECLARE_HASH(el, list, hash, class WXDLLEXPORT) + _WX_DECLARE_HASH(el, list, hash, class WXDLLIMPEXP_CORE) #define WX_DECLARE_USER_EXPORTED_HASH(el, list, hash, usergoo) \ _WX_DECLARE_HASH(el, list, hash, class usergoo) diff --git a/include/wx/hashmap.h b/include/wx/hashmap.h index 3bf91c8a2f..34931c5298 100644 --- a/include/wx/hashmap.h +++ b/include/wx/hashmap.h @@ -685,7 +685,7 @@ public: \ #define WX_DECLARE_EXPORTED_HASH_MAP( KEY_T, VALUE_T, HASH_T, KEY_EQ_T, CLASSNAME) \ WX_DECLARE_HASH_MAP_WITH_DECL( KEY_T, VALUE_T, HASH_T, KEY_EQ_T, \ - CLASSNAME, class WXDLLEXPORT ) + CLASSNAME, class WXDLLIMPEXP_CORE ) #define WX_DECLARE_STRING_HASH_MAP_WITH_DECL( VALUE_T, CLASSNAME, DECL ) \ _WX_DECLARE_HASH_MAP( wxString, VALUE_T, wxStringHash, wxStringEqual, \ @@ -693,7 +693,7 @@ public: \ #define WX_DECLARE_EXPORTED_STRING_HASH_MAP( VALUE_T, CLASSNAME ) \ WX_DECLARE_STRING_HASH_MAP_WITH_DECL( VALUE_T, CLASSNAME, \ - class WXDLLEXPORT ) + class WXDLLIMPEXP_CORE ) #define WX_DECLARE_VOIDPTR_HASH_MAP_WITH_DECL( VALUE_T, CLASSNAME, DECL ) \ _WX_DECLARE_HASH_MAP( void*, VALUE_T, wxPointerHash, wxPointerEqual, \ @@ -701,7 +701,7 @@ public: \ #define WX_DECLARE_EXPORTED_VOIDPTR_HASH_MAP( VALUE_T, CLASSNAME ) \ WX_DECLARE_VOIDPTR_HASH_MAP_WITH_DECL( VALUE_T, CLASSNAME, \ - class WXDLLEXPORT ) + class WXDLLIMPEXP_CORE ) // delete all hash elements // diff --git a/include/wx/hashset.h b/include/wx/hashset.h index fb423ee11e..1be24e907b 100644 --- a/include/wx/hashset.h +++ b/include/wx/hashset.h @@ -98,7 +98,7 @@ public: \ #define WX_DECLARE_EXPORTED_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME) \ WX_DECLARE_HASH_SET_WITH_DECL( KEY_T, HASH_T, KEY_EQ_T, \ - CLASSNAME, class WXDLLEXPORT ) + CLASSNAME, class WXDLLIMPEXP_CORE ) // delete all hash elements // diff --git a/include/wx/helpbase.h b/include/wx/helpbase.h index 614ccae69d..bc913e7f21 100644 --- a/include/wx/helpbase.h +++ b/include/wx/helpbase.h @@ -32,7 +32,7 @@ enum wxHelpSearchMode }; // Defines the API for help controllers -class WXDLLEXPORT wxHelpControllerBase: public wxObject +class WXDLLIMPEXP_CORE wxHelpControllerBase: public wxObject { public: inline wxHelpControllerBase(wxWindow* parentWindow = NULL) { m_parentWindow = parentWindow; } diff --git a/include/wx/icon.h b/include/wx/icon.h index f4f92e7451..6696e9d2ce 100644 --- a/include/wx/icon.h +++ b/include/wx/icon.h @@ -45,7 +45,7 @@ #if wxUSE_VARIANT #include "wx/variant.h" -DECLARE_VARIANT_OBJECT_EXPORTED(wxIcon,WXDLLEXPORT) +DECLARE_VARIANT_OBJECT_EXPORTED(wxIcon,WXDLLIMPEXP_CORE) #endif diff --git a/include/wx/iconbndl.h b/include/wx/iconbndl.h index 1892c30a1c..c52c984d8a 100644 --- a/include/wx/iconbndl.h +++ b/include/wx/iconbndl.h @@ -28,7 +28,7 @@ WX_DECLARE_EXPORTED_OBJARRAY(wxIcon, wxIconArray); // this class can't load bitmaps of type wxBITMAP_TYPE_ICO_RESOURCE, // if you need them, you have to load them manually and call // wxIconCollection::AddIcon -class WXDLLEXPORT wxIconBundle : public wxGDIObject +class WXDLLIMPEXP_CORE wxIconBundle : public wxGDIObject { public: // default constructor diff --git a/include/wx/imagbmp.h b/include/wx/imagbmp.h index 4e20146d70..1bcebe1d18 100644 --- a/include/wx/imagbmp.h +++ b/include/wx/imagbmp.h @@ -40,7 +40,7 @@ enum // wxBMPHandler // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxBMPHandler : public wxImageHandler +class WXDLLIMPEXP_CORE wxBMPHandler : public wxImageHandler { public: wxBMPHandler() @@ -74,7 +74,7 @@ private: // wxICOHandler // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxICOHandler : public wxBMPHandler +class WXDLLIMPEXP_CORE wxICOHandler : public wxBMPHandler { public: wxICOHandler() @@ -103,7 +103,7 @@ private: // wxCURHandler // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxCURHandler : public wxICOHandler +class WXDLLIMPEXP_CORE wxCURHandler : public wxICOHandler { public: wxCURHandler() @@ -130,7 +130,7 @@ private: // wxANIHandler // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxANIHandler : public wxCURHandler +class WXDLLIMPEXP_CORE wxANIHandler : public wxCURHandler { public: wxANIHandler() diff --git a/include/wx/image.h b/include/wx/image.h index 309a09f161..eb536ca793 100644 --- a/include/wx/image.h +++ b/include/wx/image.h @@ -79,14 +79,14 @@ class WXDLLIMPEXP_FWD_CORE wxPalette; #if wxUSE_VARIANT #include "wx/variant.h" -DECLARE_VARIANT_OBJECT_EXPORTED(wxImage,WXDLLEXPORT) +DECLARE_VARIANT_OBJECT_EXPORTED(wxImage,WXDLLIMPEXP_CORE) #endif //----------------------------------------------------------------------------- // wxImageHandler //----------------------------------------------------------------------------- -class WXDLLEXPORT wxImageHandler: public wxObject +class WXDLLIMPEXP_CORE wxImageHandler: public wxObject { public: wxImageHandler() @@ -140,7 +140,7 @@ private: // wxImageHistogram //----------------------------------------------------------------------------- -class WXDLLEXPORT wxImageHistogramEntry +class WXDLLIMPEXP_CORE wxImageHistogramEntry { public: wxImageHistogramEntry() { index = value = 0; } @@ -152,7 +152,7 @@ WX_DECLARE_EXPORTED_HASH_MAP(unsigned long, wxImageHistogramEntry, wxIntegerHash, wxIntegerEqual, wxImageHistogramBase); -class WXDLLEXPORT wxImageHistogram : public wxImageHistogramBase +class WXDLLIMPEXP_CORE wxImageHistogram : public wxImageHistogramBase { public: wxImageHistogram() : wxImageHistogramBase(256) { } @@ -182,7 +182,7 @@ public: // wxImage //----------------------------------------------------------------------------- -class WXDLLEXPORT wxImage: public wxObject +class WXDLLIMPEXP_CORE wxImage: public wxObject { public: // red, green and blue are 8 bit unsigned integers in the range of 0..255 @@ -444,9 +444,9 @@ private: }; -extern void WXDLLEXPORT wxInitAllImageHandlers(); +extern void WXDLLIMPEXP_CORE wxInitAllImageHandlers(); -extern WXDLLEXPORT_DATA(wxImage) wxNullImage; +extern WXDLLIMPEXP_DATA_CORE(wxImage) wxNullImage; //----------------------------------------------------------------------------- // wxImage handlers diff --git a/include/wx/imaggif.h b/include/wx/imaggif.h index 493dbb09e6..d4f170843b 100644 --- a/include/wx/imaggif.h +++ b/include/wx/imaggif.h @@ -19,7 +19,7 @@ #if wxUSE_GIF -class WXDLLEXPORT wxGIFHandler : public wxImageHandler +class WXDLLIMPEXP_CORE wxGIFHandler : public wxImageHandler { public: inline wxGIFHandler() diff --git a/include/wx/imagiff.h b/include/wx/imagiff.h index 8097d8e656..7ac5c35e7d 100644 --- a/include/wx/imagiff.h +++ b/include/wx/imagiff.h @@ -18,7 +18,7 @@ #if wxUSE_IMAGE && wxUSE_IFF -class WXDLLEXPORT wxIFFHandler : public wxImageHandler +class WXDLLIMPEXP_CORE wxIFFHandler : public wxImageHandler { public: wxIFFHandler() diff --git a/include/wx/imagjpeg.h b/include/wx/imagjpeg.h index 6a579864b9..976e358576 100644 --- a/include/wx/imagjpeg.h +++ b/include/wx/imagjpeg.h @@ -20,7 +20,7 @@ #include "wx/image.h" -class WXDLLEXPORT wxJPEGHandler: public wxImageHandler +class WXDLLIMPEXP_CORE wxJPEGHandler: public wxImageHandler { public: inline wxJPEGHandler() diff --git a/include/wx/imagpcx.h b/include/wx/imagpcx.h index 0e8693dca0..c3e1b3ed9b 100644 --- a/include/wx/imagpcx.h +++ b/include/wx/imagpcx.h @@ -18,7 +18,7 @@ //----------------------------------------------------------------------------- #if wxUSE_PCX -class WXDLLEXPORT wxPCXHandler : public wxImageHandler +class WXDLLIMPEXP_CORE wxPCXHandler : public wxImageHandler { public: inline wxPCXHandler() diff --git a/include/wx/imagpng.h b/include/wx/imagpng.h index 8edf80b879..67aae57b63 100644 --- a/include/wx/imagpng.h +++ b/include/wx/imagpng.h @@ -30,7 +30,7 @@ enum wxPNG_TYPE_GREY_RED = 3 }; -class WXDLLEXPORT wxPNGHandler: public wxImageHandler +class WXDLLIMPEXP_CORE wxPNGHandler: public wxImageHandler { public: inline wxPNGHandler() diff --git a/include/wx/imagpnm.h b/include/wx/imagpnm.h index b9e46eea3f..8cd3f9f884 100644 --- a/include/wx/imagpnm.h +++ b/include/wx/imagpnm.h @@ -17,7 +17,7 @@ //----------------------------------------------------------------------------- #if wxUSE_PNM -class WXDLLEXPORT wxPNMHandler : public wxImageHandler +class WXDLLIMPEXP_CORE wxPNMHandler : public wxImageHandler { public: inline wxPNMHandler() diff --git a/include/wx/imagtga.h b/include/wx/imagtga.h index b5fdc3362b..f17dcf7cff 100644 --- a/include/wx/imagtga.h +++ b/include/wx/imagtga.h @@ -18,7 +18,7 @@ #if wxUSE_TGA -class WXDLLEXPORT wxTGAHandler : public wxImageHandler +class WXDLLIMPEXP_CORE wxTGAHandler : public wxImageHandler { public: wxTGAHandler() diff --git a/include/wx/imagtiff.h b/include/wx/imagtiff.h index 536cf3926c..75bfe80a14 100644 --- a/include/wx/imagtiff.h +++ b/include/wx/imagtiff.h @@ -26,7 +26,7 @@ #define wxIMAGE_OPTION_COMPRESSION wxString(_T("Compression")) #define wxIMAGE_OPTION_IMAGEDESCRIPTOR wxString(_T("ImageDescriptor")) -class WXDLLEXPORT wxTIFFHandler: public wxImageHandler +class WXDLLIMPEXP_CORE wxTIFFHandler: public wxImageHandler { public: wxTIFFHandler(); diff --git a/include/wx/imagxpm.h b/include/wx/imagxpm.h index e47c873e63..f9af1ba225 100644 --- a/include/wx/imagxpm.h +++ b/include/wx/imagxpm.h @@ -17,7 +17,7 @@ // wxXPMHandler //----------------------------------------------------------------------------- -class WXDLLEXPORT wxXPMHandler : public wxImageHandler +class WXDLLIMPEXP_CORE wxXPMHandler : public wxImageHandler { public: inline wxXPMHandler() diff --git a/include/wx/layout.h b/include/wx/layout.h index 2691f5d0cd..accc8836eb 100644 --- a/include/wx/layout.h +++ b/include/wx/layout.h @@ -64,7 +64,7 @@ enum wxRelationship // wxIndividualLayoutConstraint: a constraint on window position // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxIndividualLayoutConstraint : public wxObject +class WXDLLIMPEXP_CORE wxIndividualLayoutConstraint : public wxObject { public: wxIndividualLayoutConstraint(); @@ -155,7 +155,7 @@ protected: // wxLayoutConstraints: the complete set of constraints for a window // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxLayoutConstraints : public wxObject +class WXDLLIMPEXP_CORE wxLayoutConstraints : public wxObject { public: // Edge constraints diff --git a/include/wx/list.h b/include/wx/list.h index 3aace939b4..a09bc6158d 100644 --- a/include/wx/list.h +++ b/include/wx/list.h @@ -131,7 +131,7 @@ inline const void *wxListCastElementToVoidPtr(const wxString& str) for mingw 3.2.3 compiler bug that prevents a static function of liT class from being exported into dll. A minimal code snippet reproducing the bug: - struct WXDLLEXPORT Foo + struct WXDLLIMPEXP_CORE Foo { static void Bar(); struct SomeInnerClass @@ -342,7 +342,7 @@ inline const void *wxListCastElementToVoidPtr(const wxString& str) WX_DECLARE_LIST(elementtype, listname) #define WX_DECLARE_EXPORTED_LIST(elementtype, listname) \ - WX_DECLARE_LIST_WITH_DECL(elementtype, listname, class WXDLLEXPORT) + WX_DECLARE_LIST_WITH_DECL(elementtype, listname, class WXDLLIMPEXP_CORE) #define WX_DECLARE_EXPORTED_LIST_PTR(elementtype, listname) \ WX_DECLARE_EXPORTED_LIST(elementtype, listname) @@ -1097,11 +1097,11 @@ private: WX_DECLARE_LIST_2(elementtype, listname, wx##listname##Node, decl) #define WX_DECLARE_EXPORTED_LIST(elementtype, listname) \ - WX_DECLARE_LIST_WITH_DECL(elementtype, listname, class WXDLLEXPORT) + WX_DECLARE_LIST_WITH_DECL(elementtype, listname, class WXDLLIMPEXP_CORE) #define WX_DECLARE_EXPORTED_LIST_PTR(elementtype, listname) \ typedef elementtype _WX_LIST_ITEM_TYPE_##listname; \ - WX_DECLARE_LIST_PTR_2(elementtype, listname, wx##listname##Node, class WXDLLEXPORT) + WX_DECLARE_LIST_PTR_2(elementtype, listname, wx##listname##Node, class WXDLLIMPEXP_CORE) #define WX_DECLARE_USER_EXPORTED_LIST(elementtype, listname, usergoo) \ typedef elementtype _WX_LIST_ITEM_TYPE_##listname; \ diff --git a/include/wx/listbase.h b/include/wx/listbase.h index a2ca6ce5f2..f0f2ffc6b6 100644 --- a/include/wx/listbase.h +++ b/include/wx/listbase.h @@ -161,7 +161,7 @@ enum // TODO: this should be renamed to wxItemAttr or something general like this // and used as base class for wxTextAttr which duplicates this class // entirely currently -class WXDLLEXPORT wxListItemAttr +class WXDLLIMPEXP_CORE wxListItemAttr { public: // ctors @@ -213,7 +213,7 @@ private: // wxListItem: the item or column info, used to exchange data with wxListCtrl // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxListItem : public wxObject +class WXDLLIMPEXP_CORE wxListItem : public wxObject { public: wxListItem() { Init(); m_attr = NULL; } @@ -371,7 +371,7 @@ private: // wxListEvent - the event class for the wxListCtrl notifications // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxListEvent : public wxNotifyEvent +class WXDLLIMPEXP_CORE wxListEvent : public wxNotifyEvent { public: wxListEvent(wxEventType commandType = wxEVT_NULL, int winid = 0) diff --git a/include/wx/listbook.h b/include/wx/listbook.h index 13a2852866..13c8611932 100644 --- a/include/wx/listbook.h +++ b/include/wx/listbook.h @@ -36,7 +36,7 @@ extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING; // wxListbook // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxListbook : public wxBookCtrlBase +class WXDLLIMPEXP_CORE wxListbook : public wxBookCtrlBase { public: wxListbook() @@ -116,7 +116,7 @@ private: // listbook event class and related stuff // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxListbookEvent : public wxBookCtrlBaseEvent +class WXDLLIMPEXP_CORE wxListbookEvent : public wxBookCtrlBaseEvent { public: wxListbookEvent(wxEventType commandType = wxEVT_NULL, int id = 0, diff --git a/include/wx/listbox.h b/include/wx/listbox.h index cab8df6d63..e77d2b3ab8 100644 --- a/include/wx/listbox.h +++ b/include/wx/listbox.h @@ -30,13 +30,13 @@ class WXDLLIMPEXP_FWD_BASE wxArrayString; // global data // ---------------------------------------------------------------------------- -extern WXDLLEXPORT_DATA(const char) wxListBoxNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxListBoxNameStr[]; // ---------------------------------------------------------------------------- // wxListBox interface is defined by the class wxListBoxBase // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxListBoxBase : public wxControlWithItems +class WXDLLIMPEXP_CORE wxListBoxBase : public wxControlWithItems { public: wxListBoxBase() { } diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h index ef4e2d3763..8bb9adcabc 100644 --- a/include/wx/listctrl.h +++ b/include/wx/listctrl.h @@ -22,7 +22,7 @@ // constants // ---------------------------------------------------------------------------- -extern WXDLLEXPORT_DATA(const char) wxListCtrlNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxListCtrlNameStr[]; // ---------------------------------------------------------------------------- // include the wxListCtrl class declaration @@ -40,7 +40,7 @@ extern WXDLLEXPORT_DATA(const char) wxListCtrlNameStr[]; // wxListView: a class which provides a better API for list control // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxListView : public wxListCtrl +class WXDLLIMPEXP_CORE wxListView : public wxListCtrl { public: wxListView() { } diff --git a/include/wx/mac/carbon/accel.h b/include/wx/mac/carbon/accel.h index cf0ce76927..5a81d61840 100644 --- a/include/wx/mac/carbon/accel.h +++ b/include/wx/mac/carbon/accel.h @@ -15,7 +15,7 @@ #include "wx/string.h" #include "wx/event.h" -class WXDLLEXPORT wxAcceleratorTable: public wxObject +class WXDLLIMPEXP_CORE wxAcceleratorTable: public wxObject { DECLARE_DYNAMIC_CLASS(wxAcceleratorTable) public: @@ -30,7 +30,7 @@ public: int GetCommand( wxKeyEvent &event ); }; -// WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable; +// WXDLLIMPEXP_DATA_CORE(extern wxAcceleratorTable) wxNullAcceleratorTable; #endif // _WX_ACCEL_H_ diff --git a/include/wx/mac/carbon/app.h b/include/wx/mac/carbon/app.h index 5a4fc4b923..66796866a4 100644 --- a/include/wx/mac/carbon/app.h +++ b/include/wx/mac/carbon/app.h @@ -24,14 +24,14 @@ class WXDLLIMPEXP_FWD_CORE wxKeyEvent; class WXDLLIMPEXP_FWD_BASE wxLog; // Force an exit from main loop -void WXDLLEXPORT wxExit(); +void WXDLLIMPEXP_CORE wxExit(); // Yield to other apps/messages -bool WXDLLEXPORT wxYield(); +bool WXDLLIMPEXP_CORE wxYield(); // Represents the application. Derive OnInit and declare // a new App object to start application -class WXDLLEXPORT wxApp: public wxAppBase +class WXDLLIMPEXP_CORE wxApp: public wxAppBase { DECLARE_DYNAMIC_CLASS(wxApp) diff --git a/include/wx/mac/carbon/apptrait.h b/include/wx/mac/carbon/apptrait.h index f77a515da5..6a0eb7f77f 100644 --- a/include/wx/mac/carbon/apptrait.h +++ b/include/wx/mac/carbon/apptrait.h @@ -31,7 +31,7 @@ public: #if wxUSE_GUI -class WXDLLEXPORT wxGUIAppTraits : public wxGUIAppTraitsBase +class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase { public: #if wxUSE_TIMER diff --git a/include/wx/mac/carbon/bitmap.h b/include/wx/mac/carbon/bitmap.h index 40ad96f232..5aa1ce31b3 100644 --- a/include/wx/mac/carbon/bitmap.h +++ b/include/wx/mac/carbon/bitmap.h @@ -31,7 +31,7 @@ class WXDLLIMPEXP_FWD_CORE wxPixelDataBase; // 8 bit is chosen only for performance reasons, note also that this is the inverse value range // from alpha, where 0 = invisible , 255 = fully drawn -class WXDLLEXPORT wxMask: public wxObject +class WXDLLIMPEXP_CORE wxMask: public wxObject { DECLARE_DYNAMIC_CLASS(wxMask) @@ -80,7 +80,7 @@ private: }; -class WXDLLEXPORT wxBitmap: public wxBitmapBase +class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase { DECLARE_DYNAMIC_CLASS(wxBitmap) diff --git a/include/wx/mac/carbon/bmpbuttn.h b/include/wx/mac/carbon/bmpbuttn.h index 3e30334b32..265d2757bd 100644 --- a/include/wx/mac/carbon/bmpbuttn.h +++ b/include/wx/mac/carbon/bmpbuttn.h @@ -14,11 +14,11 @@ #include "wx/button.h" -WXDLLEXPORT_DATA(extern const char) wxButtonNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxButtonNameStr[]; #define wxDEFAULT_BUTTON_MARGIN 4 -class WXDLLEXPORT wxBitmapButton: public wxBitmapButtonBase +class WXDLLIMPEXP_CORE wxBitmapButton: public wxBitmapButtonBase { DECLARE_DYNAMIC_CLASS(wxBitmapButton) diff --git a/include/wx/mac/carbon/brush.h b/include/wx/mac/carbon/brush.h index f553b4ec05..c59a4af24f 100644 --- a/include/wx/mac/carbon/brush.h +++ b/include/wx/mac/carbon/brush.h @@ -19,7 +19,7 @@ class WXDLLIMPEXP_FWD_CORE wxBrush; // Brush -class WXDLLEXPORT wxBrush: public wxBrushBase +class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase { public: wxBrush(); diff --git a/include/wx/mac/carbon/button.h b/include/wx/mac/carbon/button.h index d43300cb84..1c3b4d01ae 100644 --- a/include/wx/mac/carbon/button.h +++ b/include/wx/mac/carbon/button.h @@ -15,10 +15,10 @@ #include "wx/control.h" #include "wx/gdicmn.h" -WXDLLEXPORT_DATA(extern const char) wxButtonNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxButtonNameStr[]; // Pushbutton -class WXDLLEXPORT wxButton: public wxButtonBase +class WXDLLIMPEXP_CORE wxButton: public wxButtonBase { public: wxButton() {} @@ -55,7 +55,7 @@ protected: DECLARE_DYNAMIC_CLASS(wxButton) }; -class WXDLLEXPORT wxDisclosureTriangle: public wxControl +class WXDLLIMPEXP_CORE wxDisclosureTriangle: public wxControl { public: wxDisclosureTriangle(wxWindow *parent, diff --git a/include/wx/mac/carbon/checkbox.h b/include/wx/mac/carbon/checkbox.h index e1447e355b..981a66b7cc 100644 --- a/include/wx/mac/carbon/checkbox.h +++ b/include/wx/mac/carbon/checkbox.h @@ -13,7 +13,7 @@ #define _WX_CHECKBOX_H_ // Checkbox item (single checkbox) -class WXDLLEXPORT wxCheckBox : public wxCheckBoxBase +class WXDLLIMPEXP_CORE wxCheckBox : public wxCheckBoxBase { public: wxCheckBox() { } @@ -45,7 +45,7 @@ protected: }; class WXDLLIMPEXP_FWD_CORE wxBitmap; -class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox +class WXDLLIMPEXP_CORE wxBitmapCheckBox: public wxCheckBox { public: int checkWidth; diff --git a/include/wx/mac/carbon/checklst.h b/include/wx/mac/carbon/checklst.h index 3cc70996b4..8be9e99c08 100644 --- a/include/wx/mac/carbon/checklst.h +++ b/include/wx/mac/carbon/checklst.h @@ -22,7 +22,7 @@ public : virtual ~wxMacCheckListControl() { } }; -class WXDLLEXPORT wxCheckListBox : public wxCheckListBoxBase +class WXDLLIMPEXP_CORE wxCheckListBox : public wxCheckListBoxBase { public: // ctors diff --git a/include/wx/mac/carbon/choice.h b/include/wx/mac/carbon/choice.h index 04946ff285..c73a831069 100644 --- a/include/wx/mac/carbon/choice.h +++ b/include/wx/mac/carbon/choice.h @@ -17,12 +17,12 @@ #include "wx/dynarray.h" #include "wx/arrstr.h" -WXDLLEXPORT_DATA(extern const char) wxChoiceNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxChoiceNameStr[]; WX_DEFINE_ARRAY( char * , wxChoiceDataArray ) ; // Choice item -class WXDLLEXPORT wxChoice: public wxChoiceBase +class WXDLLIMPEXP_CORE wxChoice: public wxChoiceBase { DECLARE_DYNAMIC_CLASS(wxChoice) diff --git a/include/wx/mac/carbon/clipbrd.h b/include/wx/mac/carbon/clipbrd.h index 0c80b03c26..973530ad29 100644 --- a/include/wx/mac/carbon/clipbrd.h +++ b/include/wx/mac/carbon/clipbrd.h @@ -28,7 +28,7 @@ //----------------------------------------------------------------------------- class WXDLLIMPEXP_FWD_CORE wxDataObject; -class WXDLLEXPORT wxClipboard : public wxClipboardBase +class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase { DECLARE_DYNAMIC_CLASS(wxClipboard) diff --git a/include/wx/mac/carbon/colordlg.h b/include/wx/mac/carbon/colordlg.h index 402547bdf8..219e1b4e19 100644 --- a/include/wx/mac/carbon/colordlg.h +++ b/include/wx/mac/carbon/colordlg.h @@ -21,7 +21,7 @@ * Platform-specific colour dialog implementation */ -class WXDLLEXPORT wxColourDialog: public wxDialog +class WXDLLIMPEXP_CORE wxColourDialog: public wxDialog { DECLARE_DYNAMIC_CLASS(wxColourDialog) public: diff --git a/include/wx/mac/carbon/colour.h b/include/wx/mac/carbon/colour.h index 22a3925e52..431149f060 100644 --- a/include/wx/mac/carbon/colour.h +++ b/include/wx/mac/carbon/colour.h @@ -20,7 +20,7 @@ struct RGBColor; // Colour -class WXDLLEXPORT wxColour: public wxColourBase +class WXDLLIMPEXP_CORE wxColour: public wxColourBase { public: // constructors diff --git a/include/wx/mac/carbon/combobox.h b/include/wx/mac/carbon/combobox.h index c38095768d..f8ff5bd4e5 100644 --- a/include/wx/mac/carbon/combobox.h +++ b/include/wx/mac/carbon/combobox.h @@ -15,7 +15,7 @@ #include "wx/containr.h" #include "wx/choice.h" -WXDLLEXPORT_DATA(extern const char) wxComboBoxNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxComboBoxNameStr[]; // forward declaration of private implementation classes @@ -23,7 +23,7 @@ class wxComboBoxText; class wxComboBoxChoice; // Combobox item -class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase +class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase { DECLARE_DYNAMIC_CLASS(wxComboBox) diff --git a/include/wx/mac/carbon/control.h b/include/wx/mac/carbon/control.h index 41b9ddc2cc..8d7f2652c3 100644 --- a/include/wx/mac/carbon/control.h +++ b/include/wx/mac/carbon/control.h @@ -12,10 +12,10 @@ #ifndef _WX_CONTROL_H_ #define _WX_CONTROL_H_ -WXDLLEXPORT_DATA(extern const char) wxControlNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxControlNameStr[]; // General item class -class WXDLLEXPORT wxControl : public wxControlBase +class WXDLLIMPEXP_CORE wxControl : public wxControlBase { DECLARE_ABSTRACT_CLASS(wxControl) diff --git a/include/wx/mac/carbon/cursor.h b/include/wx/mac/carbon/cursor.h index 7b56e231f6..a9248f7e90 100644 --- a/include/wx/mac/carbon/cursor.h +++ b/include/wx/mac/carbon/cursor.h @@ -15,7 +15,7 @@ #include "wx/bitmap.h" // Cursor -class WXDLLEXPORT wxCursor : public wxGDIObject +class WXDLLIMPEXP_CORE wxCursor : public wxGDIObject { public: wxCursor(); @@ -48,6 +48,6 @@ private: DECLARE_DYNAMIC_CLASS(wxCursor) }; -extern WXDLLEXPORT void wxSetCursor(const wxCursor& cursor); +extern WXDLLIMPEXP_CORE void wxSetCursor(const wxCursor& cursor); #endif // _WX_CURSOR_H_ diff --git a/include/wx/mac/carbon/dataform.h b/include/wx/mac/carbon/dataform.h index 96a108c335..910dfc5fef 100644 --- a/include/wx/mac/carbon/dataform.h +++ b/include/wx/mac/carbon/dataform.h @@ -12,7 +12,7 @@ #ifndef _WX_MAC_DATAFORM_H #define _WX_MAC_DATAFORM_H -class WXDLLEXPORT wxDataFormat +class WXDLLIMPEXP_CORE wxDataFormat { public: typedef unsigned long NativeFormat; diff --git a/include/wx/mac/carbon/dataobj.h b/include/wx/mac/carbon/dataobj.h index e5c0fda881..4b027bfe13 100644 --- a/include/wx/mac/carbon/dataobj.h +++ b/include/wx/mac/carbon/dataobj.h @@ -16,7 +16,7 @@ // wxDataObject is the same as wxDataObjectBase under wxGTK // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxDataObject : public wxDataObjectBase +class WXDLLIMPEXP_CORE wxDataObject : public wxDataObjectBase { public: wxDataObject(); diff --git a/include/wx/mac/carbon/dataobj2.h b/include/wx/mac/carbon/dataobj2.h index b647d2a465..8caa5b4e6d 100644 --- a/include/wx/mac/carbon/dataobj2.h +++ b/include/wx/mac/carbon/dataobj2.h @@ -16,7 +16,7 @@ // wxBitmapDataObject is a specialization of wxDataObject for bitmaps // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxBitmapDataObject : public wxBitmapDataObjectBase +class WXDLLIMPEXP_CORE wxBitmapDataObject : public wxBitmapDataObjectBase { public: // ctors @@ -61,7 +61,7 @@ protected : // wxFileDataObject is a specialization of wxDataObject for file names // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFileDataObject : public wxFileDataObjectBase +class WXDLLIMPEXP_CORE wxFileDataObject : public wxFileDataObjectBase { public: // implement base class pure virtuals diff --git a/include/wx/mac/carbon/dcclient.h b/include/wx/mac/carbon/dcclient.h index a35e461720..fa518275f1 100644 --- a/include/wx/mac/carbon/dcclient.h +++ b/include/wx/mac/carbon/dcclient.h @@ -22,7 +22,7 @@ class WXDLLIMPEXP_FWD_CORE wxPaintDC; class WXDLLIMPEXP_FWD_CORE wxWindow; -class WXDLLEXPORT wxWindowDCImpl: public wxGCDCImpl +class WXDLLIMPEXP_CORE wxWindowDCImpl: public wxGCDCImpl { public: wxWindowDCImpl( wxDC *owner ); @@ -42,7 +42,7 @@ protected: }; -class WXDLLEXPORT wxClientDCImpl: public wxWindowDCImpl +class WXDLLIMPEXP_CORE wxClientDCImpl: public wxWindowDCImpl { public: wxClientDCImpl( wxDC *owner ); @@ -55,7 +55,7 @@ private: }; -class WXDLLEXPORT wxPaintDCImpl: public wxWindowDCImpl +class WXDLLIMPEXP_CORE wxPaintDCImpl: public wxWindowDCImpl { public: wxPaintDCImpl( wxDC *owner ); diff --git a/include/wx/mac/carbon/dcmemory.h b/include/wx/mac/carbon/dcmemory.h index b31d327e36..c42c6544e7 100644 --- a/include/wx/mac/carbon/dcmemory.h +++ b/include/wx/mac/carbon/dcmemory.h @@ -14,7 +14,7 @@ #include "wx/mac/carbon/dcclient.h" -class WXDLLEXPORT wxMemoryDCImpl: public wxPaintDCImpl +class WXDLLIMPEXP_CORE wxMemoryDCImpl: public wxPaintDCImpl { public: wxMemoryDCImpl( wxMemoryDC *owner ); diff --git a/include/wx/mac/carbon/dcprint.h b/include/wx/mac/carbon/dcprint.h index e11ee31570..1e64559a2d 100644 --- a/include/wx/mac/carbon/dcprint.h +++ b/include/wx/mac/carbon/dcprint.h @@ -18,7 +18,7 @@ class wxNativePrinterDC ; -class WXDLLEXPORT wxPrinterDCImpl: public wxGCDCImpl +class WXDLLIMPEXP_CORE wxPrinterDCImpl: public wxGCDCImpl { public: #if wxUSE_PRINTING_ARCHITECTURE diff --git a/include/wx/mac/carbon/dcscreen.h b/include/wx/mac/carbon/dcscreen.h index a687ee80a4..a97d66554e 100644 --- a/include/wx/mac/carbon/dcscreen.h +++ b/include/wx/mac/carbon/dcscreen.h @@ -15,7 +15,7 @@ #include "wx/dcclient.h" #include "wx/mac/carbon/dcclient.h" -class WXDLLEXPORT wxScreenDCImpl: public wxWindowDCImpl +class WXDLLIMPEXP_CORE wxScreenDCImpl: public wxWindowDCImpl { public: wxScreenDCImpl( wxDC *owner ); diff --git a/include/wx/mac/carbon/dialog.h b/include/wx/mac/carbon/dialog.h index 4b3827bea0..351f6b8aee 100644 --- a/include/wx/mac/carbon/dialog.h +++ b/include/wx/mac/carbon/dialog.h @@ -14,12 +14,12 @@ #include "wx/panel.h" -WXDLLEXPORT_DATA(extern const char) wxDialogNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxDialogNameStr[]; class WXDLLIMPEXP_FWD_CORE wxMacToolTip ; // Dialog boxes -class WXDLLEXPORT wxDialog : public wxDialogBase +class WXDLLIMPEXP_CORE wxDialog : public wxDialogBase { DECLARE_DYNAMIC_CLASS(wxDialog) diff --git a/include/wx/mac/carbon/dirdlg.h b/include/wx/mac/carbon/dirdlg.h index 5db3edc6bb..8e7761505d 100644 --- a/include/wx/mac/carbon/dirdlg.h +++ b/include/wx/mac/carbon/dirdlg.h @@ -12,7 +12,7 @@ #ifndef _WX_DIRDLG_H_ #define _WX_DIRDLG_H_ -class WXDLLEXPORT wxDirDialog : public wxDirDialogBase +class WXDLLIMPEXP_CORE wxDirDialog : public wxDirDialogBase { public: wxDirDialog(wxWindow *parent, diff --git a/include/wx/mac/carbon/dnd.h b/include/wx/mac/carbon/dnd.h index fc7dc9a300..2f0b8d48ef 100644 --- a/include/wx/mac/carbon/dnd.h +++ b/include/wx/mac/carbon/dnd.h @@ -45,7 +45,7 @@ class WXDLLIMPEXP_FWD_CORE wxDropSource; // wxDropTarget //------------------------------------------------------------------------- -class WXDLLEXPORT wxDropTarget: public wxDropTargetBase +class WXDLLIMPEXP_CORE wxDropTarget: public wxDropTargetBase { public: @@ -67,7 +67,7 @@ class WXDLLEXPORT wxDropTarget: public wxDropTargetBase // wxDropSource //------------------------------------------------------------------------- -class WXDLLEXPORT wxDropSource: public wxDropSourceBase +class WXDLLIMPEXP_CORE wxDropSource: public wxDropSourceBase { public: // ctors: if you use default ctor you must call SetData() later! diff --git a/include/wx/mac/carbon/evtloop.h b/include/wx/mac/carbon/evtloop.h index c13a51836c..5cf323876d 100644 --- a/include/wx/mac/carbon/evtloop.h +++ b/include/wx/mac/carbon/evtloop.h @@ -29,7 +29,7 @@ #if wxMAC_USE_RUN_APP_EVENT_LOOP -class WXDLLEXPORT wxGUIEventLoop : public wxEventLoopBase +class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxEventLoopBase { public: wxGUIEventLoop() { m_exitcode = 0; } @@ -46,7 +46,7 @@ private: #else // manual event loop -class WXDLLEXPORT wxGUIEventLoop : public wxEventLoopManual +class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxEventLoopManual { public: wxGUIEventLoop() { } diff --git a/include/wx/mac/carbon/filedlg.h b/include/wx/mac/carbon/filedlg.h index d9559656f9..cd2d7c9111 100644 --- a/include/wx/mac/carbon/filedlg.h +++ b/include/wx/mac/carbon/filedlg.h @@ -16,7 +16,7 @@ // wxFileDialog //------------------------------------------------------------------------- -class WXDLLEXPORT wxFileDialog: public wxFileDialogBase +class WXDLLIMPEXP_CORE wxFileDialog: public wxFileDialogBase { DECLARE_DYNAMIC_CLASS(wxFileDialog) protected: diff --git a/include/wx/mac/carbon/font.h b/include/wx/mac/carbon/font.h index 6266ea102c..3962e4b287 100644 --- a/include/wx/mac/carbon/font.h +++ b/include/wx/mac/carbon/font.h @@ -16,7 +16,7 @@ // wxFont // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFont : public wxFontBase +class WXDLLIMPEXP_CORE wxFont : public wxFontBase { public: // ctors and such diff --git a/include/wx/mac/carbon/fontdlg.h b/include/wx/mac/carbon/fontdlg.h index eec6a51be5..48af50e871 100644 --- a/include/wx/mac/carbon/fontdlg.h +++ b/include/wx/mac/carbon/fontdlg.h @@ -25,7 +25,7 @@ #if wxMAC_USE_EXPERIMENTAL_FONTDIALOG -class WXDLLEXPORT wxFontDialog : public wxDialog +class WXDLLIMPEXP_CORE wxFontDialog : public wxDialog { public: wxFontDialog(); @@ -78,7 +78,7 @@ class WXDLLIMPEXP_FWD_CORE wxCheckBox; #endif // !USE_NATIVE_FONT_DIALOG_FOR_MACOSX -class WXDLLEXPORT wxFontDialog: public wxDialog +class WXDLLIMPEXP_CORE wxFontDialog: public wxDialog { DECLARE_DYNAMIC_CLASS(wxFontDialog) diff --git a/include/wx/mac/carbon/frame.h b/include/wx/mac/carbon/frame.h index 239cd4db5a..4eb04e2435 100644 --- a/include/wx/mac/carbon/frame.h +++ b/include/wx/mac/carbon/frame.h @@ -17,13 +17,13 @@ #include "wx/accel.h" #include "wx/icon.h" -WXDLLEXPORT_DATA(extern const char) wxToolBarNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxToolBarNameStr[]; class WXDLLIMPEXP_FWD_CORE wxMenuBar; class WXDLLIMPEXP_FWD_CORE wxStatusBar; class WXDLLIMPEXP_FWD_CORE wxMacToolTip ; -class WXDLLEXPORT wxFrame: public wxFrameBase +class WXDLLIMPEXP_CORE wxFrame: public wxFrameBase { public: // construction diff --git a/include/wx/mac/carbon/gauge.h b/include/wx/mac/carbon/gauge.h index d2c7340d51..3db68bebe8 100644 --- a/include/wx/mac/carbon/gauge.h +++ b/include/wx/mac/carbon/gauge.h @@ -14,10 +14,10 @@ #include "wx/control.h" -WXDLLEXPORT_DATA(extern const char) wxGaugeNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxGaugeNameStr[]; // Group box -class WXDLLEXPORT wxGauge: public wxGaugeBase +class WXDLLIMPEXP_CORE wxGauge: public wxGaugeBase { public: inline wxGauge() { } diff --git a/include/wx/mac/carbon/helpxxxx.h b/include/wx/mac/carbon/helpxxxx.h index 415ccdb1c0..7bb66c7cba 100644 --- a/include/wx/mac/carbon/helpxxxx.h +++ b/include/wx/mac/carbon/helpxxxx.h @@ -17,7 +17,7 @@ #include "wx/helpbase.h" -class WXDLLEXPORT wxXXXXHelpController: public wxHelpControllerBase +class WXDLLIMPEXP_CORE wxXXXXHelpController: public wxHelpControllerBase { DECLARE_CLASS(wxXXXXHelpController) diff --git a/include/wx/mac/carbon/icon.h b/include/wx/mac/carbon/icon.h index 8fae1eb6bf..754a5344c1 100644 --- a/include/wx/mac/carbon/icon.h +++ b/include/wx/mac/carbon/icon.h @@ -15,7 +15,7 @@ #include "wx/bitmap.h" // Icon -class WXDLLEXPORT wxIcon : public wxGDIObject +class WXDLLIMPEXP_CORE wxIcon : public wxGDIObject { public: wxIcon(); @@ -63,7 +63,7 @@ private: }; /* -class WXDLLEXPORT wxICONFileHandler: public wxBitmapHandler +class WXDLLIMPEXP_CORE wxICONFileHandler: public wxBitmapHandler { DECLARE_DYNAMIC_CLASS(wxICONFileHandler) public: @@ -79,7 +79,7 @@ public: }; */ -class WXDLLEXPORT wxICONResourceHandler: public wxBitmapHandler +class WXDLLIMPEXP_CORE wxICONResourceHandler: public wxBitmapHandler { DECLARE_DYNAMIC_CLASS(wxICONResourceHandler) public: diff --git a/include/wx/mac/carbon/imaglist.h b/include/wx/mac/carbon/imaglist.h index 59bfe6261d..10e96b588d 100644 --- a/include/wx/mac/carbon/imaglist.h +++ b/include/wx/mac/carbon/imaglist.h @@ -19,7 +19,7 @@ class WXDLLIMPEXP_FWD_CORE wxDC; class WXDLLIMPEXP_FWD_CORE wxBitmap; class WXDLLIMPEXP_FWD_CORE wxColour; -class WXDLLEXPORT wxImageList: public wxObject +class WXDLLIMPEXP_CORE wxImageList: public wxObject { public: wxImageList() { m_width = m_height = 0; } diff --git a/include/wx/mac/carbon/listbox.h b/include/wx/mac/carbon/listbox.h index 4be48d9bb6..390cb34b63 100644 --- a/include/wx/mac/carbon/listbox.h +++ b/include/wx/mac/carbon/listbox.h @@ -32,7 +32,7 @@ WX_DEFINE_ARRAY( char* , wxListDataArray ); // List box control // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxListBox : public wxListBoxBase +class WXDLLIMPEXP_CORE wxListBox : public wxListBoxBase { public: // ctors and such diff --git a/include/wx/mac/carbon/listctrl.h b/include/wx/mac/carbon/listctrl.h index f9c3e4201a..16ccc810fa 100644 --- a/include/wx/mac/carbon/listctrl.h +++ b/include/wx/mac/carbon/listctrl.h @@ -24,7 +24,7 @@ class wxListCtrlRenameTimer; WX_DECLARE_EXPORTED_LIST(wxListItem, wxColumnList); -class WXDLLEXPORT wxListCtrl: public wxControl +class WXDLLIMPEXP_CORE wxListCtrl: public wxControl { DECLARE_DYNAMIC_CLASS(wxListCtrl) public: diff --git a/include/wx/mac/carbon/mdi.h b/include/wx/mac/carbon/mdi.h index 7b2c2cda17..39319b262b 100644 --- a/include/wx/mac/carbon/mdi.h +++ b/include/wx/mac/carbon/mdi.h @@ -16,12 +16,12 @@ #include "wx/frame.h" -WXDLLEXPORT_DATA(extern const char) wxStatusLineNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxStatusLineNameStr[]; class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow; class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame; -class WXDLLEXPORT wxMDIParentFrame: public wxFrame +class WXDLLIMPEXP_CORE wxMDIParentFrame: public wxFrame { DECLARE_DYNAMIC_CLASS(wxMDIParentFrame) @@ -110,7 +110,7 @@ private: DECLARE_EVENT_TABLE() }; -class WXDLLEXPORT wxMDIChildFrame: public wxFrame +class WXDLLIMPEXP_CORE wxMDIChildFrame: public wxFrame { DECLARE_DYNAMIC_CLASS(wxMDIChildFrame) public: @@ -162,7 +162,7 @@ protected: * of the children. Phew! So the children are sort of 'adopted'... */ -class WXDLLEXPORT wxMDIClientWindow: public wxWindow +class WXDLLIMPEXP_CORE wxMDIClientWindow: public wxWindow { DECLARE_DYNAMIC_CLASS(wxMDIClientWindow) public: diff --git a/include/wx/mac/carbon/menu.h b/include/wx/mac/carbon/menu.h index 1b78b37649..4d5fa44c5a 100644 --- a/include/wx/mac/carbon/menu.h +++ b/include/wx/mac/carbon/menu.h @@ -20,7 +20,7 @@ class WXDLLIMPEXP_FWD_CORE wxFrame; // Menu // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMenu : public wxMenuBase +class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase { public: // ctors & dtor @@ -99,7 +99,7 @@ private: // Menu Bar (a la Windows) // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMenuBar : public wxMenuBarBase +class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase { public: // ctors & dtor diff --git a/include/wx/mac/carbon/menuitem.h b/include/wx/mac/carbon/menuitem.h index 4be07df17b..cae5583583 100644 --- a/include/wx/mac/carbon/menuitem.h +++ b/include/wx/mac/carbon/menuitem.h @@ -22,7 +22,7 @@ // ---------------------------------------------------------------------------- // wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMenuItem: public wxMenuItemBase +class WXDLLIMPEXP_CORE wxMenuItem: public wxMenuItemBase { public: // ctor & dtor diff --git a/include/wx/mac/carbon/metafile.h b/include/wx/mac/carbon/metafile.h index 694e45fb28..da4c864150 100644 --- a/include/wx/mac/carbon/metafile.h +++ b/include/wx/mac/carbon/metafile.h @@ -37,7 +37,7 @@ class wxMetafileRefData ; #define M_METAFILEDATA ((wxMetafileRefData *)m_refData) -class WXDLLEXPORT wxMetafile : public wxGDIObject +class WXDLLIMPEXP_CORE wxMetafile : public wxGDIObject { public: wxMetafile(const wxString& file = wxEmptyString); @@ -71,7 +71,7 @@ protected: }; -class WXDLLEXPORT wxMetafileDCImpl: public wxGCDCImpl +class WXDLLIMPEXP_CORE wxMetafileDCImpl: public wxGCDCImpl { public: wxMetafileDCImpl( wxDC *owner, @@ -98,7 +98,7 @@ private: DECLARE_NO_COPY_CLASS(wxMetafileDCImpl) }; -class WXDLLEXPORT wxMetafileDC: public wxDC +class WXDLLIMPEXP_CORE wxMetafileDC: public wxDC { public: // the ctor parameters specify the filename (empty for memory metafiles), @@ -130,17 +130,17 @@ private: // No origin or extent #define wxMakeMetaFilePlaceable wxMakeMetafilePlaceable -bool WXDLLEXPORT wxMakeMetafilePlaceable(const wxString& filename, float scale = 1.0); +bool WXDLLIMPEXP_CORE wxMakeMetafilePlaceable(const wxString& filename, float scale = 1.0); // Optional origin and extent -bool WXDLLEXPORT wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y1, int x2, int y2, float scale = 1.0, bool useOriginAndExtent = TRUE); +bool WXDLLIMPEXP_CORE wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y1, int x2, int y2, float scale = 1.0, bool useOriginAndExtent = TRUE); // ---------------------------------------------------------------------------- // wxMetafileDataObject is a specialization of wxDataObject for metafile data // ---------------------------------------------------------------------------- #if wxUSE_DATAOBJ -class WXDLLEXPORT wxMetafileDataObject : public wxDataObjectSimple +class WXDLLIMPEXP_CORE wxMetafileDataObject : public wxDataObjectSimple { public: // ctors diff --git a/include/wx/mac/carbon/minifram.h b/include/wx/mac/carbon/minifram.h index 6d00c918ec..ba00ddd1a4 100644 --- a/include/wx/mac/carbon/minifram.h +++ b/include/wx/mac/carbon/minifram.h @@ -16,7 +16,7 @@ #include "wx/frame.h" -class WXDLLEXPORT wxMiniFrame: public wxFrame { +class WXDLLIMPEXP_CORE wxMiniFrame: public wxFrame { DECLARE_DYNAMIC_CLASS(wxMiniFrame) diff --git a/include/wx/mac/carbon/msgdlg.h b/include/wx/mac/carbon/msgdlg.h index 2d00d5df3b..1a945a909b 100644 --- a/include/wx/mac/carbon/msgdlg.h +++ b/include/wx/mac/carbon/msgdlg.h @@ -13,7 +13,7 @@ #ifndef _WX_MSGBOXDLG_H_ #define _WX_MSGBOXDLG_H_ -class WXDLLEXPORT wxMessageDialog : public wxMessageDialogBase +class WXDLLIMPEXP_CORE wxMessageDialog : public wxMessageDialogBase { public: wxMessageDialog(wxWindow *parent, diff --git a/include/wx/mac/carbon/nonownedwnd.h b/include/wx/mac/carbon/nonownedwnd.h index b363149674..c16fd9867e 100644 --- a/include/wx/mac/carbon/nonownedwnd.h +++ b/include/wx/mac/carbon/nonownedwnd.h @@ -139,7 +139,7 @@ private : }; // list of all frames and modeless dialogs -extern WXDLLEXPORT_DATA(wxWindowList) wxModelessWindows; +extern WXDLLIMPEXP_DATA_CORE(wxWindowList) wxModelessWindows; #endif // _WX_MAC_NONOWNEDWND_H_ diff --git a/include/wx/mac/carbon/palette.h b/include/wx/mac/carbon/palette.h index b7429d9200..5c6aa4740f 100644 --- a/include/wx/mac/carbon/palette.h +++ b/include/wx/mac/carbon/palette.h @@ -16,7 +16,7 @@ #define M_PALETTEDATA ((wxPaletteRefData *)m_refData) -class WXDLLEXPORT wxPalette : public wxPaletteBase +class WXDLLIMPEXP_CORE wxPalette : public wxPaletteBase { public: wxPalette(); diff --git a/include/wx/mac/carbon/pen.h b/include/wx/mac/carbon/pen.h index d354351519..13332a3077 100644 --- a/include/wx/mac/carbon/pen.h +++ b/include/wx/mac/carbon/pen.h @@ -17,7 +17,7 @@ #include "wx/bitmap.h" // Pen -class WXDLLEXPORT wxPen : public wxPenBase +class WXDLLIMPEXP_CORE wxPen : public wxPenBase { public: wxPen(); diff --git a/include/wx/mac/carbon/pnghand.h b/include/wx/mac/carbon/pnghand.h index 2d8b4a0b27..de27a024d9 100644 --- a/include/wx/mac/carbon/pnghand.h +++ b/include/wx/mac/carbon/pnghand.h @@ -16,7 +16,7 @@ #if wxUSE_LIBPNG -class WXDLLEXPORT wxPNGFileHandler: public wxBitmapHandler +class WXDLLIMPEXP_CORE wxPNGFileHandler: public wxBitmapHandler { DECLARE_DYNAMIC_CLASS(wxPNGFileHandler) public: diff --git a/include/wx/mac/carbon/popupwin.h b/include/wx/mac/carbon/popupwin.h index a8111d491e..3bf458ef15 100644 --- a/include/wx/mac/carbon/popupwin.h +++ b/include/wx/mac/carbon/popupwin.h @@ -16,7 +16,7 @@ // wxPopupWindow // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxPopupWindow : public wxPopupWindowBase +class WXDLLIMPEXP_CORE wxPopupWindow : public wxPopupWindowBase { public: wxPopupWindow() { } diff --git a/include/wx/mac/carbon/printdlg.h b/include/wx/mac/carbon/printdlg.h index 3df2606ebf..d6ec1ce09b 100644 --- a/include/wx/mac/carbon/printdlg.h +++ b/include/wx/mac/carbon/printdlg.h @@ -25,7 +25,7 @@ */ class WXDLLIMPEXP_FWD_CORE wxDC; -class WXDLLEXPORT wxMacPrintDialog: public wxPrintDialogBase +class WXDLLIMPEXP_CORE wxMacPrintDialog: public wxPrintDialogBase { public: wxMacPrintDialog(); @@ -55,7 +55,7 @@ private: * The Mac page setup dialog */ -class WXDLLEXPORT wxMacPageSetupDialog: public wxPageSetupDialogBase +class WXDLLIMPEXP_CORE wxMacPageSetupDialog: public wxPageSetupDialogBase { public: wxMacPageSetupDialog(wxWindow *parent, wxPageSetupData *data = NULL); @@ -82,7 +82,7 @@ class WXDLLIMPEXP_FWD_CORE wxTextCtrl; * (native) wxMacPageSetupDialog doesn't let you set margins. */ -class WXDLLEXPORT wxMacPageMarginsDialog : public wxDialog +class WXDLLIMPEXP_CORE wxMacPageMarginsDialog : public wxDialog { public: wxMacPageMarginsDialog(wxFrame* parent, wxPageSetupData* data); diff --git a/include/wx/mac/carbon/printmac.h b/include/wx/mac/carbon/printmac.h index 62f14dd840..776d6643c1 100644 --- a/include/wx/mac/carbon/printmac.h +++ b/include/wx/mac/carbon/printmac.h @@ -18,7 +18,7 @@ * Represents the printer: manages printing a wxPrintout object */ -class WXDLLEXPORT wxMacPrinter: public wxPrinterBase +class WXDLLIMPEXP_CORE wxMacPrinter: public wxPrinterBase { DECLARE_DYNAMIC_CLASS(wxMacPrinter) @@ -39,7 +39,7 @@ class WXDLLEXPORT wxMacPrinter: public wxPrinterBase * Programmer creates an object of this class to preview a wxPrintout. */ -class WXDLLEXPORT wxMacPrintPreview: public wxPrintPreviewBase +class WXDLLIMPEXP_CORE wxMacPrintPreview: public wxPrintPreviewBase { DECLARE_CLASS(wxMacPrintPreview) diff --git a/include/wx/mac/carbon/private.h b/include/wx/mac/carbon/private.h index aa53b36900..d893acc5f2 100644 --- a/include/wx/mac/carbon/private.h +++ b/include/wx/mac/carbon/private.h @@ -33,7 +33,7 @@ typedef SInt32 SRefCon; #include "wx/mac/carbon/dcclient.h" #include "wx/mac/carbon/dcmemory.h" -class WXDLLEXPORT wxMacCGContextStateSaver +class WXDLLIMPEXP_CORE wxMacCGContextStateSaver { DECLARE_NO_COPY_CLASS(wxMacCGContextStateSaver) @@ -100,7 +100,7 @@ template<> inline EventParamType wxMacGetEventParamType() { return template<> EventParamType wxMacGetEventParamType() { return typeGWorldPtr; } */ -class WXDLLEXPORT wxMacCarbonEvent +class WXDLLIMPEXP_CORE wxMacCarbonEvent { public : @@ -245,7 +245,7 @@ typedef wxMacUPP wxMacNMUPP; class WXDLLIMPEXP_FWD_CORE wxMacToolTipTimer ; -class WXDLLEXPORT wxMacToolTip +class WXDLLIMPEXP_CORE wxMacToolTip { public : wxMacToolTip() ; @@ -331,7 +331,7 @@ enum { }; #endif -class WXDLLEXPORT wxMacControl : public wxObject +class WXDLLIMPEXP_CORE wxMacControl : public wxObject { public : wxMacControl( wxWindow* peer , bool isRootControl = false ); @@ -513,7 +513,7 @@ protected : // basing on DataBrowserItemIDs // -class WXDLLEXPORT wxMacDataBrowserControl : public wxMacControl +class WXDLLIMPEXP_CORE wxMacDataBrowserControl : public wxMacControl { public : wxMacDataBrowserControl( wxWindow* peer, const wxPoint& pos, const wxSize& size, long style); @@ -666,7 +666,7 @@ const DataBrowserPropertyID kMinColumnId = 1050; // base API for high-level databrowser operations -class WXDLLEXPORT wxMacListControl +class WXDLLIMPEXP_CORE wxMacListControl { public: virtual void MacDelete( unsigned int n ) = 0; @@ -696,7 +696,7 @@ enum DataItemType { DataItem_Text }; -class WXDLLEXPORT wxMacDataItem +class WXDLLIMPEXP_CORE wxMacDataItem { public : wxMacDataItem(); @@ -748,7 +748,7 @@ const wxMacDataItemPtr wxMacDataBrowserRootContainer = NULL; WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxMacDataItemPtr, wxArrayMacDataItemPtr, class WXDLLIMPEXP_CORE); -class WXDLLEXPORT wxMacDataItemBrowserControl : public wxMacDataBrowserControl, public wxMacListControl +class WXDLLIMPEXP_CORE wxMacDataItemBrowserControl : public wxMacDataBrowserControl, public wxMacListControl { public : wxMacDataItemBrowserControl( wxWindow* peer , const wxPoint& pos, const wxSize& size, long style); @@ -881,7 +881,7 @@ private : DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacDataItemBrowserControl) }; -class WXDLLEXPORT wxMacDataItemBrowserSelectionSuppressor +class WXDLLIMPEXP_CORE wxMacDataItemBrowserSelectionSuppressor { public : wxMacDataItemBrowserSelectionSuppressor(wxMacDataItemBrowserControl *browser); @@ -899,7 +899,7 @@ private : // exposed for reuse in wxCheckListBox -class WXDLLEXPORT wxMacListBoxItem : public wxMacDataItem +class WXDLLIMPEXP_CORE wxMacListBoxItem : public wxMacDataItem { public : wxMacListBoxItem(); @@ -911,7 +911,7 @@ public : DataBrowserItemDataRef itemData ) const; }; -class WXDLLEXPORT wxMacDataBrowserListControl : public wxMacDataItemBrowserControl +class WXDLLIMPEXP_CORE wxMacDataBrowserListControl : public wxMacDataItemBrowserControl { public: wxMacDataBrowserListControl( wxWindow *peer, const wxPoint& pos, const wxSize& size, long style ); @@ -944,7 +944,7 @@ CGColorSpaceRef WXDLLIMPEXP_CORE wxMacGetGenericRGBColorSpace(void); // toplevel.cpp -class WXDLLEXPORT wxMacDeferredWindowDeleter : public wxObject +class WXDLLIMPEXP_CORE wxMacDeferredWindowDeleter : public wxObject { public : wxMacDeferredWindowDeleter( WindowRef windowRef ); @@ -996,7 +996,7 @@ void wxMacGlobalToLocal( WindowRef window , Point*pt ); bool wxMacInitCocoa(); -class WXDLLEXPORT wxMacAutoreleasePool +class WXDLLIMPEXP_CORE wxMacAutoreleasePool { public : wxMacAutoreleasePool(); diff --git a/include/wx/mac/carbon/private/print.h b/include/wx/mac/carbon/private/print.h index 57581164ca..31d880033c 100644 --- a/include/wx/mac/carbon/private/print.h +++ b/include/wx/mac/carbon/private/print.h @@ -16,7 +16,7 @@ #include "wx/print.h" #include "wx/mac/private.h" -class WXDLLEXPORT wxMacCarbonPrintData : public wxPrintNativeDataBase +class WXDLLIMPEXP_CORE wxMacCarbonPrintData : public wxPrintNativeDataBase { public : wxMacCarbonPrintData() ; diff --git a/include/wx/mac/carbon/private/timer.h b/include/wx/mac/carbon/private/timer.h index 8d643fe2db..4a1d6d7265 100644 --- a/include/wx/mac/carbon/private/timer.h +++ b/include/wx/mac/carbon/private/timer.h @@ -16,7 +16,7 @@ struct MacTimerInfo; -class WXDLLEXPORT wxCarbonTimerImpl : public wxTimerImpl +class WXDLLIMPEXP_CORE wxCarbonTimerImpl : public wxTimerImpl { public: wxCarbonTimerImpl(wxTimer *timer); diff --git a/include/wx/mac/carbon/radiobox.h b/include/wx/mac/carbon/radiobox.h index c7e6e4bd0e..ac0747ff24 100644 --- a/include/wx/mac/carbon/radiobox.h +++ b/include/wx/mac/carbon/radiobox.h @@ -17,7 +17,7 @@ class WXDLLIMPEXP_FWD_CORE wxBitmap ; class WXDLLIMPEXP_FWD_CORE wxRadioButton ; -class WXDLLEXPORT wxRadioBox: public wxControl, public wxRadioBoxBase +class WXDLLIMPEXP_CORE wxRadioBox: public wxControl, public wxRadioBoxBase { DECLARE_DYNAMIC_CLASS(wxRadioBox) public: diff --git a/include/wx/mac/carbon/radiobut.h b/include/wx/mac/carbon/radiobut.h index e89c89ae37..6514d218e7 100644 --- a/include/wx/mac/carbon/radiobut.h +++ b/include/wx/mac/carbon/radiobut.h @@ -12,7 +12,7 @@ #ifndef _WX_RADIOBUT_H_ #define _WX_RADIOBUT_H_ -class WXDLLEXPORT wxRadioButton: public wxControl +class WXDLLIMPEXP_CORE wxRadioButton: public wxControl { DECLARE_DYNAMIC_CLASS(wxRadioButton) protected: @@ -56,9 +56,9 @@ public: #if 0 class WXDLLIMPEXP_FWD_CORE wxBitmap ; -WXDLLEXPORT_DATA(extern const wxChar) wxBitmapRadioButtonNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const wxChar) wxBitmapRadioButtonNameStr[]; -class WXDLLEXPORT wxBitmapRadioButton: public wxRadioButton +class WXDLLIMPEXP_CORE wxBitmapRadioButton: public wxRadioButton { DECLARE_DYNAMIC_CLASS(wxBitmapRadioButton) protected: diff --git a/include/wx/mac/carbon/region.h b/include/wx/mac/carbon/region.h index f04cdef8d9..480109a8ee 100644 --- a/include/wx/mac/carbon/region.h +++ b/include/wx/mac/carbon/region.h @@ -14,7 +14,7 @@ #include "wx/list.h" -class WXDLLEXPORT wxRegion : public wxRegionWithCombine +class WXDLLIMPEXP_CORE wxRegion : public wxRegionWithCombine { public: wxRegion(long x, long y, long w, long h); @@ -59,7 +59,7 @@ private: friend class WXDLLIMPEXP_FWD_CORE wxRegionIterator; }; -class WXDLLEXPORT wxRegionIterator : public wxObject +class WXDLLIMPEXP_CORE wxRegionIterator : public wxObject { public: wxRegionIterator(); diff --git a/include/wx/mac/carbon/scrolbar.h b/include/wx/mac/carbon/scrolbar.h index 80db4ce694..b699adafcb 100644 --- a/include/wx/mac/carbon/scrolbar.h +++ b/include/wx/mac/carbon/scrolbar.h @@ -13,7 +13,7 @@ #define _WX_SCROLBAR_H_ // Scrollbar item -class WXDLLEXPORT wxScrollBar : public wxScrollBarBase +class WXDLLIMPEXP_CORE wxScrollBar : public wxScrollBarBase { public: wxScrollBar() { m_pageSize = 0; m_viewSize = 0; m_objectSize = 0; } diff --git a/include/wx/mac/carbon/slider.h b/include/wx/mac/carbon/slider.h index 4cd1a1d78a..04dc08a6d0 100644 --- a/include/wx/mac/carbon/slider.h +++ b/include/wx/mac/carbon/slider.h @@ -16,10 +16,10 @@ #include "wx/slider.h" #include "wx/stattext.h" -WXDLLEXPORT_DATA(extern const char) wxSliderNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxSliderNameStr[]; // Slider -class WXDLLEXPORT wxSlider: public wxSliderBase +class WXDLLIMPEXP_CORE wxSlider: public wxSliderBase { DECLARE_DYNAMIC_CLASS(wxSlider) diff --git a/include/wx/mac/carbon/spinbutt.h b/include/wx/mac/carbon/spinbutt.h index 2dc329409e..f7cdb58006 100644 --- a/include/wx/mac/carbon/spinbutt.h +++ b/include/wx/mac/carbon/spinbutt.h @@ -25,7 +25,7 @@ wxSP_WRAP: value wraps at either end */ -class WXDLLEXPORT wxSpinButton : public wxSpinButtonBase +class WXDLLIMPEXP_CORE wxSpinButton : public wxSpinButtonBase { public: // construction diff --git a/include/wx/mac/carbon/spinctrl.h b/include/wx/mac/carbon/spinctrl.h index 5a77b2a9f7..38fd7a9bff 100644 --- a/include/wx/mac/carbon/spinctrl.h +++ b/include/wx/mac/carbon/spinctrl.h @@ -33,7 +33,7 @@ class WXDLLIMPEXP_FWD_CORE wxSpinCtrlButton; // wxSpinCtrl is a combination of wxTextCtrl and wxSpinButton // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxSpinCtrl : public wxControl +class WXDLLIMPEXP_CORE wxSpinCtrl : public wxControl { public: wxSpinCtrl() { Init(); } @@ -125,7 +125,7 @@ private: #include "wx/textctrl.h" -class WXDLLEXPORT wxSpinCtrl : public wxTextCtrl +class WXDLLIMPEXP_CORE wxSpinCtrl : public wxTextCtrl { public: wxSpinCtrl() { Init(); } diff --git a/include/wx/mac/carbon/srchctrl.h b/include/wx/mac/carbon/srchctrl.h index 94c34fd41a..eba88ccc43 100644 --- a/include/wx/mac/carbon/srchctrl.h +++ b/include/wx/mac/carbon/srchctrl.h @@ -15,7 +15,7 @@ class wxMacSearchFieldControl; -class WXDLLEXPORT wxSearchCtrl : public wxSearchCtrlBase +class WXDLLIMPEXP_CORE wxSearchCtrl : public wxSearchCtrlBase { public: // creation diff --git a/include/wx/mac/carbon/statbmp.h b/include/wx/mac/carbon/statbmp.h index 4841947522..17d38360f5 100644 --- a/include/wx/mac/carbon/statbmp.h +++ b/include/wx/mac/carbon/statbmp.h @@ -14,7 +14,7 @@ #include "wx/icon.h" -class WXDLLEXPORT wxStaticBitmap: public wxStaticBitmapBase +class WXDLLIMPEXP_CORE wxStaticBitmap: public wxStaticBitmapBase { DECLARE_DYNAMIC_CLASS(wxStaticBitmap) public: diff --git a/include/wx/mac/carbon/statbox.h b/include/wx/mac/carbon/statbox.h index 92b781ee5b..7c1c2204cf 100644 --- a/include/wx/mac/carbon/statbox.h +++ b/include/wx/mac/carbon/statbox.h @@ -14,10 +14,10 @@ #include "wx/control.h" -WXDLLEXPORT_DATA(extern const char) wxStaticBoxNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxStaticBoxNameStr[]; // Group box -class WXDLLEXPORT wxStaticBox: public wxControl +class WXDLLIMPEXP_CORE wxStaticBox: public wxControl { DECLARE_DYNAMIC_CLASS(wxStaticBox) diff --git a/include/wx/mac/carbon/statline.h b/include/wx/mac/carbon/statline.h index 53e95d1084..29de9f2a54 100644 --- a/include/wx/mac/carbon/statline.h +++ b/include/wx/mac/carbon/statline.h @@ -17,7 +17,7 @@ class wxStaticBox; // wxStaticLine // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxStaticLine : public wxStaticLineBase +class WXDLLIMPEXP_CORE wxStaticLine : public wxStaticLineBase { public: // constructors and pseudo-constructors diff --git a/include/wx/mac/carbon/stattext.h b/include/wx/mac/carbon/stattext.h index 2935319c47..fc69ab3457 100644 --- a/include/wx/mac/carbon/stattext.h +++ b/include/wx/mac/carbon/stattext.h @@ -12,7 +12,7 @@ #ifndef _WX_STATTEXT_H_ #define _WX_STATTEXT_H_ -class WXDLLEXPORT wxStaticText: public wxStaticTextBase +class WXDLLIMPEXP_CORE wxStaticText: public wxStaticTextBase { public: wxStaticText() { } diff --git a/include/wx/mac/carbon/statusbr.h b/include/wx/mac/carbon/statusbr.h index 1ff5901db2..81ee10257c 100644 --- a/include/wx/mac/carbon/statusbr.h +++ b/include/wx/mac/carbon/statusbr.h @@ -13,7 +13,7 @@ #ifndef _WX_STATBAR_H_ #define _WX_STATBAR_H_ -class WXDLLEXPORT wxStatusBarMac : public wxStatusBarGeneric +class WXDLLIMPEXP_CORE wxStatusBarMac : public wxStatusBarGeneric { DECLARE_DYNAMIC_CLASS(wxStatusBarMac) diff --git a/include/wx/mac/carbon/tabctrl.h b/include/wx/mac/carbon/tabctrl.h index 0be13cddd1..30cf54fbc1 100644 --- a/include/wx/mac/carbon/tabctrl.h +++ b/include/wx/mac/carbon/tabctrl.h @@ -25,7 +25,7 @@ class wxImageList; #define wxTAB_HITTEST_ONLABEL 4 #define wxTAB_HITTEST_ONITEM 6 -class WXDLLEXPORT wxTabCtrl: public wxControl +class WXDLLIMPEXP_CORE wxTabCtrl: public wxControl { DECLARE_DYNAMIC_CLASS(wxTabCtrl) public: @@ -117,7 +117,7 @@ protected: DECLARE_EVENT_TABLE() }; -class WXDLLEXPORT wxTabEvent : public wxNotifyEvent +class WXDLLIMPEXP_CORE wxTabEvent : public wxNotifyEvent { public: wxTabEvent(wxEventType commandType = wxEVT_NULL, int id = 0, diff --git a/include/wx/mac/carbon/textctrl.h b/include/wx/mac/carbon/textctrl.h index ad99369e1f..a2f5956328 100644 --- a/include/wx/mac/carbon/textctrl.h +++ b/include/wx/mac/carbon/textctrl.h @@ -29,7 +29,7 @@ class wxMacTextControl; -class WXDLLEXPORT wxTextCtrl: public wxTextCtrlBase +class WXDLLIMPEXP_CORE wxTextCtrl: public wxTextCtrlBase { DECLARE_DYNAMIC_CLASS(wxTextCtrl) diff --git a/include/wx/mac/carbon/tglbtn.h b/include/wx/mac/carbon/tglbtn.h index 37ff8bbe16..0091fbc8f0 100644 --- a/include/wx/mac/carbon/tglbtn.h +++ b/include/wx/mac/carbon/tglbtn.h @@ -13,10 +13,10 @@ #ifndef _WX_TOGGLEBUTTON_H_ #define _WX_TOGGLEBUTTON_H_ -WXDLLEXPORT_DATA(extern const char) wxCheckBoxNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxCheckBoxNameStr[]; -class WXDLLEXPORT wxBitmapToggleButton : public wxToggleButtonBase +class WXDLLIMPEXP_CORE wxBitmapToggleButton : public wxToggleButtonBase { public: wxBitmapToggleButton() {} @@ -60,7 +60,7 @@ private: }; -class WXDLLEXPORT wxToggleButton : public wxToggleButtonBase +class WXDLLIMPEXP_CORE wxToggleButton : public wxToggleButtonBase { public: wxToggleButton() {} diff --git a/include/wx/mac/carbon/toolbar.h b/include/wx/mac/carbon/toolbar.h index 95987b58a0..efe961cdff 100644 --- a/include/wx/mac/carbon/toolbar.h +++ b/include/wx/mac/carbon/toolbar.h @@ -17,9 +17,9 @@ #include "wx/tbarbase.h" #include "wx/dynarray.h" -WXDLLEXPORT_DATA(extern const char) wxToolBarNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxToolBarNameStr[]; -class WXDLLEXPORT wxToolBar: public wxToolBarBase +class WXDLLIMPEXP_CORE wxToolBar: public wxToolBarBase { DECLARE_DYNAMIC_CLASS(wxToolBar) public: diff --git a/include/wx/mac/carbon/toplevel.h b/include/wx/mac/carbon/toplevel.h index 1231f08f0e..d5e11e79ce 100644 --- a/include/wx/mac/carbon/toplevel.h +++ b/include/wx/mac/carbon/toplevel.h @@ -16,7 +16,7 @@ // wxTopLevelWindowMac // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxTopLevelWindowMac : public wxTopLevelWindowBase +class WXDLLIMPEXP_CORE wxTopLevelWindowMac : public wxTopLevelWindowBase { public: // constructors and such diff --git a/include/wx/mac/carbon/treectrl.h b/include/wx/mac/carbon/treectrl.h index 1e37d9f3d4..a8c92b288f 100644 --- a/include/wx/mac/carbon/treectrl.h +++ b/include/wx/mac/carbon/treectrl.h @@ -69,7 +69,7 @@ enum { }; #endif -class WXDLLEXPORT wxTreeItem: public wxObject +class WXDLLIMPEXP_CORE wxTreeItem: public wxObject { DECLARE_DYNAMIC_CLASS(wxTreeItem) @@ -109,7 +109,7 @@ public: inline void SetData(long data) { m_data = data; } }; -class WXDLLEXPORT wxTreeCtrl: public wxControl +class WXDLLIMPEXP_CORE wxTreeCtrl: public wxControl { public: /* @@ -252,7 +252,7 @@ protected: wxEVT_COMMAND_TREE_KEY_DOWN */ -class WXDLLEXPORT wxTreeEvent: public wxCommandEvent +class WXDLLIMPEXP_CORE wxTreeEvent: public wxCommandEvent { DECLARE_DYNAMIC_CLASS(wxTreeEvent) diff --git a/include/wx/mac/carbon/window.h b/include/wx/mac/carbon/window.h index 41622fe242..0092b70fc7 100644 --- a/include/wx/mac/carbon/window.h +++ b/include/wx/mac/carbon/window.h @@ -21,7 +21,7 @@ class WXDLLIMPEXP_FWD_CORE wxNonOwnedWindow; class WXDLLIMPEXP_FWD_CORE wxMacControl ; -class WXDLLEXPORT wxWindowMac: public wxWindowBase +class WXDLLIMPEXP_CORE wxWindowMac: public wxWindowBase { DECLARE_DYNAMIC_CLASS(wxWindowMac) diff --git a/include/wx/matrix.h b/include/wx/matrix.h index 465846e8d9..da6c5da78f 100644 --- a/include/wx/matrix.h +++ b/include/wx/matrix.h @@ -32,7 +32,7 @@ // at a certain coordinate and angle within another parent picture. // At all times m_isIdentity is set if the matrix itself is an Identity matrix. // It is used where possible to optimize calculations. -class WXDLLEXPORT wxTransformMatrix: public wxObject +class WXDLLIMPEXP_CORE wxTransformMatrix: public wxObject { public: wxTransformMatrix(void); diff --git a/include/wx/menu.h b/include/wx/menu.h index c222caa135..00fcd5995a 100644 --- a/include/wx/menu.h +++ b/include/wx/menu.h @@ -40,7 +40,7 @@ WX_DECLARE_EXPORTED_LIST(wxMenuItem, wxMenuItemList); // wxMenu // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMenuBase : public wxEvtHandler +class WXDLLIMPEXP_CORE wxMenuBase : public wxEvtHandler { public: // create a menu @@ -384,7 +384,7 @@ protected: // wxMenuBar // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMenuBarBase : public wxWindow +class WXDLLIMPEXP_CORE wxMenuBarBase : public wxWindow { public: // default ctor diff --git a/include/wx/menuitem.h b/include/wx/menuitem.h index f8cf44752a..677aa31467 100644 --- a/include/wx/menuitem.h +++ b/include/wx/menuitem.h @@ -35,7 +35,7 @@ class WXDLLIMPEXP_FWD_CORE wxMenu; // menu or a separator // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMenuItemBase : public wxObject +class WXDLLIMPEXP_CORE wxMenuItemBase : public wxObject { public: // creation diff --git a/include/wx/mgl/app.h b/include/wx/mgl/app.h index c6462d41a6..686137a5a2 100644 --- a/include/wx/mgl/app.h +++ b/include/wx/mgl/app.h @@ -26,7 +26,7 @@ class WXDLLIMPEXP_FWD_CORE wxEventLoop; // wxApp //----------------------------------------------------------------------------- -class WXDLLEXPORT wxApp: public wxAppBase +class WXDLLIMPEXP_CORE wxApp: public wxAppBase { public: wxApp(); diff --git a/include/wx/mgl/bitmap.h b/include/wx/mgl/bitmap.h index 0d14a1cc51..86bc9a8657 100644 --- a/include/wx/mgl/bitmap.h +++ b/include/wx/mgl/bitmap.h @@ -23,7 +23,7 @@ struct bitmap_t; // wxBitmap //----------------------------------------------------------------------------- -class WXDLLEXPORT wxBitmap: public wxBitmapBase +class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase { public: wxBitmap() {} diff --git a/include/wx/mgl/brush.h b/include/wx/mgl/brush.h index b48433e9d3..27d2d0a605 100644 --- a/include/wx/mgl/brush.h +++ b/include/wx/mgl/brush.h @@ -27,7 +27,7 @@ class WXDLLIMPEXP_FWD_CORE wxBrush; // wxBrush //----------------------------------------------------------------------------- -class WXDLLEXPORT wxBrush : public wxBrushBase +class WXDLLIMPEXP_CORE wxBrush : public wxBrushBase { public: wxBrush() {} diff --git a/include/wx/mgl/clipbrd.h b/include/wx/mgl/clipbrd.h index 307cc8de0b..4a7e56896e 100644 --- a/include/wx/mgl/clipbrd.h +++ b/include/wx/mgl/clipbrd.h @@ -22,7 +22,7 @@ // wxClipboard // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxClipboard : public wxClipboardBase +class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase { public: wxClipboard() {} diff --git a/include/wx/mgl/cursor.h b/include/wx/mgl/cursor.h index 7e2ebb3c51..31109db152 100644 --- a/include/wx/mgl/cursor.h +++ b/include/wx/mgl/cursor.h @@ -19,7 +19,7 @@ class MGLCursor; // wxCursor //----------------------------------------------------------------------------- -class WXDLLEXPORT wxCursor : public wxGDIObject +class WXDLLIMPEXP_CORE wxCursor : public wxGDIObject { public: diff --git a/include/wx/mgl/dc.h b/include/wx/mgl/dc.h index 05251f113c..39b183fa8a 100644 --- a/include/wx/mgl/dc.h +++ b/include/wx/mgl/dc.h @@ -45,7 +45,7 @@ class MGLDevCtx; class MGLRegion; struct font_t; -class WXDLLEXPORT wxDC : public wxDCBase +class WXDLLIMPEXP_CORE wxDC : public wxDCBase { DECLARE_DYNAMIC_CLASS(wxDC) diff --git a/include/wx/mgl/dcclient.h b/include/wx/mgl/dcclient.h index 0011f1ca72..6817219bff 100644 --- a/include/wx/mgl/dcclient.h +++ b/include/wx/mgl/dcclient.h @@ -25,7 +25,7 @@ class WXDLLIMPEXP_FWD_CORE wxWindowMGL; // wxWindowDC //----------------------------------------------------------------------------- -class WXDLLEXPORT wxWindowDC : public wxDC +class WXDLLIMPEXP_CORE wxWindowDC : public wxDC { public: wxWindowDC() {} @@ -44,7 +44,7 @@ private: // wxClientDC //----------------------------------------------------------------------------- -class WXDLLEXPORT wxClientDC : public wxWindowDC +class WXDLLIMPEXP_CORE wxClientDC : public wxWindowDC { public: wxClientDC() : wxWindowDC() {} @@ -58,7 +58,7 @@ private: // wxPaintDC //----------------------------------------------------------------------------- -class WXDLLEXPORT wxPaintDC : public wxClientDC +class WXDLLIMPEXP_CORE wxPaintDC : public wxClientDC { public: wxPaintDC() : wxClientDC() {} diff --git a/include/wx/mgl/dcmemory.h b/include/wx/mgl/dcmemory.h index 7bd0f9ce85..c02989c3ce 100644 --- a/include/wx/mgl/dcmemory.h +++ b/include/wx/mgl/dcmemory.h @@ -23,7 +23,7 @@ class WXDLLIMPEXP_FWD_CORE wxMemoryDC; // wxMemoryDC //----------------------------------------------------------------------------- -class WXDLLEXPORT wxMemoryDC : public wxDC, public wxMemoryDCBase +class WXDLLIMPEXP_CORE wxMemoryDC : public wxDC, public wxMemoryDCBase { public: wxMemoryDC() { Init(); } diff --git a/include/wx/mgl/dcscreen.h b/include/wx/mgl/dcscreen.h index a60a4f2cac..bfc9985a7c 100644 --- a/include/wx/mgl/dcscreen.h +++ b/include/wx/mgl/dcscreen.h @@ -22,7 +22,7 @@ class WXDLLIMPEXP_FWD_CORE wxScreenDC; // wxScreenDC //----------------------------------------------------------------------------- -class WXDLLEXPORT wxScreenDC: public wxDC +class WXDLLIMPEXP_CORE wxScreenDC: public wxDC { public: wxScreenDC(); diff --git a/include/wx/mgl/font.h b/include/wx/mgl/font.h index 7d9c9ba172..06f4002930 100644 --- a/include/wx/mgl/font.h +++ b/include/wx/mgl/font.h @@ -26,7 +26,7 @@ struct font_t; // wxFont // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFont : public wxFontBase +class WXDLLIMPEXP_CORE wxFont : public wxFontBase { public: // ctors and such diff --git a/include/wx/mgl/palette.h b/include/wx/mgl/palette.h index 72fb6178ca..31fde89c04 100644 --- a/include/wx/mgl/palette.h +++ b/include/wx/mgl/palette.h @@ -27,7 +27,7 @@ struct palette_t; // wxPalette //----------------------------------------------------------------------------- -class WXDLLEXPORT wxPalette : public wxPaletteBase +class WXDLLIMPEXP_CORE wxPalette : public wxPaletteBase { public: wxPalette(); diff --git a/include/wx/mgl/pen.h b/include/wx/mgl/pen.h index 0c1fcecfc9..3be08b3293 100644 --- a/include/wx/mgl/pen.h +++ b/include/wx/mgl/pen.h @@ -27,7 +27,7 @@ class WXDLLIMPEXP_FWD_CORE wxPen; // wxPen //----------------------------------------------------------------------------- -class WXDLLEXPORT wxPen : public wxPenBase +class WXDLLIMPEXP_CORE wxPen : public wxPenBase { public: wxPen() {} diff --git a/include/wx/mgl/popupwin.h b/include/wx/mgl/popupwin.h index 3f7e4d77be..8d52418747 100644 --- a/include/wx/mgl/popupwin.h +++ b/include/wx/mgl/popupwin.h @@ -15,7 +15,7 @@ // wxPopupWindow // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxPopupWindow : public wxPopupWindowBase +class WXDLLIMPEXP_CORE wxPopupWindow : public wxPopupWindowBase { public: wxPopupWindow() { } diff --git a/include/wx/mgl/region.h b/include/wx/mgl/region.h index 838ba5e118..472f33ebf5 100644 --- a/include/wx/mgl/region.h +++ b/include/wx/mgl/region.h @@ -15,7 +15,7 @@ class MGLRegion; -class WXDLLEXPORT wxRegion : public wxRegionBase +class WXDLLIMPEXP_CORE wxRegion : public wxRegionBase { public: wxRegion(); @@ -68,7 +68,7 @@ private: WX_DECLARE_EXPORTED_LIST(wxRect, wxRegionRectList); -class WXDLLEXPORT wxRegionIterator : public wxObject +class WXDLLIMPEXP_CORE wxRegionIterator : public wxObject { public: wxRegionIterator(void); diff --git a/include/wx/mgl/window.h b/include/wx/mgl/window.h index 738bc927fb..e47e113bfc 100644 --- a/include/wx/mgl/window.h +++ b/include/wx/mgl/window.h @@ -23,7 +23,7 @@ class MGLDevCtx; // wxWindow declaration for MGL // --------------------------------------------------------------------------- -class WXDLLEXPORT wxWindowMGL : public wxWindowBase +class WXDLLIMPEXP_CORE wxWindowMGL : public wxWindowBase { public: wxWindowMGL() { Init(); } diff --git a/include/wx/motif/accel.h b/include/wx/motif/accel.h index 7753ac9d68..5ae1a3a2fa 100644 --- a/include/wx/motif/accel.h +++ b/include/wx/motif/accel.h @@ -16,7 +16,7 @@ #include "wx/string.h" #include "wx/event.h" -class WXDLLEXPORT wxAcceleratorTable: public wxObject +class WXDLLIMPEXP_CORE wxAcceleratorTable: public wxObject { DECLARE_DYNAMIC_CLASS(wxAcceleratorTable) public: @@ -34,7 +34,7 @@ public: wxAcceleratorEntry* GetEntries() const; }; -WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable; +WXDLLIMPEXP_DATA_CORE(extern wxAcceleratorTable) wxNullAcceleratorTable; #endif // _WX_ACCEL_H_ diff --git a/include/wx/motif/app.h b/include/wx/motif/app.h index a1c2bdc964..eef7c9e054 100644 --- a/include/wx/motif/app.h +++ b/include/wx/motif/app.h @@ -38,7 +38,7 @@ class WXDLLIMPEXP_FWD_CORE wxPerDisplayData; WX_DECLARE_VOIDPTR_HASH_MAP( wxPerDisplayData*, wxPerDisplayDataMap ); -class WXDLLEXPORT wxApp : public wxAppBase +class WXDLLIMPEXP_CORE wxApp : public wxAppBase { DECLARE_DYNAMIC_CLASS(wxApp) diff --git a/include/wx/motif/bmpbuttn.h b/include/wx/motif/bmpbuttn.h index 68215c9537..d923c76870 100644 --- a/include/wx/motif/bmpbuttn.h +++ b/include/wx/motif/bmpbuttn.h @@ -16,7 +16,7 @@ #define wxDEFAULT_BUTTON_MARGIN 4 -class WXDLLEXPORT wxBitmapButton: public wxBitmapButtonBase +class WXDLLIMPEXP_CORE wxBitmapButton: public wxBitmapButtonBase { DECLARE_DYNAMIC_CLASS(wxBitmapButton) public: diff --git a/include/wx/motif/bmpmotif.h b/include/wx/motif/bmpmotif.h index 12f1316bca..2aa5178bfc 100644 --- a/include/wx/motif/bmpmotif.h +++ b/include/wx/motif/bmpmotif.h @@ -15,7 +15,7 @@ #include "wx/defs.h" #include "wx/bitmap.h" -class WXDLLEXPORT wxBitmapCache +class WXDLLIMPEXP_CORE wxBitmapCache { public: wxBitmapCache() diff --git a/include/wx/motif/button.h b/include/wx/motif/button.h index 58fa70b3c6..0ac026222d 100644 --- a/include/wx/motif/button.h +++ b/include/wx/motif/button.h @@ -13,7 +13,7 @@ #define _WX_BUTTON_H_ // Pushbutton -class WXDLLEXPORT wxButton: public wxButtonBase +class WXDLLIMPEXP_CORE wxButton: public wxButtonBase { public: wxButton() { } diff --git a/include/wx/motif/checkbox.h b/include/wx/motif/checkbox.h index 88af56a43f..8676ef2fdd 100644 --- a/include/wx/motif/checkbox.h +++ b/include/wx/motif/checkbox.h @@ -13,7 +13,7 @@ #define _WX_CHECKBOX_H_ // Checkbox item (single checkbox) -class WXDLLEXPORT wxCheckBox: public wxCheckBoxBase +class WXDLLIMPEXP_CORE wxCheckBox: public wxCheckBoxBase { DECLARE_DYNAMIC_CLASS(wxCheckBox) diff --git a/include/wx/motif/choice.h b/include/wx/motif/choice.h index 7532c50ba2..32fc35fda6 100644 --- a/include/wx/motif/choice.h +++ b/include/wx/motif/choice.h @@ -22,7 +22,7 @@ #endif // Choice item -class WXDLLEXPORT wxChoice: public wxChoiceBase +class WXDLLIMPEXP_CORE wxChoice: public wxChoiceBase { DECLARE_DYNAMIC_CLASS(wxChoice) diff --git a/include/wx/motif/clipbrd.h b/include/wx/motif/clipbrd.h index d0aa3db274..6c2a0f8747 100644 --- a/include/wx/motif/clipbrd.h +++ b/include/wx/motif/clipbrd.h @@ -22,16 +22,16 @@ struct wxDataIdToDataObject; WX_DECLARE_LIST(wxDataObject, wxDataObjectList); WX_DECLARE_LIST(wxDataIdToDataObject, wxDataIdToDataObjectList); -WXDLLEXPORT bool wxOpenClipboard(); -WXDLLEXPORT bool wxClipboardOpen(); -WXDLLEXPORT bool wxCloseClipboard(); -WXDLLEXPORT bool wxEmptyClipboard(); -WXDLLEXPORT bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat); -WXDLLEXPORT bool wxSetClipboardData(wxDataFormat dataFormat, wxObject *obj, int width = 0, int height = 0); -WXDLLEXPORT wxObject* wxGetClipboardData(wxDataFormat dataFormat, long *len = NULL); -WXDLLEXPORT wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat); -WXDLLEXPORT wxDataFormat wxRegisterClipboardFormat(char *formatName); -WXDLLEXPORT bool wxGetClipboardFormatName(wxDataFormat dataFormat, char *formatName, int maxCount); +WXDLLIMPEXP_CORE bool wxOpenClipboard(); +WXDLLIMPEXP_CORE bool wxClipboardOpen(); +WXDLLIMPEXP_CORE bool wxCloseClipboard(); +WXDLLIMPEXP_CORE bool wxEmptyClipboard(); +WXDLLIMPEXP_CORE bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat); +WXDLLIMPEXP_CORE bool wxSetClipboardData(wxDataFormat dataFormat, wxObject *obj, int width = 0, int height = 0); +WXDLLIMPEXP_CORE wxObject* wxGetClipboardData(wxDataFormat dataFormat, long *len = NULL); +WXDLLIMPEXP_CORE wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat); +WXDLLIMPEXP_CORE wxDataFormat wxRegisterClipboardFormat(char *formatName); +WXDLLIMPEXP_CORE bool wxGetClipboardFormatName(wxDataFormat dataFormat, char *formatName, int maxCount); //----------------------------------------------------------------------------- // wxClipboard diff --git a/include/wx/motif/colour.h b/include/wx/motif/colour.h index e7d12c14b2..01a825a2c6 100644 --- a/include/wx/motif/colour.h +++ b/include/wx/motif/colour.h @@ -16,7 +16,7 @@ #include "wx/string.h" // Colour -class WXDLLEXPORT wxColour : public wxColourBase +class WXDLLIMPEXP_CORE wxColour : public wxColourBase { DECLARE_DYNAMIC_CLASS(wxColour) public: diff --git a/include/wx/motif/combobox.h b/include/wx/motif/combobox.h index 8b3e8b9e45..63eb9018e4 100644 --- a/include/wx/motif/combobox.h +++ b/include/wx/motif/combobox.h @@ -16,7 +16,7 @@ #include "wx/textentry.h" // Combobox item -class WXDLLEXPORT wxComboBox : public wxChoice, +class WXDLLIMPEXP_CORE wxComboBox : public wxChoice, public wxTextEntry { public: diff --git a/include/wx/motif/control.h b/include/wx/motif/control.h index f42138701a..a212c38f56 100644 --- a/include/wx/motif/control.h +++ b/include/wx/motif/control.h @@ -17,7 +17,7 @@ #include "wx/validate.h" // General item class -class WXDLLEXPORT wxControl: public wxControlBase +class WXDLLIMPEXP_CORE wxControl: public wxControlBase { DECLARE_ABSTRACT_CLASS(wxControl) diff --git a/include/wx/motif/cursor.h b/include/wx/motif/cursor.h index ccb7837598..9372b60e2b 100644 --- a/include/wx/motif/cursor.h +++ b/include/wx/motif/cursor.h @@ -18,7 +18,7 @@ class WXDLLIMPEXP_FWD_CORE wxImage; // Cursor -class WXDLLEXPORT wxCursor : public wxGDIObject +class WXDLLIMPEXP_CORE wxCursor : public wxGDIObject { public: wxCursor(); @@ -57,7 +57,7 @@ private: DECLARE_DYNAMIC_CLASS(wxCursor) }; -extern WXDLLEXPORT void wxSetCursor(const wxCursor& cursor); +extern WXDLLIMPEXP_CORE void wxSetCursor(const wxCursor& cursor); #endif // _WX_CURSOR_H_ diff --git a/include/wx/motif/dc.h b/include/wx/motif/dc.h index d1065a2166..1163f9c1ad 100644 --- a/include/wx/motif/dc.h +++ b/include/wx/motif/dc.h @@ -18,7 +18,7 @@ // wxMotifDCImpl // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMotifDCImpl : public wxDCImpl +class WXDLLIMPEXP_CORE wxMotifDCImpl : public wxDCImpl { public: wxMotifDCImpl(wxDC *owner); diff --git a/include/wx/motif/dcclient.h b/include/wx/motif/dcclient.h index cdab848448..3e4899f265 100644 --- a/include/wx/motif/dcclient.h +++ b/include/wx/motif/dcclient.h @@ -20,7 +20,7 @@ class WXDLLIMPEXP_FWD_CORE wxWindow; // wxWindowDCImpl //----------------------------------------------------------------------------- -class WXDLLEXPORT wxWindowDCImpl : public wxMotifDCImpl +class WXDLLIMPEXP_CORE wxWindowDCImpl : public wxMotifDCImpl { public: wxWindowDCImpl(wxDC *owner); @@ -158,7 +158,7 @@ protected: DECLARE_DYNAMIC_CLASS(wxWindowDCImpl) }; -class WXDLLEXPORT wxPaintDCImpl: public wxWindowDCImpl +class WXDLLIMPEXP_CORE wxPaintDCImpl: public wxWindowDCImpl { public: wxPaintDCImpl(wxDC *owner) : wxWindowDCImpl(owner) { } @@ -169,7 +169,7 @@ public: DECLARE_DYNAMIC_CLASS(wxPaintDCImpl) }; -class WXDLLEXPORT wxClientDCImpl: public wxWindowDCImpl +class WXDLLIMPEXP_CORE wxClientDCImpl: public wxWindowDCImpl { public: wxClientDCImpl(wxDC *owner) : wxWindowDCImpl(owner) { } diff --git a/include/wx/motif/dcprint.h b/include/wx/motif/dcprint.h index 4980bf3938..ba338f3dcd 100644 --- a/include/wx/motif/dcprint.h +++ b/include/wx/motif/dcprint.h @@ -14,7 +14,7 @@ #include "wx/motif/dc.h" -class WXDLLEXPORT wxPrinterDC : public wxMotifDCImpl +class WXDLLIMPEXP_CORE wxPrinterDC : public wxMotifDCImpl { public: // Create a printer DC diff --git a/include/wx/motif/dcscreen.h b/include/wx/motif/dcscreen.h index 18cea883ac..58fe2381c6 100644 --- a/include/wx/motif/dcscreen.h +++ b/include/wx/motif/dcscreen.h @@ -14,7 +14,7 @@ #include "wx/motif/dcclient.h" -class WXDLLEXPORT wxScreenDCImpl : public wxWindowDCImpl +class WXDLLIMPEXP_CORE wxScreenDCImpl : public wxWindowDCImpl { public: // Create a DC representing the whole screen diff --git a/include/wx/motif/dialog.h b/include/wx/motif/dialog.h index 1e6821d5c1..a0a3247b9f 100644 --- a/include/wx/motif/dialog.h +++ b/include/wx/motif/dialog.h @@ -15,7 +15,7 @@ class WXDLLIMPEXP_FWD_CORE wxEventLoop; // Dialog boxes -class WXDLLEXPORT wxDialog : public wxDialogBase +class WXDLLIMPEXP_CORE wxDialog : public wxDialogBase { public: wxDialog(); diff --git a/include/wx/motif/dnd.h b/include/wx/motif/dnd.h index 3e28339d18..ba22792fbf 100644 --- a/include/wx/motif/dnd.h +++ b/include/wx/motif/dnd.h @@ -36,7 +36,7 @@ class WXDLLIMPEXP_FWD_CORE wxDropSource; // wxDropTarget //------------------------------------------------------------------------- -class WXDLLEXPORT wxDropTarget: public wxObject +class WXDLLIMPEXP_CORE wxDropTarget: public wxObject { public: @@ -59,7 +59,7 @@ public: // wxTextDropTarget //------------------------------------------------------------------------- -class WXDLLEXPORT wxTextDropTarget: public wxDropTarget +class WXDLLIMPEXP_CORE wxTextDropTarget: public wxDropTarget { public: @@ -77,7 +77,7 @@ protected: // wxPrivateDropTarget //------------------------------------------------------------------------- -class WXDLLEXPORT wxPrivateDropTarget: public wxDropTarget +class WXDLLIMPEXP_CORE wxPrivateDropTarget: public wxDropTarget { public: @@ -107,7 +107,7 @@ private: // A drop target which accepts files (dragged from File Manager or Explorer) // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFileDropTarget: public wxDropTarget +class WXDLLIMPEXP_CORE wxFileDropTarget: public wxDropTarget { public: @@ -136,7 +136,7 @@ enum wxDragResult wxDragCancel // the operation was cancelled by user (not an error) }; -class WXDLLEXPORT wxDropSource: public wxObject +class WXDLLIMPEXP_CORE wxDropSource: public wxObject { public: diff --git a/include/wx/motif/filedlg.h b/include/wx/motif/filedlg.h index 3b68253eb7..55c216e729 100644 --- a/include/wx/motif/filedlg.h +++ b/include/wx/motif/filedlg.h @@ -16,7 +16,7 @@ // wxFileDialog //------------------------------------------------------------------------- -class WXDLLEXPORT wxFileDialog: public wxFileDialogBase +class WXDLLIMPEXP_CORE wxFileDialog: public wxFileDialogBase { DECLARE_DYNAMIC_CLASS(wxFileDialog) public: diff --git a/include/wx/motif/frame.h b/include/wx/motif/frame.h index 7e52ecd467..9aa7129aa3 100644 --- a/include/wx/motif/frame.h +++ b/include/wx/motif/frame.h @@ -12,7 +12,7 @@ #ifndef _WX_MOTIF_FRAME_H_ #define _WX_MOTIF_FRAME_H_ -class WXDLLEXPORT wxFrame : public wxFrameBase +class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase { public: wxFrame() { Init(); } diff --git a/include/wx/motif/gauge.h b/include/wx/motif/gauge.h index a7ba4a6607..3183875824 100644 --- a/include/wx/motif/gauge.h +++ b/include/wx/motif/gauge.h @@ -13,7 +13,7 @@ #define _WX_GAUGE_H_ // Group box -class WXDLLEXPORT wxGauge : public wxGaugeBase +class WXDLLIMPEXP_CORE wxGauge : public wxGaugeBase { DECLARE_DYNAMIC_CLASS(wxGauge) diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h index 73a295d95d..e2aef577cb 100644 --- a/include/wx/motif/icon.h +++ b/include/wx/motif/icon.h @@ -15,7 +15,7 @@ #include "wx/bitmap.h" // Icon -class WXDLLEXPORT wxIcon : public wxBitmap +class WXDLLIMPEXP_CORE wxIcon : public wxBitmap { public: wxIcon(); diff --git a/include/wx/motif/listbox.h b/include/wx/motif/listbox.h index 9b90c9fcc6..6a7f3bb513 100644 --- a/include/wx/motif/listbox.h +++ b/include/wx/motif/listbox.h @@ -19,7 +19,7 @@ class WXDLLIMPEXP_FWD_BASE wxArrayInt; // List box item -class WXDLLEXPORT wxListBox: public wxListBoxBase +class WXDLLIMPEXP_CORE wxListBox: public wxListBoxBase { DECLARE_DYNAMIC_CLASS(wxListBox) diff --git a/include/wx/motif/mdi.h b/include/wx/motif/mdi.h index fb2621f5a3..8d8ab5f2ad 100644 --- a/include/wx/motif/mdi.h +++ b/include/wx/motif/mdi.h @@ -26,7 +26,7 @@ but wxMDIChildFrame::GetParent should return the parent frame. class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow; class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame; -class WXDLLEXPORT wxMDIParentFrame: public wxFrame +class WXDLLIMPEXP_CORE wxMDIParentFrame: public wxFrame { DECLARE_DYNAMIC_CLASS(wxMDIParentFrame) @@ -112,7 +112,7 @@ protected: DECLARE_EVENT_TABLE() }; -class WXDLLEXPORT wxMDIChildFrame: public wxFrame +class WXDLLIMPEXP_CORE wxMDIChildFrame: public wxFrame { DECLARE_DYNAMIC_CLASS(wxMDIChildFrame) @@ -205,7 +205,7 @@ protected: * of the children. Phew! So the children are sort of 'adopted'... */ -class WXDLLEXPORT wxMDIClientWindow: public wxNotebook +class WXDLLIMPEXP_CORE wxMDIClientWindow: public wxNotebook { DECLARE_DYNAMIC_CLASS(wxMDIClientWindow) diff --git a/include/wx/motif/minifram.h b/include/wx/motif/minifram.h index a649a04740..1ee9fcc9ec 100644 --- a/include/wx/motif/minifram.h +++ b/include/wx/motif/minifram.h @@ -16,7 +16,7 @@ #include "wx/frame.h" -class WXDLLEXPORT wxMiniFrame: public wxFrame { +class WXDLLIMPEXP_CORE wxMiniFrame: public wxFrame { DECLARE_DYNAMIC_CLASS(wxMiniFrame) diff --git a/include/wx/motif/msgdlg.h b/include/wx/motif/msgdlg.h index 08001bd7ab..814a071c1c 100644 --- a/include/wx/motif/msgdlg.h +++ b/include/wx/motif/msgdlg.h @@ -17,7 +17,7 @@ // Message box dialog // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMessageDialog : public wxMessageDialogBase +class WXDLLIMPEXP_CORE wxMessageDialog : public wxMessageDialogBase { public: wxMessageDialog(wxWindow *parent, diff --git a/include/wx/motif/print.h b/include/wx/motif/print.h index 9a6575ef81..6100b45098 100644 --- a/include/wx/motif/print.h +++ b/include/wx/motif/print.h @@ -18,7 +18,7 @@ * Represents the printer: manages printing a wxPrintout object */ -class WXDLLEXPORT wxPrinter: public wxPrinterBase +class WXDLLIMPEXP_CORE wxPrinter: public wxPrinterBase { DECLARE_DYNAMIC_CLASS(wxPrinter) @@ -36,7 +36,7 @@ public: * Programmer creates an object of this class to preview a wxPrintout. */ -class WXDLLEXPORT wxPrintPreview: public wxPrintPreviewBase +class WXDLLIMPEXP_CORE wxPrintPreview: public wxPrintPreviewBase { DECLARE_CLASS(wxPrintPreview) diff --git a/include/wx/motif/private/timer.h b/include/wx/motif/private/timer.h index b717a32402..cd615d79db 100644 --- a/include/wx/motif/private/timer.h +++ b/include/wx/motif/private/timer.h @@ -13,7 +13,7 @@ #include "wx/private/timer.h" -class WXDLLEXPORT wxMotifTimerImpl : public wxTimerImpl +class WXDLLIMPEXP_CORE wxMotifTimerImpl : public wxTimerImpl { public: wxMotifTimerImpl(wxTimer* timer) : wxTimerImpl(timer) { m_id = 0; } diff --git a/include/wx/motif/radiobox.h b/include/wx/motif/radiobox.h index 701d7729de..7217192aba 100644 --- a/include/wx/motif/radiobox.h +++ b/include/wx/motif/radiobox.h @@ -21,7 +21,7 @@ #include "wx/arrstr.h" -class WXDLLEXPORT wxRadioBox : public wxControl, public wxRadioBoxBase +class WXDLLIMPEXP_CORE wxRadioBox : public wxControl, public wxRadioBoxBase { public: wxRadioBox() { Init(); } diff --git a/include/wx/motif/radiobut.h b/include/wx/motif/radiobut.h index fa2f449e62..71b5b72b5a 100644 --- a/include/wx/motif/radiobut.h +++ b/include/wx/motif/radiobut.h @@ -12,7 +12,7 @@ #ifndef _WX_RADIOBUT_H_ #define _WX_RADIOBUT_H_ -class WXDLLEXPORT wxRadioButton: public wxControl +class WXDLLIMPEXP_CORE wxRadioButton: public wxControl { DECLARE_DYNAMIC_CLASS(wxRadioButton) public: diff --git a/include/wx/motif/scrolbar.h b/include/wx/motif/scrolbar.h index cee6f8abb3..15591caedc 100644 --- a/include/wx/motif/scrolbar.h +++ b/include/wx/motif/scrolbar.h @@ -13,7 +13,7 @@ #define _WX_SCROLBAR_H_ // Scrollbar item -class WXDLLEXPORT wxScrollBar: public wxScrollBarBase +class WXDLLIMPEXP_CORE wxScrollBar: public wxScrollBarBase { DECLARE_DYNAMIC_CLASS(wxScrollBar) diff --git a/include/wx/motif/slider.h b/include/wx/motif/slider.h index adb6201cad..50cab8140a 100644 --- a/include/wx/motif/slider.h +++ b/include/wx/motif/slider.h @@ -15,7 +15,7 @@ #include "wx/control.h" // Slider -class WXDLLEXPORT wxSlider: public wxSliderBase +class WXDLLIMPEXP_CORE wxSlider: public wxSliderBase { DECLARE_DYNAMIC_CLASS(wxSlider) diff --git a/include/wx/motif/spinbutt.h b/include/wx/motif/spinbutt.h index 71ce033ee7..cd3e0c46ce 100644 --- a/include/wx/motif/spinbutt.h +++ b/include/wx/motif/spinbutt.h @@ -14,7 +14,7 @@ class WXDLLIMPEXP_FWD_CORE wxArrowButton; // internal -class WXDLLEXPORT wxSpinButton : public wxSpinButtonBase +class WXDLLIMPEXP_CORE wxSpinButton : public wxSpinButtonBase { DECLARE_DYNAMIC_CLASS(wxSpinButton) diff --git a/include/wx/motif/statbmp.h b/include/wx/motif/statbmp.h index fe481c5f88..11d8fbb9b7 100644 --- a/include/wx/motif/statbmp.h +++ b/include/wx/motif/statbmp.h @@ -15,7 +15,7 @@ #include "wx/motif/bmpmotif.h" #include "wx/icon.h" -class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase +class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase { DECLARE_DYNAMIC_CLASS(wxStaticBitmap) diff --git a/include/wx/motif/statbox.h b/include/wx/motif/statbox.h index 62c3d2ad8e..cddbe301e1 100644 --- a/include/wx/motif/statbox.h +++ b/include/wx/motif/statbox.h @@ -13,7 +13,7 @@ #define _WX_STATBOX_H_ // Group box -class WXDLLEXPORT wxStaticBox: public wxStaticBoxBase +class WXDLLIMPEXP_CORE wxStaticBox: public wxStaticBoxBase { DECLARE_DYNAMIC_CLASS(wxStaticBox) diff --git a/include/wx/motif/stattext.h b/include/wx/motif/stattext.h index d330e78ca3..cd9893ebfa 100644 --- a/include/wx/motif/stattext.h +++ b/include/wx/motif/stattext.h @@ -12,7 +12,7 @@ #ifndef _WX_STATTEXT_H_ #define _WX_STATTEXT_H_ -class WXDLLEXPORT wxStaticText: public wxStaticTextBase +class WXDLLIMPEXP_CORE wxStaticText: public wxStaticTextBase { DECLARE_DYNAMIC_CLASS(wxStaticText) diff --git a/include/wx/motif/textctrl.h b/include/wx/motif/textctrl.h index 2eed64a576..e391854724 100644 --- a/include/wx/motif/textctrl.h +++ b/include/wx/motif/textctrl.h @@ -13,7 +13,7 @@ #define _WX_TEXTCTRL_H_ // Single-line text item -class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase +class WXDLLIMPEXP_CORE wxTextCtrl : public wxTextCtrlBase { public: // creation diff --git a/include/wx/motif/tglbtn.h b/include/wx/motif/tglbtn.h index 0fd827b953..b35aa1b5ce 100644 --- a/include/wx/motif/tglbtn.h +++ b/include/wx/motif/tglbtn.h @@ -15,7 +15,7 @@ #include "wx/checkbox.h" -class WXDLLEXPORT wxToggleButton : public wxCheckBox +class WXDLLIMPEXP_CORE wxToggleButton : public wxCheckBox { public: wxToggleButton() { Init(); } diff --git a/include/wx/motif/toolbar.h b/include/wx/motif/toolbar.h index c577b02a8f..6407334fce 100644 --- a/include/wx/motif/toolbar.h +++ b/include/wx/motif/toolbar.h @@ -12,7 +12,7 @@ #ifndef _WX_TOOLBAR_H_ #define _WX_TOOLBAR_H_ -class WXDLLEXPORT wxToolBar : public wxToolBarBase +class WXDLLIMPEXP_CORE wxToolBar : public wxToolBarBase { public: // ctors and dtor diff --git a/include/wx/motif/window.h b/include/wx/motif/window.h index c5a294f3c3..a5bc5383bc 100644 --- a/include/wx/motif/window.h +++ b/include/wx/motif/window.h @@ -319,7 +319,7 @@ private: // from scope. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxNoOptimize +class WXDLLIMPEXP_CORE wxNoOptimize { public: wxNoOptimize() { ms_count++; } diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h index 60493ecb7c..b2701d28f7 100644 --- a/include/wx/msgdlg.h +++ b/include/wx/msgdlg.h @@ -18,9 +18,9 @@ #include "wx/dialog.h" -WXDLLEXPORT_DATA(extern const char) wxMessageBoxCaptionStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxMessageBoxCaptionStr[]; -class WXDLLEXPORT wxMessageDialogBase : public wxDialog +class WXDLLIMPEXP_CORE wxMessageDialogBase : public wxDialog { public: // ctors @@ -135,7 +135,7 @@ protected: // wxMessageBox: the simplest way to use wxMessageDialog // ---------------------------------------------------------------------------- -int WXDLLEXPORT wxMessageBox(const wxString& message, +int WXDLLIMPEXP_CORE wxMessageBox(const wxString& message, const wxString& caption = wxMessageBoxCaptionStr, long style = wxOK | wxCENTRE, wxWindow *parent = NULL, diff --git a/include/wx/msw/accel.h b/include/wx/msw/accel.h index 277290a4cb..6a64252a6f 100644 --- a/include/wx/msw/accel.h +++ b/include/wx/msw/accel.h @@ -18,7 +18,7 @@ class WXDLLIMPEXP_FWD_CORE wxWindow; // the accel table has all accelerators for a given window or menu // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxAcceleratorTable : public wxObject +class WXDLLIMPEXP_CORE wxAcceleratorTable : public wxObject { public: // default ctor diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h index c9703b11d8..0295db6ce4 100644 --- a/include/wx/msw/app.h +++ b/include/wx/msw/app.h @@ -23,7 +23,7 @@ class WXDLLIMPEXP_FWD_BASE wxLog; // Represents the application. Derive OnInit and declare // a new App object to start application -class WXDLLEXPORT wxApp : public wxAppBase +class WXDLLIMPEXP_CORE wxApp : public wxAppBase { DECLARE_DYNAMIC_CLASS(wxApp) @@ -122,17 +122,17 @@ inline int wxApp::GetShell32Version() // wxMSW-only overloads of wxEntry() and wxEntryStart() which take the // parameters passed to WinMain() instead of those passed to main() -extern bool WXDLLEXPORT -wxEntryStart(HINSTANCE hInstance, - HINSTANCE hPrevInstance = NULL, - wxCmdLineArgType pCmdLine = NULL, - int nCmdShow = SW_SHOWNORMAL); - -extern int WXDLLEXPORT -wxEntry(HINSTANCE hInstance, - HINSTANCE hPrevInstance = NULL, - wxCmdLineArgType pCmdLine = NULL, - int nCmdShow = SW_SHOWNORMAL); +extern WXDLLIMPEXP_CORE bool + wxEntryStart(HINSTANCE hInstance, + HINSTANCE hPrevInstance = NULL, + wxCmdLineArgType pCmdLine = NULL, + int nCmdShow = SW_SHOWNORMAL); + +extern WXDLLIMPEXP_CORE int + wxEntry(HINSTANCE hInstance, + HINSTANCE hPrevInstance = NULL, + wxCmdLineArgType pCmdLine = NULL, + int nCmdShow = SW_SHOWNORMAL); #define IMPLEMENT_WXWIN_MAIN \ extern "C" int WINAPI WinMain(HINSTANCE hInstance, \ diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h index 7525ca1b3f..b049b0b0e6 100644 --- a/include/wx/msw/bitmap.h +++ b/include/wx/msw/bitmap.h @@ -44,7 +44,7 @@ enum wxBitmapTransparency // NOTE: for wxMSW we don't use the wxBitmapBase base class declared in bitmap.h! // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxBitmap : public wxGDIImage +class WXDLLIMPEXP_CORE wxBitmap : public wxGDIImage { public: // default ctor creates an invalid bitmap, you must Create() it later @@ -207,7 +207,7 @@ private: // wxMask: a mono bitmap used for drawing bitmaps transparently. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMask : public wxObject +class WXDLLIMPEXP_CORE wxMask : public wxObject { public: wxMask(); @@ -251,7 +251,7 @@ protected: // NOTE: for wxMSW we don't use the wxBitmapHandler class declared in bitmap.h! // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxBitmapHandler : public wxGDIImageHandler +class WXDLLIMPEXP_CORE wxBitmapHandler : public wxGDIImageHandler { public: wxBitmapHandler() { } diff --git a/include/wx/msw/bmpbuttn.h b/include/wx/msw/bmpbuttn.h index 08ef3da8a7..5d3cab5ce7 100644 --- a/include/wx/msw/bmpbuttn.h +++ b/include/wx/msw/bmpbuttn.h @@ -16,7 +16,7 @@ #include "wx/bitmap.h" #include "wx/brush.h" -class WXDLLEXPORT wxBitmapButton : public wxBitmapButtonBase +class WXDLLIMPEXP_CORE wxBitmapButton : public wxBitmapButtonBase { public: wxBitmapButton() { Init(); } diff --git a/include/wx/msw/brush.h b/include/wx/msw/brush.h index 646372e9c0..945b13c80a 100644 --- a/include/wx/msw/brush.h +++ b/include/wx/msw/brush.h @@ -20,7 +20,7 @@ class WXDLLIMPEXP_FWD_CORE wxBitmap; // wxBrush // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxBrush : public wxBrushBase +class WXDLLIMPEXP_CORE wxBrush : public wxBrushBase { public: wxBrush(); diff --git a/include/wx/msw/button.h b/include/wx/msw/button.h index f7c34eae62..1ee21c4d1e 100644 --- a/include/wx/msw/button.h +++ b/include/wx/msw/button.h @@ -16,7 +16,7 @@ // Pushbutton // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxButton : public wxButtonBase +class WXDLLIMPEXP_CORE wxButton : public wxButtonBase { public: wxButton() { } diff --git a/include/wx/msw/caret.h b/include/wx/msw/caret.h index 47b8c8a700..4a6d28ce83 100644 --- a/include/wx/msw/caret.h +++ b/include/wx/msw/caret.h @@ -12,7 +12,7 @@ #ifndef _WX_CARET_H_ #define _WX_CARET_H_ -class WXDLLEXPORT wxCaret : public wxCaretBase +class WXDLLIMPEXP_CORE wxCaret : public wxCaretBase { public: wxCaret() { Init(); } diff --git a/include/wx/msw/checkbox.h b/include/wx/msw/checkbox.h index c1b17cd5cf..dfdcf42718 100644 --- a/include/wx/msw/checkbox.h +++ b/include/wx/msw/checkbox.h @@ -13,7 +13,7 @@ #define _WX_CHECKBOX_H_ // Checkbox item (single checkbox) -class WXDLLEXPORT wxCheckBox : public wxCheckBoxBase +class WXDLLIMPEXP_CORE wxCheckBox : public wxCheckBoxBase { public: wxCheckBox() { } diff --git a/include/wx/msw/checklst.h b/include/wx/msw/checklst.h index a632216403..25f75d3c81 100644 --- a/include/wx/msw/checklst.h +++ b/include/wx/msw/checklst.h @@ -19,7 +19,7 @@ class WXDLLIMPEXP_FWD_CORE wxOwnerDrawn; class WXDLLIMPEXP_FWD_CORE wxCheckListBoxItem; // fwd decl, defined in checklst.cpp -class WXDLLEXPORT wxCheckListBox : public wxCheckListBoxBase +class WXDLLIMPEXP_CORE wxCheckListBox : public wxCheckListBoxBase { public: // ctors diff --git a/include/wx/msw/choice.h b/include/wx/msw/choice.h index 8be304b782..4f28ec07c2 100644 --- a/include/wx/msw/choice.h +++ b/include/wx/msw/choice.h @@ -16,7 +16,7 @@ // Choice item // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxChoice : public wxChoiceBase +class WXDLLIMPEXP_CORE wxChoice : public wxChoiceBase { public: // ctors diff --git a/include/wx/msw/clipbrd.h b/include/wx/msw/clipbrd.h index ee04acf8f7..7a771e75bb 100644 --- a/include/wx/msw/clipbrd.h +++ b/include/wx/msw/clipbrd.h @@ -22,24 +22,24 @@ // implement wxClipboard, and for compatibility. // open/close the clipboard -WXDLLEXPORT bool wxOpenClipboard(); -WXDLLEXPORT bool wxIsClipboardOpened(); +WXDLLIMPEXP_CORE bool wxOpenClipboard(); +WXDLLIMPEXP_CORE bool wxIsClipboardOpened(); #define wxClipboardOpen wxIsClipboardOpened -WXDLLEXPORT bool wxCloseClipboard(); +WXDLLIMPEXP_CORE bool wxCloseClipboard(); // get/set data -WXDLLEXPORT bool wxEmptyClipboard(); -WXDLLEXPORT bool wxSetClipboardData(wxDataFormat dataFormat, +WXDLLIMPEXP_CORE bool wxEmptyClipboard(); +WXDLLIMPEXP_CORE bool wxSetClipboardData(wxDataFormat dataFormat, const void *data, int width = 0, int height = 0); -WXDLLEXPORT void* wxGetClipboardData(wxDataFormat dataFormat, +WXDLLIMPEXP_CORE void* wxGetClipboardData(wxDataFormat dataFormat, long *len = NULL); // clipboard formats -WXDLLEXPORT bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat); -WXDLLEXPORT wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat); -WXDLLEXPORT int wxRegisterClipboardFormat(wxChar *formatName); -WXDLLEXPORT bool wxGetClipboardFormatName(wxDataFormat dataFormat, +WXDLLIMPEXP_CORE bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat); +WXDLLIMPEXP_CORE wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat); +WXDLLIMPEXP_CORE int wxRegisterClipboardFormat(wxChar *formatName); +WXDLLIMPEXP_CORE bool wxGetClipboardFormatName(wxDataFormat dataFormat, wxChar *formatName, int maxCount); @@ -48,7 +48,7 @@ WXDLLEXPORT bool wxGetClipboardFormatName(wxDataFormat dataFormat, //----------------------------------------------------------------------------- class WXDLLIMPEXP_FWD_CORE wxDataObject; -class WXDLLEXPORT wxClipboard : public wxClipboardBase +class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase { DECLARE_DYNAMIC_CLASS(wxClipboard) diff --git a/include/wx/msw/colordlg.h b/include/wx/msw/colordlg.h index 36cd745f97..91ac90090d 100644 --- a/include/wx/msw/colordlg.h +++ b/include/wx/msw/colordlg.h @@ -20,7 +20,7 @@ // wxColourDialog: dialog for choosing a colours // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxColourDialog : public wxDialog +class WXDLLIMPEXP_CORE wxColourDialog : public wxDialog { public: wxColourDialog() { Init(); } diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h index 7f25bc88f4..223e1e0d98 100644 --- a/include/wx/msw/colour.h +++ b/include/wx/msw/colour.h @@ -18,7 +18,7 @@ // Colour // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxColour : public wxColourBase +class WXDLLIMPEXP_CORE wxColour : public wxColourBase { public: // constructors diff --git a/include/wx/msw/combo.h b/include/wx/msw/combo.h index 1f99eaa935..cc9b35d53e 100644 --- a/include/wx/msw/combo.h +++ b/include/wx/msw/combo.h @@ -35,7 +35,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxComboBoxNameStr[]; -class WXDLLEXPORT wxComboCtrl : public wxComboCtrlBase +class WXDLLIMPEXP_CORE wxComboCtrl : public wxComboCtrlBase { public: // ctors and such diff --git a/include/wx/msw/combobox.h b/include/wx/msw/combobox.h index 2b888f9207..0cebad256d 100644 --- a/include/wx/msw/combobox.h +++ b/include/wx/msw/combobox.h @@ -21,7 +21,7 @@ // Combobox control // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxComboBox : public wxChoice, +class WXDLLIMPEXP_CORE wxComboBox : public wxChoice, public wxTextEntry { public: diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h index a2e56f7159..20d9c73d5b 100644 --- a/include/wx/msw/control.h +++ b/include/wx/msw/control.h @@ -15,7 +15,7 @@ #include "wx/dynarray.h" // General item class -class WXDLLEXPORT wxControl : public wxControlBase +class WXDLLIMPEXP_CORE wxControl : public wxControlBase { public: wxControl() { } diff --git a/include/wx/msw/ctrlsub.h b/include/wx/msw/ctrlsub.h index d197bb1b01..00c45349e7 100644 --- a/include/wx/msw/ctrlsub.h +++ b/include/wx/msw/ctrlsub.h @@ -15,7 +15,7 @@ // wxControlWithItems // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxControlWithItems : public wxControlWithItemsBase +class WXDLLIMPEXP_CORE wxControlWithItems : public wxControlWithItemsBase { public: wxControlWithItems() { } diff --git a/include/wx/msw/cursor.h b/include/wx/msw/cursor.h index f8025338a4..2249736838 100644 --- a/include/wx/msw/cursor.h +++ b/include/wx/msw/cursor.h @@ -17,7 +17,7 @@ class WXDLLIMPEXP_FWD_CORE wxImage; // Cursor -class WXDLLEXPORT wxCursor : public wxGDIImage +class WXDLLIMPEXP_CORE wxCursor : public wxGDIImage { public: // constructors diff --git a/include/wx/msw/dc.h b/include/wx/msw/dc.h index bd0fdb87af..b031941f5e 100644 --- a/include/wx/msw/dc.h +++ b/include/wx/msw/dc.h @@ -43,7 +43,7 @@ public: // this is an ABC: use one of the derived classes to create a DC associated // with a window, screen, printer and so on -class WXDLLEXPORT wxMSWDCImpl: public wxDCImpl +class WXDLLIMPEXP_CORE wxMSWDCImpl: public wxDCImpl { public: wxMSWDCImpl(wxDC *owner, WXHDC hDC); @@ -319,7 +319,7 @@ protected: // only/mainly) // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxDCTempImpl : public wxMSWDCImpl +class WXDLLIMPEXP_CORE wxDCTempImpl : public wxMSWDCImpl { public: // construct a temporary DC with the specified HDC and size (it should be @@ -355,7 +355,7 @@ private: DECLARE_NO_COPY_CLASS(wxDCTempImpl) }; -class WXDLLEXPORT wxDCTemp : public wxDC +class WXDLLIMPEXP_CORE wxDCTemp : public wxDC { public: wxDCTemp(WXHDC hdc, const wxSize& size = wxDefaultSize) diff --git a/include/wx/msw/dcclient.h b/include/wx/msw/dcclient.h index 4de0cc398d..eed5e21e59 100644 --- a/include/wx/msw/dcclient.h +++ b/include/wx/msw/dcclient.h @@ -34,7 +34,7 @@ WX_DECLARE_EXPORTED_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo); // DC classes // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxWindowDCImpl : public wxMSWDCImpl +class WXDLLIMPEXP_CORE wxWindowDCImpl : public wxMSWDCImpl { public: // default ctor @@ -53,7 +53,7 @@ protected: DECLARE_NO_COPY_CLASS(wxWindowDCImpl) }; -class WXDLLEXPORT wxClientDCImpl : public wxWindowDCImpl +class WXDLLIMPEXP_CORE wxClientDCImpl : public wxWindowDCImpl { public: // default ctor @@ -73,7 +73,7 @@ protected: DECLARE_NO_COPY_CLASS(wxClientDCImpl) }; -class WXDLLEXPORT wxPaintDCImpl : public wxClientDCImpl +class WXDLLIMPEXP_CORE wxPaintDCImpl : public wxClientDCImpl { public: wxPaintDCImpl( wxDC *owner ); @@ -102,7 +102,7 @@ protected: * message. It is used in HandlePaint and need not be used by an application. */ -class WXDLLEXPORT wxPaintDCEx : public wxPaintDC +class WXDLLIMPEXP_CORE wxPaintDCEx : public wxPaintDC { public: wxPaintDCEx(wxWindow *canvas, WXHDC dc); diff --git a/include/wx/msw/dcmemory.h b/include/wx/msw/dcmemory.h index 26471f7763..5b78fead33 100644 --- a/include/wx/msw/dcmemory.h +++ b/include/wx/msw/dcmemory.h @@ -15,7 +15,7 @@ #include "wx/dcmemory.h" #include "wx/msw/dc.h" -class WXDLLEXPORT wxMemoryDCImpl: public wxMSWDCImpl +class WXDLLIMPEXP_CORE wxMemoryDCImpl: public wxMSWDCImpl { public: wxMemoryDCImpl( wxMemoryDC *owner ); diff --git a/include/wx/msw/dcprint.h b/include/wx/msw/dcprint.h index 477b38bd62..2c7f7d42d5 100644 --- a/include/wx/msw/dcprint.h +++ b/include/wx/msw/dcprint.h @@ -22,7 +22,7 @@ // wxPrinterDCImpl // -class WXDLLEXPORT wxPrinterDCImpl : public wxMSWDCImpl +class WXDLLIMPEXP_CORE wxPrinterDCImpl : public wxMSWDCImpl { public: // Create from print data @@ -61,13 +61,13 @@ private: }; // Gets an HDC for the specified printer configuration -WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& data); +WXHDC WXDLLIMPEXP_CORE wxGetPrinterDC(const wxPrintData& data); // ------------------------------------------------------------------------ // wxPrinterDCromHDC // -class WXDLLEXPORT wxPrinterDCFromHDC: public wxPrinterDC +class WXDLLIMPEXP_CORE wxPrinterDCFromHDC: public wxPrinterDC { public: wxPrinterDCFromHDC( WXHDC theDC ) diff --git a/include/wx/msw/dcscreen.h b/include/wx/msw/dcscreen.h index f60bffa3d8..8635b18afd 100644 --- a/include/wx/msw/dcscreen.h +++ b/include/wx/msw/dcscreen.h @@ -15,7 +15,7 @@ #include "wx/dcscreen.h" #include "wx/msw/dc.h" -class WXDLLEXPORT wxScreenDCImpl : public wxMSWDCImpl +class WXDLLIMPEXP_CORE wxScreenDCImpl : public wxMSWDCImpl { public: // Create a DC representing the whole screen diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h index b228a6b477..e29a5e045f 100644 --- a/include/wx/msw/dialog.h +++ b/include/wx/msw/dialog.h @@ -14,17 +14,17 @@ #include "wx/panel.h" -extern WXDLLEXPORT_DATA(const char) wxDialogNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxDialogNameStr[]; class WXDLLIMPEXP_FWD_CORE wxDialogModalData; #if wxUSE_TOOLBAR && (defined(__SMARTPHONE__) || defined(__POCKETPC__)) class WXDLLIMPEXP_FWD_CORE wxToolBar; -extern WXDLLEXPORT_DATA(const char) wxToolBarNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxToolBarNameStr[]; #endif // Dialog boxes -class WXDLLEXPORT wxDialog : public wxDialogBase +class WXDLLIMPEXP_CORE wxDialog : public wxDialogBase { public: wxDialog() { Init(); } diff --git a/include/wx/msw/dib.h b/include/wx/msw/dib.h index 9b0751296f..73bf5265a9 100644 --- a/include/wx/msw/dib.h +++ b/include/wx/msw/dib.h @@ -23,7 +23,7 @@ class WXDLLIMPEXP_FWD_CORE wxPalette; // wxDIB: represents a DIB section // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxDIB +class WXDLLIMPEXP_CORE wxDIB { public: // ctors and such diff --git a/include/wx/msw/dirdlg.h b/include/wx/msw/dirdlg.h index 23e416fe2e..9c6be1fef5 100644 --- a/include/wx/msw/dirdlg.h +++ b/include/wx/msw/dirdlg.h @@ -12,7 +12,7 @@ #ifndef _WX_DIRDLG_H_ #define _WX_DIRDLG_H_ -class WXDLLEXPORT wxDirDialog : public wxDirDialogBase +class WXDLLIMPEXP_CORE wxDirDialog : public wxDirDialogBase { public: wxDirDialog(wxWindow *parent, diff --git a/include/wx/msw/dragimag.h b/include/wx/msw/dragimag.h index 060900101e..fbe7b402f1 100644 --- a/include/wx/msw/dragimag.h +++ b/include/wx/msw/dragimag.h @@ -99,7 +99,7 @@ * wxDragImage */ -class WXDLLEXPORT wxDragImage: public wxObject +class WXDLLIMPEXP_CORE wxDragImage: public wxObject { public: diff --git a/include/wx/msw/enhmeta.h b/include/wx/msw/enhmeta.h index 264cccb188..e828b29358 100644 --- a/include/wx/msw/enhmeta.h +++ b/include/wx/msw/enhmeta.h @@ -23,7 +23,7 @@ // wxEnhMetaFile: encapsulation of Win32 HENHMETAFILE // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxEnhMetaFile : public wxGDIObject +class WXDLLIMPEXP_CORE wxEnhMetaFile : public wxGDIObject { public: wxEnhMetaFile(const wxString& file = wxEmptyString) : m_filename(file) @@ -78,7 +78,7 @@ private: // wxEnhMetaFileDC: allows to create a wxEnhMetaFile // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxEnhMetaFileDC : public wxDC +class WXDLLIMPEXP_CORE wxEnhMetaFileDC : public wxDC { public: // the ctor parameters specify the filename (empty for memory metafiles), @@ -102,7 +102,7 @@ private: // notice that we want to support both CF_METAFILEPICT and CF_ENHMETAFILE and // so we derive from wxDataObject and not from wxDataObjectSimple -class WXDLLEXPORT wxEnhMetaFileDataObject : public wxDataObject +class WXDLLIMPEXP_CORE wxEnhMetaFileDataObject : public wxDataObject { public: // ctors @@ -140,7 +140,7 @@ protected: // CF_ENHMETAFILE // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxEnhMetaFileSimpleDataObject : public wxDataObjectSimple +class WXDLLIMPEXP_CORE wxEnhMetaFileSimpleDataObject : public wxDataObjectSimple { public: // ctors diff --git a/include/wx/msw/fdrepdlg.h b/include/wx/msw/fdrepdlg.h index f7874715e4..d7718de058 100644 --- a/include/wx/msw/fdrepdlg.h +++ b/include/wx/msw/fdrepdlg.h @@ -16,7 +16,7 @@ // wxFindReplaceDialog: dialog for searching / replacing text // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFindReplaceDialog : public wxFindReplaceDialogBase +class WXDLLIMPEXP_CORE wxFindReplaceDialog : public wxFindReplaceDialogBase { public: // ctors and such diff --git a/include/wx/msw/filedlg.h b/include/wx/msw/filedlg.h index 482200ad1a..3cc4a52d55 100644 --- a/include/wx/msw/filedlg.h +++ b/include/wx/msw/filedlg.h @@ -16,7 +16,7 @@ // wxFileDialog //------------------------------------------------------------------------- -class WXDLLEXPORT wxFileDialog: public wxFileDialogBase +class WXDLLIMPEXP_CORE wxFileDialog: public wxFileDialogBase { public: wxFileDialog(wxWindow *parent, diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h index 206f2ba65a..fc690bdcbc 100644 --- a/include/wx/msw/font.h +++ b/include/wx/msw/font.h @@ -18,7 +18,7 @@ // wxFont // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFont : public wxFontBase +class WXDLLIMPEXP_CORE wxFont : public wxFontBase { public: // ctors and such diff --git a/include/wx/msw/fontdlg.h b/include/wx/msw/fontdlg.h index 92d6078b45..b20a79d7ce 100644 --- a/include/wx/msw/fontdlg.h +++ b/include/wx/msw/fontdlg.h @@ -16,7 +16,7 @@ // wxFontDialog // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFontDialog : public wxFontDialogBase +class WXDLLIMPEXP_CORE wxFontDialog : public wxFontDialogBase { public: wxFontDialog() : wxFontDialogBase() { /* must be Create()d later */ } diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h index 7b2e01632b..5a3fb73624 100644 --- a/include/wx/msw/frame.h +++ b/include/wx/msw/frame.h @@ -12,7 +12,7 @@ #ifndef _WX_FRAME_H_ #define _WX_FRAME_H_ -class WXDLLEXPORT wxFrame : public wxFrameBase +class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase { public: // construction diff --git a/include/wx/msw/gauge.h b/include/wx/msw/gauge.h index b3c434ae6a..ff9d42d151 100644 --- a/include/wx/msw/gauge.h +++ b/include/wx/msw/gauge.h @@ -14,10 +14,10 @@ #if wxUSE_GAUGE -extern WXDLLEXPORT_DATA(const char) wxGaugeNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxGaugeNameStr[]; // Group box -class WXDLLEXPORT wxGauge : public wxGaugeBase +class WXDLLIMPEXP_CORE wxGauge : public wxGaugeBase { public: wxGauge() { } diff --git a/include/wx/msw/gdiimage.h b/include/wx/msw/gdiimage.h index 9557a9c8e7..6ab0fa5a77 100644 --- a/include/wx/msw/gdiimage.h +++ b/include/wx/msw/gdiimage.h @@ -30,7 +30,7 @@ WX_DECLARE_EXPORTED_LIST(wxGDIImageHandler, wxGDIImageHandlerList); // wxGDIImageRefData: common data fields for all derived classes // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxGDIImageRefData : public wxGDIRefData +class WXDLLIMPEXP_CORE wxGDIImageRefData : public wxGDIRefData { public: wxGDIImageRefData() @@ -82,7 +82,7 @@ public: // format. It also falls back to wxImage if no appropriate image is found. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxGDIImage : public wxGDIObject +class WXDLLIMPEXP_CORE wxGDIImage : public wxGDIObject { public: // handlers list interface @@ -151,7 +151,7 @@ protected: // wxGDIImageHandler: a class which knows how to load/save wxGDIImages. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxGDIImageHandler : public wxObject +class WXDLLIMPEXP_CORE wxGDIImageHandler : public wxObject { public: // ctor diff --git a/include/wx/msw/helpchm.h b/include/wx/msw/helpchm.h index ffe1f74126..341a07f0fe 100644 --- a/include/wx/msw/helpchm.h +++ b/include/wx/msw/helpchm.h @@ -16,7 +16,7 @@ #include "wx/helpbase.h" -class WXDLLEXPORT wxCHMHelpController : public wxHelpControllerBase +class WXDLLIMPEXP_CORE wxCHMHelpController : public wxHelpControllerBase { public: wxCHMHelpController(wxWindow* parentWindow = NULL): wxHelpControllerBase(parentWindow) { } diff --git a/include/wx/msw/helpwin.h b/include/wx/msw/helpwin.h index 24321b4166..5af4f824e0 100644 --- a/include/wx/msw/helpwin.h +++ b/include/wx/msw/helpwin.h @@ -18,7 +18,7 @@ #include "wx/helpbase.h" -class WXDLLEXPORT wxWinHelpController: public wxHelpControllerBase +class WXDLLIMPEXP_CORE wxWinHelpController: public wxHelpControllerBase { DECLARE_CLASS(wxWinHelpController) diff --git a/include/wx/msw/icon.h b/include/wx/msw/icon.h index 45ef0fd34b..46c29a6c3a 100644 --- a/include/wx/msw/icon.h +++ b/include/wx/msw/icon.h @@ -24,7 +24,7 @@ // notice that although wxIconRefData inherits from wxBitmapRefData, it is not // a valid wxBitmapRefData -class WXDLLEXPORT wxIconRefData : public wxGDIImageRefData +class WXDLLIMPEXP_CORE wxIconRefData : public wxGDIImageRefData { public: wxIconRefData() { } @@ -37,7 +37,7 @@ public: // Icon // --------------------------------------------------------------------------- -class WXDLLEXPORT wxIcon : public wxGDIImage +class WXDLLIMPEXP_CORE wxIcon : public wxGDIImage { public: // ctors diff --git a/include/wx/msw/imaglist.h b/include/wx/msw/imaglist.h index 2da13484ac..c76ce168cc 100644 --- a/include/wx/msw/imaglist.h +++ b/include/wx/msw/imaglist.h @@ -18,7 +18,7 @@ // now, the app must take care of ownership issues. That is, the // image lists must be explicitly deleted after the control(s) that uses them // is (are) deleted, or when the app exits. -class WXDLLEXPORT wxImageList : public wxObject +class WXDLLIMPEXP_CORE wxImageList : public wxObject { public: /* diff --git a/include/wx/msw/iniconf.h b/include/wx/msw/iniconf.h index 5eca7ba7af..80c794550e 100644 --- a/include/wx/msw/iniconf.h +++ b/include/wx/msw/iniconf.h @@ -38,7 +38,7 @@ // same as appname). The file name (strAppName parameter) may, in fact, // contain the full path to the file. If it doesn't, the file is searched for // in the Windows directory. -class WXDLLEXPORT wxIniConfig : public wxConfigBase +class WXDLLIMPEXP_CORE wxIniConfig : public wxConfigBase { public: // ctor & dtor diff --git a/include/wx/msw/listbox.h b/include/wx/msw/listbox.h index ec7eb20981..afb1dd3aba 100644 --- a/include/wx/msw/listbox.h +++ b/include/wx/msw/listbox.h @@ -34,7 +34,7 @@ class WXDLLIMPEXP_FWD_BASE wxArrayInt; // List box control // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxListBox : public wxListBoxBase +class WXDLLIMPEXP_CORE wxListBox : public wxListBoxBase { public: // ctors and such diff --git a/include/wx/msw/listctrl.h b/include/wx/msw/listctrl.h index b63269dbbe..50b04f98be 100644 --- a/include/wx/msw/listctrl.h +++ b/include/wx/msw/listctrl.h @@ -71,7 +71,7 @@ class WXDLLIMPEXP_FWD_CORE wxImageList; */ -class WXDLLEXPORT wxListCtrl: public wxControl +class WXDLLIMPEXP_CORE wxListCtrl: public wxControl { public: /* diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h index 66d9b4c33d..a0cbee8804 100644 --- a/include/wx/msw/mdi.h +++ b/include/wx/msw/mdi.h @@ -14,7 +14,7 @@ #include "wx/frame.h" -extern WXDLLEXPORT_DATA(const char) wxStatusLineNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxStatusLineNameStr[]; class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow; class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame; @@ -23,7 +23,7 @@ class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame; // wxMDIParentFrame // --------------------------------------------------------------------------- -class WXDLLEXPORT wxMDIParentFrame : public wxFrame +class WXDLLIMPEXP_CORE wxMDIParentFrame : public wxFrame { public: wxMDIParentFrame(); @@ -125,7 +125,7 @@ private: // wxMDIChildFrame // --------------------------------------------------------------------------- -class WXDLLEXPORT wxMDIChildFrame : public wxFrame +class WXDLLIMPEXP_CORE wxMDIChildFrame : public wxFrame { public: wxMDIChildFrame() { Init(); } @@ -210,7 +210,7 @@ private: // wxMDIClientWindow // --------------------------------------------------------------------------- -class WXDLLEXPORT wxMDIClientWindow : public wxWindow +class WXDLLIMPEXP_CORE wxMDIClientWindow : public wxWindow { public: wxMDIClientWindow() { Init(); } diff --git a/include/wx/msw/menu.h b/include/wx/msw/menu.h index 18ab994c8f..8262a9f180 100644 --- a/include/wx/msw/menu.h +++ b/include/wx/msw/menu.h @@ -45,7 +45,7 @@ class WXDLLIMPEXP_FWD_CORE wxToolBar; // Menu // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMenu : public wxMenuBase +class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase { public: // ctors & dtor @@ -122,7 +122,7 @@ private: // Menu Bar (a la Windows) // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMenuInfo : public wxObject +class WXDLLIMPEXP_CORE wxMenuInfo : public wxObject { public : wxMenuInfo() { m_menu = NULL; } @@ -141,7 +141,7 @@ private : WX_DECLARE_EXPORTED_LIST(wxMenuInfo, wxMenuInfoList ); -class WXDLLEXPORT wxMenuBar : public wxMenuBarBase +class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase { public: // ctors & dtor diff --git a/include/wx/msw/menuitem.h b/include/wx/msw/menuitem.h index 278f166c8f..ed147b7cca 100644 --- a/include/wx/msw/menuitem.h +++ b/include/wx/msw/menuitem.h @@ -24,7 +24,7 @@ // wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMenuItem : public wxMenuItemBase +class WXDLLIMPEXP_CORE wxMenuItem : public wxMenuItemBase #if wxUSE_OWNER_DRAWN , public wxOwnerDrawn #endif diff --git a/include/wx/msw/metafile.h b/include/wx/msw/metafile.h index 341b1ce3b8..a454c9690a 100644 --- a/include/wx/msw/metafile.h +++ b/include/wx/msw/metafile.h @@ -25,7 +25,7 @@ class WXDLLIMPEXP_FWD_CORE wxMetafile; -class WXDLLEXPORT wxMetafileRefData: public wxGDIRefData +class WXDLLIMPEXP_CORE wxMetafileRefData: public wxGDIRefData { public: wxMetafileRefData(); @@ -43,7 +43,7 @@ public: #define M_METAFILEDATA ((wxMetafileRefData *)m_refData) -class WXDLLEXPORT wxMetafile: public wxGDIObject +class WXDLLIMPEXP_CORE wxMetafile: public wxGDIObject { public: wxMetafile(const wxString& file = wxEmptyString); @@ -77,7 +77,7 @@ private: DECLARE_DYNAMIC_CLASS(wxMetafile) }; -class WXDLLEXPORT wxMetafileDCImpl: public wxMSWDCImpl +class WXDLLIMPEXP_CORE wxMetafileDCImpl: public wxMSWDCImpl { public: wxMetafileDCImpl(wxDC *owner, const wxString& file = wxEmptyString); @@ -110,7 +110,7 @@ private: DECLARE_NO_COPY_CLASS(wxMetafileDCImpl) }; -class WXDLLEXPORT wxMetafileDC: public wxDC +class WXDLLIMPEXP_CORE wxMetafileDC: public wxDC { public: // Don't supply origin and extent @@ -147,10 +147,10 @@ private: */ // No origin or extent -bool WXDLLEXPORT wxMakeMetafilePlaceable(const wxString& filename, float scale = 1.0); +bool WXDLLIMPEXP_CORE wxMakeMetafilePlaceable(const wxString& filename, float scale = 1.0); // Optional origin and extent -bool WXDLLEXPORT wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y1, int x2, int y2, float scale = 1.0, bool useOriginAndExtent = true); +bool WXDLLIMPEXP_CORE wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y1, int x2, int y2, float scale = 1.0, bool useOriginAndExtent = true); // ---------------------------------------------------------------------------- // wxMetafileDataObject is a specialization of wxDataObject for metafile data @@ -158,7 +158,7 @@ bool WXDLLEXPORT wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y #if wxUSE_DRAG_AND_DROP -class WXDLLEXPORT wxMetafileDataObject : public wxDataObjectSimple +class WXDLLIMPEXP_CORE wxMetafileDataObject : public wxDataObjectSimple { public: // ctors diff --git a/include/wx/msw/minifram.h b/include/wx/msw/minifram.h index 7b43537fad..d81a36656d 100644 --- a/include/wx/msw/minifram.h +++ b/include/wx/msw/minifram.h @@ -14,7 +14,7 @@ #include "wx/frame.h" -class WXDLLEXPORT wxMiniFrame : public wxFrame +class WXDLLIMPEXP_CORE wxMiniFrame : public wxFrame { public: wxMiniFrame() { } diff --git a/include/wx/msw/msgdlg.h b/include/wx/msw/msgdlg.h index 29ae1be0b3..e48e1d4919 100644 --- a/include/wx/msw/msgdlg.h +++ b/include/wx/msw/msgdlg.h @@ -12,7 +12,7 @@ #ifndef _WX_MSGBOXDLG_H_ #define _WX_MSGBOXDLG_H_ -class WXDLLEXPORT wxMessageDialog : public wxMessageDialogBase +class WXDLLIMPEXP_CORE wxMessageDialog : public wxMessageDialogBase { public: wxMessageDialog(wxWindow *parent, diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h index 29ad2f6e98..0509755d5f 100644 --- a/include/wx/msw/notebook.h +++ b/include/wx/msw/notebook.h @@ -23,7 +23,7 @@ // wxNotebook // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxNotebookPageInfo : public wxObject +class WXDLLIMPEXP_CORE wxNotebookPageInfo : public wxObject { public : wxNotebookPageInfo() { m_page = NULL; m_imageId = -1; m_selected = false; } @@ -57,7 +57,7 @@ private: WX_DECLARE_EXPORTED_LIST(wxNotebookPageInfo, wxNotebookPageInfoList ); -class WXDLLEXPORT wxNotebook : public wxNotebookBase +class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase { public: // ctors diff --git a/include/wx/msw/ole/access.h b/include/wx/msw/ole/access.h index f32062f2a4..f5898dea5e 100644 --- a/include/wx/msw/ole/access.h +++ b/include/wx/msw/ole/access.h @@ -29,7 +29,7 @@ class WXDLLIMPEXP_FWD_CORE wxWindow; // wxAccessible implements accessibility behaviour. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxAccessible : public wxAccessibleBase +class WXDLLIMPEXP_CORE wxAccessible : public wxAccessibleBase { public: wxAccessible(wxWindow *win = NULL); diff --git a/include/wx/msw/ole/automtn.h b/include/wx/msw/ole/automtn.h index dea726397b..4feca6ff74 100644 --- a/include/wx/msw/ole/automtn.h +++ b/include/wx/msw/ole/automtn.h @@ -31,7 +31,7 @@ typedef unsigned short* WXBSTR; * Wraps up an IDispatch pointer and invocation; does variant conversion. */ -class WXDLLEXPORT wxAutomationObject: public wxObject +class WXDLLIMPEXP_CORE wxAutomationObject: public wxObject { public: wxAutomationObject(WXIDISPATCH* dispatchPtr = NULL); diff --git a/include/wx/msw/ole/dataform.h b/include/wx/msw/ole/dataform.h index 7c4bd960a8..d36edbfff9 100644 --- a/include/wx/msw/ole/dataform.h +++ b/include/wx/msw/ole/dataform.h @@ -16,7 +16,7 @@ // wxDataFormat identifies the single format of data // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxDataFormat +class WXDLLIMPEXP_CORE wxDataFormat { public: // the clipboard formats under Win32 are WORD's diff --git a/include/wx/msw/ole/dataobj.h b/include/wx/msw/ole/dataobj.h index 0cb65ba03c..a3dca45ea0 100644 --- a/include/wx/msw/ole/dataobj.h +++ b/include/wx/msw/ole/dataobj.h @@ -22,7 +22,7 @@ struct IDataObject; // wxDataObject is a "smart" and polymorphic piece of data. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxDataObject : public wxDataObjectBase +class WXDLLIMPEXP_CORE wxDataObject : public wxDataObjectBase { public: // ctor & dtor diff --git a/include/wx/msw/ole/dataobj2.h b/include/wx/msw/ole/dataobj2.h index 8389942302..a22759676b 100644 --- a/include/wx/msw/ole/dataobj2.h +++ b/include/wx/msw/ole/dataobj2.h @@ -21,7 +21,7 @@ // rarely used). This is ugly, but I haven't found a solution for it yet. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxBitmapDataObject : public wxBitmapDataObjectBase +class WXDLLIMPEXP_CORE wxBitmapDataObject : public wxBitmapDataObjectBase { public: // ctors @@ -60,7 +60,7 @@ private: // FIXME did I already mention it was ugly? // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxBitmapDataObject2 : public wxBitmapDataObjectBase +class WXDLLIMPEXP_CORE wxBitmapDataObject2 : public wxBitmapDataObjectBase { public: // ctors @@ -91,7 +91,7 @@ private: // wxFileDataObject - data object for CF_HDROP // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFileDataObject : public wxFileDataObjectBase +class WXDLLIMPEXP_CORE wxFileDataObject : public wxFileDataObjectBase { public: wxFileDataObject() { } @@ -119,7 +119,7 @@ private: // wxURLDataObject: data object for URLs // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxURLDataObject : public wxDataObjectComposite +class WXDLLIMPEXP_CORE wxURLDataObject : public wxDataObjectComposite { public: // initialize with URL in ctor or use SetURL later diff --git a/include/wx/msw/ole/dropsrc.h b/include/wx/msw/ole/dropsrc.h index 9bdcb3584c..4efd1b59f2 100644 --- a/include/wx/msw/ole/dropsrc.h +++ b/include/wx/msw/ole/dropsrc.h @@ -37,7 +37,7 @@ class WXDLLIMPEXP_FWD_CORE wxWindow; // wxDataObject object. It's responsible for giving UI feedback while dragging. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxDropSource : public wxDropSourceBase +class WXDLLIMPEXP_CORE wxDropSource : public wxDropSourceBase { public: // ctors: if you use default ctor you must call SetData() later! diff --git a/include/wx/msw/ole/droptgt.h b/include/wx/msw/ole/droptgt.h index ef59b101bc..aff3f84cc0 100644 --- a/include/wx/msw/ole/droptgt.h +++ b/include/wx/msw/ole/droptgt.h @@ -31,7 +31,7 @@ struct IDataObject; // (all of them, including protected ones which are called by the class itself) // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxDropTarget : public wxDropTargetBase +class WXDLLIMPEXP_CORE wxDropTarget : public wxDropTargetBase { public: // ctor & dtor diff --git a/include/wx/msw/ole/oleutils.h b/include/wx/msw/ole/oleutils.h index 81c063701a..7766d6b9c5 100644 --- a/include/wx/msw/ole/oleutils.h +++ b/include/wx/msw/ole/oleutils.h @@ -204,7 +204,7 @@ void wxLogRelease(const wxChar *szInterface, ULONG cRef); // wrapper around BSTR type (by Vadim Zeitlin) -class WXDLLEXPORT wxBasicString +class WXDLLIMPEXP_CORE wxBasicString { public: // ctors & dtor @@ -229,15 +229,15 @@ private: // Convert variants class WXDLLIMPEXP_FWD_BASE wxVariant; -WXDLLEXPORT bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant); -WXDLLEXPORT bool wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant); +WXDLLIMPEXP_CORE bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant); +WXDLLIMPEXP_CORE bool wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant); #endif // wxUSE_VARIANT // Convert string to Unicode -WXDLLEXPORT BSTR wxConvertStringToOle(const wxString& str); +WXDLLIMPEXP_CORE BSTR wxConvertStringToOle(const wxString& str); // Convert string from BSTR to wxString -WXDLLEXPORT wxString wxConvertStringFromOle(BSTR bStr); +WXDLLIMPEXP_CORE wxString wxConvertStringFromOle(BSTR bStr); #else // !wxUSE_OLE diff --git a/include/wx/msw/ole/uuid.h b/include/wx/msw/ole/uuid.h index 59604e7f3a..7bafccaa60 100644 --- a/include/wx/msw/ole/uuid.h +++ b/include/wx/msw/ole/uuid.h @@ -44,7 +44,7 @@ typedef unsigned char uchar; // ------------------------------------------------------------------ // uses RPC functions to create/convert Universally Unique Identifiers -class WXDLLEXPORT Uuid +class WXDLLIMPEXP_CORE Uuid { private: UUID m_uuid; diff --git a/include/wx/msw/palette.h b/include/wx/msw/palette.h index ee404a1881..9d28bbfc3a 100644 --- a/include/wx/msw/palette.h +++ b/include/wx/msw/palette.h @@ -14,7 +14,7 @@ #include "wx/gdiobj.h" -class WXDLLEXPORT wxPalette : public wxPaletteBase +class WXDLLIMPEXP_CORE wxPalette : public wxPaletteBase { public: wxPalette() { } diff --git a/include/wx/msw/pen.h b/include/wx/msw/pen.h index 1cd9b15b9f..412281e08b 100644 --- a/include/wx/msw/pen.h +++ b/include/wx/msw/pen.h @@ -19,7 +19,7 @@ // Pen // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxPen : public wxPenBase +class WXDLLIMPEXP_CORE wxPen : public wxPenBase { public: wxPen() { } diff --git a/include/wx/msw/popupwin.h b/include/wx/msw/popupwin.h index 69f5ef9641..0a1f487b50 100644 --- a/include/wx/msw/popupwin.h +++ b/include/wx/msw/popupwin.h @@ -16,7 +16,7 @@ // wxPopupWindow // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxPopupWindow : public wxPopupWindowBase +class WXDLLIMPEXP_CORE wxPopupWindow : public wxPopupWindowBase { public: wxPopupWindow() { } diff --git a/include/wx/msw/printdlg.h b/include/wx/msw/printdlg.h index 7a0101ec81..06754215f3 100644 --- a/include/wx/msw/printdlg.h +++ b/include/wx/msw/printdlg.h @@ -25,7 +25,7 @@ class WXDLLIMPEXP_FWD_CORE wxDC; // wxWindowsPrintNativeData //---------------------------------------------------------------------------- -class WXDLLEXPORT wxWindowsPrintNativeData: public wxPrintNativeDataBase +class WXDLLIMPEXP_CORE wxWindowsPrintNativeData: public wxPrintNativeDataBase { public: wxWindowsPrintNativeData(); @@ -56,7 +56,7 @@ private: // wxWindowsPrintDialog: the MSW dialog for printing // --------------------------------------------------------------------------- -class WXDLLEXPORT wxWindowsPrintDialog : public wxPrintDialogBase +class WXDLLIMPEXP_CORE wxWindowsPrintDialog : public wxPrintDialogBase { public: wxWindowsPrintDialog(wxWindow *parent, wxPrintDialogData* data = NULL); @@ -93,7 +93,7 @@ private: // wxWindowsPageSetupDialog: the MSW page setup dialog // --------------------------------------------------------------------------- -class WXDLLEXPORT wxWindowsPageSetupDialog: public wxPageSetupDialogBase +class WXDLLIMPEXP_CORE wxWindowsPageSetupDialog: public wxPageSetupDialogBase { public: wxWindowsPageSetupDialog(); diff --git a/include/wx/msw/printwin.h b/include/wx/msw/printwin.h index 64e171c9b0..c5c2d0a603 100644 --- a/include/wx/msw/printwin.h +++ b/include/wx/msw/printwin.h @@ -18,7 +18,7 @@ // Represents the printer: manages printing a wxPrintout object // --------------------------------------------------------------------------- -class WXDLLEXPORT wxWindowsPrinter : public wxPrinterBase +class WXDLLIMPEXP_CORE wxWindowsPrinter : public wxPrinterBase { DECLARE_DYNAMIC_CLASS(wxWindowsPrinter) @@ -44,7 +44,7 @@ private: // wxPrintout. // --------------------------------------------------------------------------- -class WXDLLEXPORT wxWindowsPrintPreview : public wxPrintPreviewBase +class WXDLLIMPEXP_CORE wxWindowsPrintPreview : public wxPrintPreviewBase { public: wxWindowsPrintPreview(wxPrintout *printout, diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h index 4bed1f04b8..28ad14f142 100644 --- a/include/wx/msw/private.h +++ b/include/wx/msw/private.h @@ -42,13 +42,13 @@ class WXDLLIMPEXP_FWD_CORE wxWindowBase; #if wxUSE_GUI -extern WXDLLEXPORT_DATA(HICON) wxSTD_FRAME_ICON; -extern WXDLLEXPORT_DATA(HICON) wxSTD_MDIPARENTFRAME_ICON; -extern WXDLLEXPORT_DATA(HICON) wxSTD_MDICHILDFRAME_ICON; -extern WXDLLEXPORT_DATA(HICON) wxDEFAULT_FRAME_ICON; -extern WXDLLEXPORT_DATA(HICON) wxDEFAULT_MDIPARENTFRAME_ICON; -extern WXDLLEXPORT_DATA(HICON) wxDEFAULT_MDICHILDFRAME_ICON; -extern WXDLLEXPORT_DATA(HFONT) wxSTATUS_LINE_FONT; +extern WXDLLIMPEXP_DATA_CORE(HICON) wxSTD_FRAME_ICON; +extern WXDLLIMPEXP_DATA_CORE(HICON) wxSTD_MDIPARENTFRAME_ICON; +extern WXDLLIMPEXP_DATA_CORE(HICON) wxSTD_MDICHILDFRAME_ICON; +extern WXDLLIMPEXP_DATA_CORE(HICON) wxDEFAULT_FRAME_ICON; +extern WXDLLIMPEXP_DATA_CORE(HICON) wxDEFAULT_MDIPARENTFRAME_ICON; +extern WXDLLIMPEXP_DATA_CORE(HICON) wxDEFAULT_MDICHILDFRAME_ICON; +extern WXDLLIMPEXP_DATA_CORE(HFONT) wxSTATUS_LINE_FONT; #endif // wxUSE_GUI @@ -251,7 +251,7 @@ enum wxSTD_COLOUR wxSTD_COL_MAX }; -struct WXDLLEXPORT wxCOLORMAP +struct WXDLLIMPEXP_CORE wxCOLORMAP { COLORREF from, to; }; @@ -868,30 +868,30 @@ WXDLLIMPEXP_BASE wxWinVersion wxGetWinVersion(); extern HCURSOR wxGetCurrentBusyCursor(); // from msw/utils.cpp extern const wxCursor *wxGetGlobalCursor(); // from msw/cursor.cpp -WXDLLEXPORT void wxGetCharSize(WXHWND wnd, int *x, int *y, const wxFont& the_font); -WXDLLEXPORT void wxFillLogFont(LOGFONT *logFont, const wxFont *font); -WXDLLEXPORT wxFont wxCreateFontFromLogFont(const LOGFONT *logFont); -WXDLLEXPORT wxFontEncoding wxGetFontEncFromCharSet(int charset); +WXDLLIMPEXP_CORE void wxGetCharSize(WXHWND wnd, int *x, int *y, const wxFont& the_font); +WXDLLIMPEXP_CORE void wxFillLogFont(LOGFONT *logFont, const wxFont *font); +WXDLLIMPEXP_CORE wxFont wxCreateFontFromLogFont(const LOGFONT *logFont); +WXDLLIMPEXP_CORE wxFontEncoding wxGetFontEncFromCharSet(int charset); -WXDLLEXPORT void wxSliderEvent(WXHWND control, WXWORD wParam, WXWORD pos); -WXDLLEXPORT void wxScrollBarEvent(WXHWND hbar, WXWORD wParam, WXWORD pos); +WXDLLIMPEXP_CORE void wxSliderEvent(WXHWND control, WXWORD wParam, WXWORD pos); +WXDLLIMPEXP_CORE void wxScrollBarEvent(WXHWND hbar, WXWORD wParam, WXWORD pos); // Find maximum size of window/rectangle -extern WXDLLEXPORT void wxFindMaxSize(WXHWND hwnd, RECT *rect); +extern WXDLLIMPEXP_CORE void wxFindMaxSize(WXHWND hwnd, RECT *rect); // Safely get the window text (i.e. without using fixed size buffer) -extern WXDLLEXPORT wxString wxGetWindowText(WXHWND hWnd); +extern WXDLLIMPEXP_CORE wxString wxGetWindowText(WXHWND hWnd); // get the window class name -extern WXDLLEXPORT wxString wxGetWindowClass(WXHWND hWnd); +extern WXDLLIMPEXP_CORE wxString wxGetWindowClass(WXHWND hWnd); // get the window id (should be unsigned, hence this is not wxWindowID which // is, for mainly historical reasons, signed) -extern WXDLLEXPORT int wxGetWindowId(WXHWND hWnd); +extern WXDLLIMPEXP_CORE int wxGetWindowId(WXHWND hWnd); // check if hWnd's WNDPROC is wndProc. Return true if yes, false if they are // different -extern WXDLLEXPORT bool wxCheckWindowWndProc(WXHWND hWnd, WXFARPROC wndProc); +extern WXDLLIMPEXP_CORE bool wxCheckWindowWndProc(WXHWND hWnd, WXFARPROC wndProc); // Does this window style specify any border? inline bool wxStyleHasBorder(long style) @@ -906,7 +906,7 @@ inline bool wxStyleHasBorder(long style) // this function simply checks whether the given hwnd corresponds to a wxWindow // and returns either that window if it does or NULL otherwise -extern WXDLLEXPORT wxWindow* wxFindWinFromHandle(HWND hwnd); +extern WXDLLIMPEXP_CORE wxWindow* wxFindWinFromHandle(HWND hwnd); // without STRICT WXHWND is the same as HWND anyhow inline wxWindow* wxFindWinFromHandle(WXHWND hWnd) @@ -919,13 +919,13 @@ inline wxWindow* wxFindWinFromHandle(WXHWND hWnd) // wxWindow. // // returns the wxWindow corresponding to the given HWND or NULL. -extern WXDLLEXPORT wxWindow *wxGetWindowFromHWND(WXHWND hwnd); +extern WXDLLIMPEXP_CORE wxWindow *wxGetWindowFromHWND(WXHWND hwnd); // Get the size of an icon -extern WXDLLEXPORT wxSize wxGetHiconSize(HICON hicon); +extern WXDLLIMPEXP_CORE wxSize wxGetHiconSize(HICON hicon); // Lines are drawn differently for WinCE and regular WIN32 -WXDLLEXPORT void wxDrawLine(HDC hdc, int x1, int y1, int x2, int y2); +WXDLLIMPEXP_CORE void wxDrawLine(HDC hdc, int x1, int y1, int x2, int y2); // fill the client rect of the given window on the provided dc using this brush inline void wxFillRect(HWND hwnd, HDC hdc, HBRUSH hbr) diff --git a/include/wx/msw/radiobox.h b/include/wx/msw/radiobox.h index c2c13ee730..a0809e76fc 100644 --- a/include/wx/msw/radiobox.h +++ b/include/wx/msw/radiobox.h @@ -20,7 +20,7 @@ class WXDLLIMPEXP_FWD_CORE wxSubwindows; // wxRadioBox // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxRadioBox : public wxStaticBox, public wxRadioBoxBase +class WXDLLIMPEXP_CORE wxRadioBox : public wxStaticBox, public wxRadioBoxBase { public: wxRadioBox() { Init(); } diff --git a/include/wx/msw/radiobut.h b/include/wx/msw/radiobut.h index e5959d494b..41d6ef1d3b 100644 --- a/include/wx/msw/radiobut.h +++ b/include/wx/msw/radiobut.h @@ -12,7 +12,7 @@ #ifndef _WX_RADIOBUT_H_ #define _WX_RADIOBUT_H_ -class WXDLLEXPORT wxRadioButton: public wxControl +class WXDLLIMPEXP_CORE wxRadioButton: public wxControl { public: // ctors and creation functions diff --git a/include/wx/msw/region.h b/include/wx/msw/region.h index a52b9f15d4..b75113bbd9 100644 --- a/include/wx/msw/region.h +++ b/include/wx/msw/region.h @@ -12,7 +12,7 @@ #ifndef _WX_MSW_REGION_H_ #define _WX_MSW_REGION_H_ -class WXDLLEXPORT wxRegion : public wxRegionWithCombine +class WXDLLIMPEXP_CORE wxRegion : public wxRegionWithCombine { public: wxRegion(); @@ -59,7 +59,7 @@ protected: DECLARE_DYNAMIC_CLASS(wxRegion) }; -class WXDLLEXPORT wxRegionIterator : public wxObject +class WXDLLIMPEXP_CORE wxRegionIterator : public wxObject { public: wxRegionIterator() { Init(); } diff --git a/include/wx/msw/scrolbar.h b/include/wx/msw/scrolbar.h index 72073e490f..71368aa7b2 100644 --- a/include/wx/msw/scrolbar.h +++ b/include/wx/msw/scrolbar.h @@ -13,7 +13,7 @@ #define _WX_SCROLBAR_H_ // Scrollbar item -class WXDLLEXPORT wxScrollBar: public wxScrollBarBase +class WXDLLIMPEXP_CORE wxScrollBar: public wxScrollBarBase { public: wxScrollBar() { m_pageSize = 0; m_viewSize = 0; m_objectSize = 0; } diff --git a/include/wx/msw/slider.h b/include/wx/msw/slider.h index 4dfe3dd50a..019bc233da 100644 --- a/include/wx/msw/slider.h +++ b/include/wx/msw/slider.h @@ -15,7 +15,7 @@ class WXDLLIMPEXP_FWD_CORE wxSubwindows; // Slider -class WXDLLEXPORT wxSlider : public wxSliderBase +class WXDLLIMPEXP_CORE wxSlider : public wxSliderBase { public: wxSlider() { Init(); } diff --git a/include/wx/msw/spinbutt.h b/include/wx/msw/spinbutt.h index f57277f4eb..778db17f85 100644 --- a/include/wx/msw/spinbutt.h +++ b/include/wx/msw/spinbutt.h @@ -17,7 +17,7 @@ #if wxUSE_SPINBTN -class WXDLLEXPORT wxSpinButton : public wxSpinButtonBase +class WXDLLIMPEXP_CORE wxSpinButton : public wxSpinButtonBase { public: // construction diff --git a/include/wx/msw/spinctrl.h b/include/wx/msw/spinctrl.h index 94f78810a1..e137d50d6e 100644 --- a/include/wx/msw/spinctrl.h +++ b/include/wx/msw/spinctrl.h @@ -27,7 +27,7 @@ WX_DEFINE_EXPORTED_ARRAY_PTR(wxSpinCtrl *, wxArraySpins); // control is clicked. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxSpinCtrl : public wxSpinButton +class WXDLLIMPEXP_CORE wxSpinCtrl : public wxSpinButton { public: wxSpinCtrl() { } diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h index f510de3a3f..39f6202e3c 100644 --- a/include/wx/msw/statbmp.h +++ b/include/wx/msw/statbmp.h @@ -16,10 +16,10 @@ #include "wx/icon.h" #include "wx/bitmap.h" -extern WXDLLEXPORT_DATA(const char) wxStaticBitmapNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticBitmapNameStr[]; // a control showing an icon or a bitmap -class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase +class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase { public: wxStaticBitmap() { Init(); } diff --git a/include/wx/msw/statbox.h b/include/wx/msw/statbox.h index e51ede32cf..27180f2c1e 100644 --- a/include/wx/msw/statbox.h +++ b/include/wx/msw/statbox.h @@ -13,7 +13,7 @@ #define _WX_MSW_STATBOX_H_ // Group box -class WXDLLEXPORT wxStaticBox : public wxStaticBoxBase +class WXDLLIMPEXP_CORE wxStaticBox : public wxStaticBoxBase { public: wxStaticBox() { } diff --git a/include/wx/msw/statline.h b/include/wx/msw/statline.h index c69656ecab..2a3528b604 100644 --- a/include/wx/msw/statline.h +++ b/include/wx/msw/statline.h @@ -15,7 +15,7 @@ // wxStaticLine // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxStaticLine : public wxStaticLineBase +class WXDLLIMPEXP_CORE wxStaticLine : public wxStaticLineBase { public: // constructors and pseudo-constructors diff --git a/include/wx/msw/stattext.h b/include/wx/msw/stattext.h index b9c4b6ad21..28e1b79656 100644 --- a/include/wx/msw/stattext.h +++ b/include/wx/msw/stattext.h @@ -12,7 +12,7 @@ #ifndef _WX_STATTEXT_H_ #define _WX_STATTEXT_H_ -class WXDLLEXPORT wxStaticText : public wxStaticTextBase +class WXDLLIMPEXP_CORE wxStaticText : public wxStaticTextBase { public: wxStaticText() { } diff --git a/include/wx/msw/statusbar.h b/include/wx/msw/statusbar.h index 38822039f5..8828b640e2 100644 --- a/include/wx/msw/statusbar.h +++ b/include/wx/msw/statusbar.h @@ -14,7 +14,7 @@ #if wxUSE_NATIVE_STATUSBAR -class WXDLLEXPORT wxStatusBar : public wxStatusBarBase +class WXDLLIMPEXP_CORE wxStatusBar : public wxStatusBarBase { public: // ctors and such diff --git a/include/wx/msw/subwin.h b/include/wx/msw/subwin.h index 06ba1433e5..79d48668eb 100644 --- a/include/wx/msw/subwin.h +++ b/include/wx/msw/subwin.h @@ -18,7 +18,7 @@ // wxSubwindows contains all HWNDs making part of a single wx control // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxSubwindows +class WXDLLIMPEXP_CORE wxSubwindows { public: // the number of subwindows can be specified either as parameter to ctor or diff --git a/include/wx/msw/tabctrl.h b/include/wx/msw/tabctrl.h index 5047f96afc..e0fbd24baa 100644 --- a/include/wx/msw/tabctrl.h +++ b/include/wx/msw/tabctrl.h @@ -23,7 +23,7 @@ class WXDLLIMPEXP_FWD_CORE wxImageList; #define wxTAB_HITTEST_ONLABEL 4 #define wxTAB_HITTEST_ONITEM 6 -class WXDLLEXPORT wxTabCtrl: public wxControl +class WXDLLIMPEXP_CORE wxTabCtrl: public wxControl { DECLARE_DYNAMIC_CLASS(wxTabCtrl) public: @@ -121,7 +121,7 @@ DECLARE_EVENT_TABLE() DECLARE_NO_COPY_CLASS(wxTabCtrl) }; -class WXDLLEXPORT wxTabEvent : public wxNotifyEvent +class WXDLLIMPEXP_CORE wxTabEvent : public wxNotifyEvent { public: wxTabEvent(wxEventType commandType = wxEVT_NULL, int id = 0, diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h index c1f9cbed89..1da13fffd2 100644 --- a/include/wx/msw/textctrl.h +++ b/include/wx/msw/textctrl.h @@ -12,7 +12,7 @@ #ifndef _WX_TEXTCTRL_H_ #define _WX_TEXTCTRL_H_ -class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase +class WXDLLIMPEXP_CORE wxTextCtrl : public wxTextCtrlBase { public: // creation diff --git a/include/wx/msw/tglbtn.h b/include/wx/msw/tglbtn.h index a042b9e83b..7519f17537 100644 --- a/include/wx/msw/tglbtn.h +++ b/include/wx/msw/tglbtn.h @@ -13,10 +13,10 @@ #ifndef _WX_TOGGLEBUTTON_H_ #define _WX_TOGGLEBUTTON_H_ -extern WXDLLEXPORT_DATA(const char) wxCheckBoxNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxCheckBoxNameStr[]; // Checkbox item (single checkbox) -class WXDLLEXPORT wxToggleButton : public wxToggleButtonBase +class WXDLLIMPEXP_CORE wxToggleButton : public wxToggleButtonBase { public: wxToggleButton() {} diff --git a/include/wx/msw/toolbar.h b/include/wx/msw/toolbar.h index 92fcfd7bcd..2177278812 100644 --- a/include/wx/msw/toolbar.h +++ b/include/wx/msw/toolbar.h @@ -17,7 +17,7 @@ #include "wx/dynarray.h" #include "wx/imaglist.h" -class WXDLLEXPORT wxToolBar : public wxToolBarBase +class WXDLLIMPEXP_CORE wxToolBar : public wxToolBarBase { public: // ctors and dtor diff --git a/include/wx/msw/tooltip.h b/include/wx/msw/tooltip.h index d1b6bba824..0e7bafe04a 100644 --- a/include/wx/msw/tooltip.h +++ b/include/wx/msw/tooltip.h @@ -16,7 +16,7 @@ class WXDLLIMPEXP_FWD_CORE wxWindow; -class WXDLLEXPORT wxToolTip : public wxObject +class WXDLLIMPEXP_CORE wxToolTip : public wxObject { public: // ctor & dtor diff --git a/include/wx/msw/toplevel.h b/include/wx/msw/toplevel.h index 1434359e85..e1681e0568 100644 --- a/include/wx/msw/toplevel.h +++ b/include/wx/msw/toplevel.h @@ -16,7 +16,7 @@ // wxTopLevelWindowMSW // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxTopLevelWindowMSW : public wxTopLevelWindowBase +class WXDLLIMPEXP_CORE wxTopLevelWindowMSW : public wxTopLevelWindowBase { public: // constructors and such diff --git a/include/wx/msw/treectrl.h b/include/wx/msw/treectrl.h index c4105df460..508bb18602 100644 --- a/include/wx/msw/treectrl.h +++ b/include/wx/msw/treectrl.h @@ -50,7 +50,7 @@ WX_DECLARE_EXPORTED_VOIDPTR_HASH_MAP(wxTreeItemAttr *, wxMapTreeAttr); // wxTreeCtrl // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxTreeCtrl : public wxTreeCtrlBase +class WXDLLIMPEXP_CORE wxTreeCtrl : public wxTreeCtrlBase { public: // creation diff --git a/include/wx/msw/uxtheme.h b/include/wx/msw/uxtheme.h index fa404596ff..53aca8a059 100644 --- a/include/wx/msw/uxtheme.h +++ b/include/wx/msw/uxtheme.h @@ -79,7 +79,7 @@ typedef HRESULT (__stdcall *PFNWXUENABLETHEMING)(BOOL); #define wxUX_THEME_DECLARE(type, func) type func(...) { return 0; } #endif -class WXDLLEXPORT wxUxThemeEngine +class WXDLLIMPEXP_CORE wxUxThemeEngine { public: // get the theme engine or NULL if themes are not available diff --git a/include/wx/msw/wince/checklst.h b/include/wx/msw/wince/checklst.h index 020e9798c2..896a30bdad 100644 --- a/include/wx/msw/wince/checklst.h +++ b/include/wx/msw/wince/checklst.h @@ -12,7 +12,7 @@ #ifndef __CHECKLSTCE__H_ #define __CHECKLSTCE__H_ -class WXDLLEXPORT wxCheckListBox : public wxCheckListBoxBase +class WXDLLIMPEXP_CORE wxCheckListBox : public wxCheckListBoxBase { public: // ctors diff --git a/include/wx/msw/wince/choicece.h b/include/wx/msw/wince/choicece.h index 5f4e3302d5..0a55eb2b2c 100644 --- a/include/wx/msw/wince/choicece.h +++ b/include/wx/msw/wince/choicece.h @@ -29,7 +29,7 @@ WX_DEFINE_EXPORTED_ARRAY_PTR(wxChoice *, wxArrayChoiceSpins); // Choice item // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxChoice : public wxChoiceBase +class WXDLLIMPEXP_CORE wxChoice : public wxChoiceBase { public: // ctors diff --git a/include/wx/msw/wince/helpwce.h b/include/wx/msw/wince/helpwce.h index e41e27cf1f..9923e515c0 100644 --- a/include/wx/msw/wince/helpwce.h +++ b/include/wx/msw/wince/helpwce.h @@ -16,7 +16,7 @@ #include "wx/helpbase.h" -class WXDLLEXPORT wxWinceHelpController : public wxHelpControllerBase +class WXDLLIMPEXP_CORE wxWinceHelpController : public wxHelpControllerBase { public: wxWinceHelpController(wxWindow* parentWindow = NULL): wxHelpControllerBase(parentWindow) {} diff --git a/include/wx/msw/wince/tbarwce.h b/include/wx/msw/wince/tbarwce.h index cb7f97f697..0a811b6911 100644 --- a/include/wx/msw/wince/tbarwce.h +++ b/include/wx/msw/wince/tbarwce.h @@ -19,7 +19,7 @@ // Smartphones don't have toolbars, so use a dummy class #ifdef __SMARTPHONE__ -class WXDLLEXPORT wxToolBar : public wxToolBarBase +class WXDLLIMPEXP_CORE wxToolBar : public wxToolBarBase { public: // ctors and dtor @@ -78,7 +78,7 @@ private: #include "wx/msw/tbar95.h" -class WXDLLEXPORT wxToolMenuBar : public wxToolBar +class WXDLLIMPEXP_CORE wxToolMenuBar : public wxToolBar { public: // ctors and dtor diff --git a/include/wx/msw/wince/textctrlce.h b/include/wx/msw/wince/textctrlce.h index d04b118fd1..ffd70f7581 100644 --- a/include/wx/msw/wince/textctrlce.h +++ b/include/wx/msw/wince/textctrlce.h @@ -17,7 +17,7 @@ class WXDLLIMPEXP_FWD_CORE wxTextCtrl; WX_DEFINE_EXPORTED_ARRAY_PTR(wxTextCtrl *, wxArrayTextSpins); -class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase +class WXDLLIMPEXP_CORE wxTextCtrl : public wxTextCtrlBase { public: // creation diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h index 159c88b01d..733fcf4dc6 100644 --- a/include/wx/msw/window.h +++ b/include/wx/msw/window.h @@ -21,7 +21,7 @@ // wxWindow declaration for MSW // --------------------------------------------------------------------------- -class WXDLLEXPORT wxWindowMSW : public wxWindowBase +class WXDLLIMPEXP_CORE wxWindowMSW : public wxWindowBase { friend class wxSpinCtrl; friend class wxSlider; @@ -584,8 +584,8 @@ private: // --------------------------------------------------------------------------- // kbd code translation -WXDLLEXPORT int wxCharCodeMSWToWX(int keySym, WXLPARAM lParam = 0); -WXDLLEXPORT WXWORD wxCharCodeWXToMSW(int id, bool *IsVirtual = NULL); +WXDLLIMPEXP_CORE int wxCharCodeMSWToWX(int keySym, WXLPARAM lParam = 0); +WXDLLIMPEXP_CORE WXWORD wxCharCodeWXToMSW(int id, bool *IsVirtual = NULL); // window creation helper class: before creating a new HWND, instantiate an // object of this class on stack - this allows to process the messages sent to diff --git a/include/wx/msw/wrapwin.h b/include/wx/msw/wrapwin.h index bcd2cf0c03..60aa48e553 100644 --- a/include/wx/msw/wrapwin.h +++ b/include/wx/msw/wrapwin.h @@ -93,7 +93,7 @@ #if wxUSE_GUI -WXDLLEXPORT int wxMSLU_DrawStateW(WXHDC dc, WXHBRUSH br, WXFARPROC outputFunc, +WXDLLIMPEXP_CORE int wxMSLU_DrawStateW(WXHDC dc, WXHBRUSH br, WXFARPROC outputFunc, WXLPARAM lData, WXWPARAM wData, int x, int y, int cx, int cy, unsigned int flags); @@ -101,10 +101,10 @@ WXDLLEXPORT int wxMSLU_DrawStateW(WXHDC dc, WXHBRUSH br, WXFARPROC outputFunc, wxMSLU_DrawStateW((WXHDC)dc,(WXHBRUSH)br,(WXFARPROC)func, \ ld, wd, x, y, cx, cy, flags) -WXDLLEXPORT int wxMSLU_GetOpenFileNameW(void *ofn); +WXDLLIMPEXP_CORE int wxMSLU_GetOpenFileNameW(void *ofn); #define GetOpenFileNameW(ofn) wxMSLU_GetOpenFileNameW((void*)ofn) -WXDLLEXPORT int wxMSLU_GetSaveFileNameW(void *ofn); +WXDLLIMPEXP_CORE int wxMSLU_GetSaveFileNameW(void *ofn); #define GetSaveFileNameW(ofn) wxMSLU_GetSaveFileNameW((void*)ofn) #endif // wxUSE_GUI diff --git a/include/wx/notebook.h b/include/wx/notebook.h index 2687911ed4..3522f9f3e2 100644 --- a/include/wx/notebook.h +++ b/include/wx/notebook.h @@ -54,13 +54,13 @@ enum typedef wxWindow wxNotebookPage; // so far, any window can be a page -extern WXDLLEXPORT_DATA(const char) wxNotebookNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxNotebookNameStr[]; // ---------------------------------------------------------------------------- // wxNotebookBase: define wxNotebook interface // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxNotebookBase : public wxBookCtrlBase +class WXDLLIMPEXP_CORE wxNotebookBase : public wxBookCtrlBase { public: // ctors @@ -118,7 +118,7 @@ protected: // notebook event class and related stuff // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxNotebookEvent : public wxBookCtrlBaseEvent +class WXDLLIMPEXP_CORE wxNotebookEvent : public wxBookCtrlBaseEvent { public: wxNotebookEvent(wxEventType commandType = wxEVT_NULL, int winid = 0, diff --git a/include/wx/object.h b/include/wx/object.h index 88297d21b8..88fe417365 100644 --- a/include/wx/object.h +++ b/include/wx/object.h @@ -278,9 +278,9 @@ name##PluginSentinel m_pluginsentinel; #endif // wxUSE_NESTED_CLASSES #define DECLARE_PLUGGABLE_CLASS(name) \ - DECLARE_DYNAMIC_CLASS(name) _DECLARE_DL_SENTINEL(name, WXDLLEXPORT) + DECLARE_DYNAMIC_CLASS(name) _DECLARE_DL_SENTINEL(name, WXDLLIMPEXP_CORE) #define DECLARE_ABSTRACT_PLUGGABLE_CLASS(name) \ - DECLARE_ABSTRACT_CLASS(name) _DECLARE_DL_SENTINEL(name, WXDLLEXPORT) + DECLARE_ABSTRACT_CLASS(name) _DECLARE_DL_SENTINEL(name, WXDLLIMPEXP_CORE) #define DECLARE_USER_EXPORTED_PLUGGABLE_CLASS(name, usergoo) \ DECLARE_DYNAMIC_CLASS(name) _DECLARE_DL_SENTINEL(name, usergoo) @@ -442,21 +442,21 @@ public: wxEXPLICIT wxObjectDataPtr(T *ptr = NULL) : m_ptr(ptr) {} // copy ctor - wxObjectDataPtr(const wxObjectDataPtr &tocopy) + wxObjectDataPtr(const wxObjectDataPtr &tocopy) : m_ptr(tocopy.m_ptr) - { + { if (m_ptr) - m_ptr->IncRef(); + m_ptr->IncRef(); } - ~wxObjectDataPtr() - { - if (m_ptr) - m_ptr->DecRef(); + ~wxObjectDataPtr() + { + if (m_ptr) + m_ptr->DecRef(); } T *get() const { return m_ptr; } - + // test for pointer validity: defining conversion to unspecified_bool_type // and not more obvious bool to avoid implicit conversions to integer types typedef T *(wxObjectDataPtr::*unspecified_bool_type)() const; @@ -466,15 +466,15 @@ public: } T& operator*() const - { - wxASSERT(m_ptr != NULL); + { + wxASSERT(m_ptr != NULL); return *(m_ptr); } - + T *operator->() const - { - wxASSERT(m_ptr != NULL); - return get(); + { + wxASSERT(m_ptr != NULL); + return get(); } void reset(T *ptr) @@ -485,20 +485,20 @@ public: } wxObjectDataPtr& operator=(const wxObjectDataPtr &tocopy) - { - if (m_ptr) - m_ptr->DecRef(); - m_ptr = tocopy.m_ptr; + { + if (m_ptr) + m_ptr->DecRef(); + m_ptr = tocopy.m_ptr; if (m_ptr) - m_ptr->IncRef(); + m_ptr->IncRef(); return *this; } wxObjectDataPtr& operator=(T *ptr) - { - if (m_ptr) - m_ptr->DecRef(); - m_ptr = ptr; + { + if (m_ptr) + m_ptr->DecRef(); + m_ptr = ptr; return *this; } diff --git a/include/wx/os2/accel.h b/include/wx/os2/accel.h index 21236393c9..d0b9c02efc 100644 --- a/include/wx/os2/accel.h +++ b/include/wx/os2/accel.h @@ -28,7 +28,7 @@ class WXDLLIMPEXP_FWD_CORE wxAcceleratorTable; // Hold no key down #define wxACCEL_NORMAL 0x00 -class WXDLLEXPORT wxAcceleratorTable: public wxObject +class WXDLLIMPEXP_CORE wxAcceleratorTable: public wxObject { DECLARE_DYNAMIC_CLASS(wxAcceleratorTable) public: @@ -51,8 +51,8 @@ public: ) const; }; -WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable; +WXDLLIMPEXP_DATA_CORE(extern wxAcceleratorTable) wxNullAcceleratorTable; -WXDLLEXPORT wxString wxPMTextToLabel(const wxString& rsTitle); +WXDLLIMPEXP_CORE wxString wxPMTextToLabel(const wxString& rsTitle); #endif // _WX_ACCEL_H_ diff --git a/include/wx/os2/app.h b/include/wx/os2/app.h index 33f4443e00..6c811e3a1f 100644 --- a/include/wx/os2/app.h +++ b/include/wx/os2/app.h @@ -43,14 +43,14 @@ class WXDLLIMPEXP_FWD_CORE wxApp; class WXDLLIMPEXP_FWD_CORE wxKeyEvent; class WXDLLIMPEXP_FWD_BASE wxLog; -WXDLLEXPORT_DATA(extern wxApp*) wxTheApp; -WXDLLEXPORT_DATA(extern HAB) vHabmain; +WXDLLIMPEXP_DATA_CORE(extern wxApp*) wxTheApp; +WXDLLIMPEXP_DATA_CORE(extern HAB) vHabmain; // Force an exit from main loop -void WXDLLEXPORT wxExit(void); +void WXDLLIMPEXP_CORE wxExit(void); // Yield to other apps/messages -bool WXDLLEXPORT wxYield(void); +bool WXDLLIMPEXP_CORE wxYield(void); extern MRESULT EXPENTRY wxWndProc( HWND ,ULONG @@ -61,7 +61,7 @@ extern MRESULT EXPENTRY wxWndProc( HWND // Represents the application. Derive OnInit and declare // a new App object to start application -class WXDLLEXPORT wxApp : public wxAppBase +class WXDLLIMPEXP_CORE wxApp : public wxAppBase { DECLARE_DYNAMIC_CLASS(wxApp) diff --git a/include/wx/os2/bitmap.h b/include/wx/os2/bitmap.h index bf8e889528..5f0be316b6 100644 --- a/include/wx/os2/bitmap.h +++ b/include/wx/os2/bitmap.h @@ -34,7 +34,7 @@ class WXDLLIMPEXP_FWD_CORE wxImage; // wxBitmap functions accessing it // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxBitmapRefData : public wxGDIImageRefData +class WXDLLIMPEXP_CORE wxBitmapRefData : public wxGDIImageRefData { public: wxBitmapRefData(); @@ -63,7 +63,7 @@ public: // wxBitmap: a mono or colour bitmap // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxBitmap : public wxGDIImage +class WXDLLIMPEXP_CORE wxBitmap : public wxGDIImage { public: // default ctor creates an invalid bitmap, you must Create() it later @@ -229,7 +229,7 @@ private: // wxMask: a mono bitmap used for drawing bitmaps transparently. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMask : public wxObject +class WXDLLIMPEXP_CORE wxMask : public wxObject { public: wxMask(); @@ -279,7 +279,7 @@ protected: // wxBitmapHandler is a class which knows how to load/save bitmaps to/from file // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxBitmapHandler : public wxGDIImageHandler +class WXDLLIMPEXP_CORE wxBitmapHandler : public wxGDIImageHandler { public: inline wxBitmapHandler() diff --git a/include/wx/os2/bmpbuttn.h b/include/wx/os2/bmpbuttn.h index b4b4467ac7..6f4ef222e9 100644 --- a/include/wx/os2/bmpbuttn.h +++ b/include/wx/os2/bmpbuttn.h @@ -15,11 +15,11 @@ #include "wx/button.h" #include "wx/dcclient.h" -WXDLLEXPORT_DATA(extern const char) wxButtonNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxButtonNameStr[]; #define wxDEFAULT_BUTTON_MARGIN 4 -class WXDLLEXPORT wxBitmapButton: public wxBitmapButtonBase +class WXDLLIMPEXP_CORE wxBitmapButton: public wxBitmapButtonBase { public: inline wxBitmapButton() diff --git a/include/wx/os2/brush.h b/include/wx/os2/brush.h index 14169df062..a7326041fd 100644 --- a/include/wx/os2/brush.h +++ b/include/wx/os2/brush.h @@ -15,7 +15,7 @@ #include "wx/bitmap.h" // Brush -class WXDLLEXPORT wxBrush: public wxBrushBase +class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase { public: wxBrush(); diff --git a/include/wx/os2/button.h b/include/wx/os2/button.h index 15de85ecd5..463d0d87f5 100644 --- a/include/wx/os2/button.h +++ b/include/wx/os2/button.h @@ -15,7 +15,7 @@ #include "wx/control.h" // Pushbutton -class WXDLLEXPORT wxButton: public wxButtonBase +class WXDLLIMPEXP_CORE wxButton: public wxButtonBase { public: inline wxButton() {} diff --git a/include/wx/os2/checkbox.h b/include/wx/os2/checkbox.h index 0e15c8e495..f30a49a2f9 100644 --- a/include/wx/os2/checkbox.h +++ b/include/wx/os2/checkbox.h @@ -16,7 +16,7 @@ // Checkbox item (single checkbox) class WXDLLIMPEXP_FWD_CORE wxBitmap; -class WXDLLEXPORT wxCheckBox : public wxCheckBoxBase +class WXDLLIMPEXP_CORE wxCheckBox : public wxCheckBoxBase { public: inline wxCheckBox() { } @@ -66,7 +66,7 @@ private: DECLARE_DYNAMIC_CLASS(wxCheckBox) }; -class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox +class WXDLLIMPEXP_CORE wxBitmapCheckBox: public wxCheckBox { public: diff --git a/include/wx/os2/checklst.h b/include/wx/os2/checklst.h index db4f841bc6..4ead4b063a 100644 --- a/include/wx/os2/checklst.h +++ b/include/wx/os2/checklst.h @@ -19,7 +19,7 @@ class wxOwnerDrawn; // so the compiler knows, it is a class. -class WXDLLEXPORT wxCheckListBox : public wxCheckListBoxBase +class WXDLLIMPEXP_CORE wxCheckListBox : public wxCheckListBoxBase { public: // diff --git a/include/wx/os2/choice.h b/include/wx/os2/choice.h index 5acbbf3d31..fc8ec9f976 100644 --- a/include/wx/os2/choice.h +++ b/include/wx/os2/choice.h @@ -16,7 +16,7 @@ // Choice item // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxChoice: public wxChoiceBase +class WXDLLIMPEXP_CORE wxChoice: public wxChoiceBase { DECLARE_DYNAMIC_CLASS(wxChoice) diff --git a/include/wx/os2/clipbrd.h b/include/wx/os2/clipbrd.h index dfbd291c5e..decb449531 100644 --- a/include/wx/os2/clipbrd.h +++ b/include/wx/os2/clipbrd.h @@ -25,24 +25,24 @@ // implement wxClipboard, and for compatibility. // open/close the clipboard -WXDLLEXPORT bool wxOpenClipboard(); -WXDLLEXPORT bool wxIsClipboardOpened(); +WXDLLIMPEXP_CORE bool wxOpenClipboard(); +WXDLLIMPEXP_CORE bool wxIsClipboardOpened(); #define wxClipboardOpen wxIsClipboardOpened -WXDLLEXPORT bool wxCloseClipboard(); +WXDLLIMPEXP_CORE bool wxCloseClipboard(); // get/set data -WXDLLEXPORT bool wxEmptyClipboard(); -WXDLLEXPORT bool wxSetClipboardData(wxDataFormat dataFormat, +WXDLLIMPEXP_CORE bool wxEmptyClipboard(); +WXDLLIMPEXP_CORE bool wxSetClipboardData(wxDataFormat dataFormat, const void *data, int width = 0, int height = 0); -WXDLLEXPORT void* wxGetClipboardData(wxDataFormat dataFormat, +WXDLLIMPEXP_CORE void* wxGetClipboardData(wxDataFormat dataFormat, long *len = NULL); // clipboard formats -WXDLLEXPORT bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat); -WXDLLEXPORT wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat); -WXDLLEXPORT int wxRegisterClipboardFormat(wxChar *formatName); -WXDLLEXPORT bool wxGetClipboardFormatName(wxDataFormat dataFormat, +WXDLLIMPEXP_CORE bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat); +WXDLLIMPEXP_CORE wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat); +WXDLLIMPEXP_CORE int wxRegisterClipboardFormat(wxChar *formatName); +WXDLLIMPEXP_CORE bool wxGetClipboardFormatName(wxDataFormat dataFormat, wxChar *formatName, int maxCount); @@ -51,7 +51,7 @@ WXDLLEXPORT bool wxGetClipboardFormatName(wxDataFormat dataFormat, //----------------------------------------------------------------------------- class WXDLLIMPEXP_FWD_CORE wxDataObject; -class WXDLLEXPORT wxClipboard : public wxClipboardBase +class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase { DECLARE_DYNAMIC_CLASS(wxClipboard) diff --git a/include/wx/os2/colour.h b/include/wx/os2/colour.h index 7b92b0db03..e1d44c1c83 100644 --- a/include/wx/os2/colour.h +++ b/include/wx/os2/colour.h @@ -15,7 +15,7 @@ #include "wx/object.h" // Colour -class WXDLLEXPORT wxColour: public wxColourBase +class WXDLLIMPEXP_CORE wxColour: public wxColourBase { public: // constructors diff --git a/include/wx/os2/combobox.h b/include/wx/os2/combobox.h index 144f662a10..f95d442a2f 100644 --- a/include/wx/os2/combobox.h +++ b/include/wx/os2/combobox.h @@ -18,7 +18,7 @@ #if wxUSE_COMBOBOX // Combobox item -class WXDLLEXPORT wxComboBox : public wxChoice, +class WXDLLIMPEXP_CORE wxComboBox : public wxChoice, public wxTextEntry { diff --git a/include/wx/os2/control.h b/include/wx/os2/control.h index 41ba89cc41..dd7076542e 100644 --- a/include/wx/os2/control.h +++ b/include/wx/os2/control.h @@ -15,7 +15,7 @@ #include "wx/dynarray.h" // General item class -class WXDLLEXPORT wxControl : public wxControlBase +class WXDLLIMPEXP_CORE wxControl : public wxControlBase { DECLARE_ABSTRACT_CLASS(wxControl) diff --git a/include/wx/os2/cursor.h b/include/wx/os2/cursor.h index 0f465ccb55..f91cb7dd04 100644 --- a/include/wx/os2/cursor.h +++ b/include/wx/os2/cursor.h @@ -14,7 +14,7 @@ #include "wx/bitmap.h" -class WXDLLEXPORT wxCursorRefData: public wxGDIImageRefData +class WXDLLIMPEXP_CORE wxCursorRefData: public wxGDIImageRefData { public: wxCursorRefData(); @@ -27,7 +27,7 @@ public: #define M_CURSORHANDLERDATA ((wxCursorRefData *)bitmap->m_refData) // Cursor -class WXDLLEXPORT wxCursor: public wxBitmap +class WXDLLIMPEXP_CORE wxCursor: public wxBitmap { public: wxCursor(); diff --git a/include/wx/os2/dc.h b/include/wx/os2/dc.h index edeb7d1489..d5dc00aa1c 100644 --- a/include/wx/os2/dc.h +++ b/include/wx/os2/dc.h @@ -97,7 +97,7 @@ public: // this is an ABC: use one of the derived classes to create a DC associated // with a window, screen, printer and so on -class WXDLLEXPORT wxPMDCImpl : public wxDCImpl +class WXDLLIMPEXP_CORE wxPMDCImpl : public wxDCImpl { DECLARE_DYNAMIC_CLASS(wxDC) diff --git a/include/wx/os2/dcclient.h b/include/wx/os2/dcclient.h index b99eedcd11..a69cbd7126 100644 --- a/include/wx/os2/dcclient.h +++ b/include/wx/os2/dcclient.h @@ -34,7 +34,7 @@ WX_DECLARE_EXPORTED_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo); // DC classes // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxWindowDCImpl : public wxPMDCImpl +class WXDLLIMPEXP_CORE wxWindowDCImpl : public wxPMDCImpl { public: // default ctor @@ -55,7 +55,7 @@ private: DECLARE_NO_COPY_CLASS(wxWindowDCImpl) }; // end of CLASS wxWindowDC -class WXDLLEXPORT wxClientDCImpl : public wxWindowDCImpl +class WXDLLIMPEXP_CORE wxClientDCImpl : public wxWindowDCImpl { public: // default ctor @@ -76,7 +76,7 @@ private: DECLARE_NO_COPY_CLASS(wxClientDCImpl) }; // end of CLASS wxClientDC -class WXDLLEXPORT wxPaintDCImpl : public wxClientDCImpl +class WXDLLIMPEXP_CORE wxPaintDCImpl : public wxClientDCImpl { public: wxPaintDCImpl( wxDC *owner ); diff --git a/include/wx/os2/dcmemory.h b/include/wx/os2/dcmemory.h index 194157da9e..62b9923d2d 100644 --- a/include/wx/os2/dcmemory.h +++ b/include/wx/os2/dcmemory.h @@ -15,7 +15,7 @@ #include "wx/dcmemory.h" #include "wx/os2/dc.h" -class WXDLLEXPORT wxMemoryDCImpl: public wxPMDCImpl +class WXDLLIMPEXP_CORE wxMemoryDCImpl: public wxPMDCImpl { public: wxMemoryDCImpl( wxMemoryDC *owner ); diff --git a/include/wx/os2/dcprint.h b/include/wx/os2/dcprint.h index b742273bc9..558f6454c9 100644 --- a/include/wx/os2/dcprint.h +++ b/include/wx/os2/dcprint.h @@ -18,7 +18,7 @@ #include "wx/cmndata.h" #include "wx/os2/dc.h" -class WXDLLEXPORT wxPrinterDCImpl: public wxPMDCImpl +class WXDLLIMPEXP_CORE wxPrinterDCImpl: public wxPMDCImpl { public: // Create a printer DC @@ -64,7 +64,7 @@ private: }; // end of CLASS wxPrinterDC // Gets an HDC for the specified printer configuration -WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& rData); +WXHDC WXDLLIMPEXP_CORE wxGetPrinterDC(const wxPrintData& rData); #endif // wxUSE_PRINTING_ARCHITECTURE diff --git a/include/wx/os2/dcscreen.h b/include/wx/os2/dcscreen.h index ce33cf43ca..f10fc0058d 100644 --- a/include/wx/os2/dcscreen.h +++ b/include/wx/os2/dcscreen.h @@ -15,7 +15,7 @@ #include "wx/dcscreen.h" #include "wx/os2/dc.h" -class WXDLLEXPORT wxScreenDCImpl: public wxPMDCImpl +class WXDLLIMPEXP_CORE wxScreenDCImpl: public wxPMDCImpl { public: // Create a DC representing the whole screen diff --git a/include/wx/os2/dialog.h b/include/wx/os2/dialog.h index 52137153fe..49898cbf7f 100644 --- a/include/wx/os2/dialog.h +++ b/include/wx/os2/dialog.h @@ -14,14 +14,14 @@ #include "wx/panel.h" -WXDLLEXPORT_DATA(extern const char) wxDialogNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxDialogNameStr[]; class WXDLLIMPEXP_FWD_CORE wxDialogModalData; // // Dialog boxes // -class WXDLLEXPORT wxDialog: public wxDialogBase +class WXDLLIMPEXP_CORE wxDialog: public wxDialogBase { public: diff --git a/include/wx/os2/dirdlg.h b/include/wx/os2/dirdlg.h index 250da8c5bb..756d6d41bc 100644 --- a/include/wx/os2/dirdlg.h +++ b/include/wx/os2/dirdlg.h @@ -14,9 +14,9 @@ #include "wx/dialog.h" -WXDLLEXPORT_DATA(extern const wxChar) wxFileSelectorPromptStr[]; +WXDLLIMPEXP_DATA_CORE(extern const wxChar) wxFileSelectorPromptStr[]; -class WXDLLEXPORT wxDirDialog: public wxDirDialogBase +class WXDLLIMPEXP_CORE wxDirDialog: public wxDirDialogBase { DECLARE_DYNAMIC_CLASS(wxDirDialog) public: diff --git a/include/wx/os2/dnd.h b/include/wx/os2/dnd.h index 2750c04c16..05e34264d1 100644 --- a/include/wx/os2/dnd.h +++ b/include/wx/os2/dnd.h @@ -29,7 +29,7 @@ class CIDropTarget; // wxDropSource //------------------------------------------------------------------------- -class WXDLLEXPORT wxDropSource: public wxDropSourceBase +class WXDLLIMPEXP_CORE wxDropSource: public wxDropSourceBase { public: /* constructor. set data later with SetData() */ @@ -59,7 +59,7 @@ protected: // wxDropTarget //------------------------------------------------------------------------- -class WXDLLEXPORT wxDropTarget : public wxDropTargetBase +class WXDLLIMPEXP_CORE wxDropTarget : public wxDropTargetBase { public: wxDropTarget(wxDataObject* pDataObject = (wxDataObject*)NULL); diff --git a/include/wx/os2/filedlg.h b/include/wx/os2/filedlg.h index b971141d73..e24836ad92 100644 --- a/include/wx/os2/filedlg.h +++ b/include/wx/os2/filedlg.h @@ -16,7 +16,7 @@ // wxFileDialog //------------------------------------------------------------------------- -class WXDLLEXPORT wxFileDialog: public wxFileDialogBase +class WXDLLIMPEXP_CORE wxFileDialog: public wxFileDialogBase { DECLARE_DYNAMIC_CLASS(wxFileDialog) public: diff --git a/include/wx/os2/font.h b/include/wx/os2/font.h index 02da710482..0f59967084 100644 --- a/include/wx/os2/font.h +++ b/include/wx/os2/font.h @@ -15,13 +15,13 @@ #include "wx/gdiobj.h" #include "wx/os2/private.h" -WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString; +WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxEmptyString; // ---------------------------------------------------------------------------- // wxFont // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFont : public wxFontBase +class WXDLLIMPEXP_CORE wxFont : public wxFontBase { public: // ctors and such diff --git a/include/wx/os2/fontdlg.h b/include/wx/os2/fontdlg.h index 27031b6fcf..fadd23e1cb 100644 --- a/include/wx/os2/fontdlg.h +++ b/include/wx/os2/fontdlg.h @@ -20,7 +20,7 @@ * Font dialog */ -class WXDLLEXPORT wxFontDialog: public wxFontDialogBase +class WXDLLIMPEXP_CORE wxFontDialog: public wxFontDialogBase { public: wxFontDialog() : wxFontDialogBase() { /* must be Create()d later */ } diff --git a/include/wx/os2/frame.h b/include/wx/os2/frame.h index f8bd78661c..b6e2c09e29 100644 --- a/include/wx/os2/frame.h +++ b/include/wx/os2/frame.h @@ -17,7 +17,7 @@ // #include "wx/os2/wxrsc.h" -class WXDLLEXPORT wxFrame : public wxFrameBase +class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase { public: // construction diff --git a/include/wx/os2/gauge.h b/include/wx/os2/gauge.h index 5df97b19ae..0877888b01 100644 --- a/include/wx/os2/gauge.h +++ b/include/wx/os2/gauge.h @@ -12,7 +12,7 @@ #ifndef _WX_GAUGE_H_ #define _WX_GAUGE_H_ -class WXDLLEXPORT wxGauge: public wxGaugeBase +class WXDLLIMPEXP_CORE wxGauge: public wxGaugeBase { public: inline wxGauge() { m_nRangeMax = 0; m_nGaugePos = 0; } diff --git a/include/wx/os2/gdiimage.h b/include/wx/os2/gdiimage.h index 98422387cd..f529c787cf 100644 --- a/include/wx/os2/gdiimage.h +++ b/include/wx/os2/gdiimage.h @@ -30,7 +30,7 @@ WX_DECLARE_EXPORTED_LIST(wxGDIImageHandler, wxGDIImageHandlerList); // wxGDIImageRefData: common data fields for all derived classes // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxGDIImageRefData : public wxGDIRefData +class WXDLLIMPEXP_CORE wxGDIImageRefData : public wxGDIRefData { public: wxGDIImageRefData() @@ -81,7 +81,7 @@ public: // wxGDIImageHandler: a class which knows how to load/save wxGDIImages. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxGDIImageHandler : public wxObject +class WXDLLIMPEXP_CORE wxGDIImageHandler : public wxObject { public: // ctor @@ -143,7 +143,7 @@ protected: // format. It also falls back to wxImage if no appropriate image is found. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxGDIImage : public wxGDIObject +class WXDLLIMPEXP_CORE wxGDIImage : public wxGDIObject { public: // handlers list interface diff --git a/include/wx/os2/helpwin.h b/include/wx/os2/helpwin.h index d8a2a08150..e175e4fb11 100644 --- a/include/wx/os2/helpwin.h +++ b/include/wx/os2/helpwin.h @@ -18,7 +18,7 @@ #include "wx/helpbase.h" -class WXDLLEXPORT wxWinHelpController: public wxHelpControllerBase +class WXDLLIMPEXP_CORE wxWinHelpController: public wxHelpControllerBase { DECLARE_CLASS(wxWinHelpController) diff --git a/include/wx/os2/icon.h b/include/wx/os2/icon.h index b86db3388f..5ccf5424a0 100644 --- a/include/wx/os2/icon.h +++ b/include/wx/os2/icon.h @@ -22,7 +22,7 @@ #define wxIconRefDataBase wxGDIImageRefData #define wxIconBase wxGDIImage -class WXDLLEXPORT wxIconRefData: public wxIconRefDataBase +class WXDLLIMPEXP_CORE wxIconRefData: public wxIconRefDataBase { public: wxIconRefData() { }; @@ -35,7 +35,7 @@ public: // Icon // --------------------------------------------------------------------------- -class WXDLLEXPORT wxIcon: public wxIconBase +class WXDLLIMPEXP_CORE wxIcon: public wxIconBase { public: wxIcon(); diff --git a/include/wx/os2/iniconf.h b/include/wx/os2/iniconf.h index 8d0579796e..896947c4f4 100644 --- a/include/wx/os2/iniconf.h +++ b/include/wx/os2/iniconf.h @@ -35,7 +35,7 @@ // same as appname). The file name (strAppName parameter) may, in fact, // contain the full path to the file. If it doesn't, the file is searched for // in the Windows directory. -class WXDLLEXPORT wxIniConfig : public wxConfigBase +class WXDLLIMPEXP_CORE wxIniConfig : public wxConfigBase { public: // ctor & dtor diff --git a/include/wx/os2/listbox.h b/include/wx/os2/listbox.h index 6b42cdc9f2..b3160b9286 100644 --- a/include/wx/os2/listbox.h +++ b/include/wx/os2/listbox.h @@ -32,7 +32,7 @@ class wxArrayInt; // List box control // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxListBox : public wxListBoxBase +class WXDLLIMPEXP_CORE wxListBox : public wxListBoxBase { public: // ctors and such diff --git a/include/wx/os2/listctrl.h b/include/wx/os2/listctrl.h index 9240abb47a..08910649fc 100644 --- a/include/wx/os2/listctrl.h +++ b/include/wx/os2/listctrl.h @@ -24,7 +24,7 @@ class WXDLLIMPEXP_FWD_CORE wxImageList; typedef int (wxCALLBACK *wxListCtrlCompare)(long lItem1, long lItem2, long lSortData); -class WXDLLEXPORT wxListCtrl: public wxControl +class WXDLLIMPEXP_CORE wxListCtrl: public wxControl { public: wxListCtrl() { Init(); } diff --git a/include/wx/os2/mdi.h b/include/wx/os2/mdi.h index 37f17ffd01..dfa7cfa50b 100644 --- a/include/wx/os2/mdi.h +++ b/include/wx/os2/mdi.h @@ -19,7 +19,7 @@ class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow; class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame; -class WXDLLEXPORT wxMDIParentFrame: public wxFrame +class WXDLLIMPEXP_CORE wxMDIParentFrame: public wxFrame { DECLARE_DYNAMIC_CLASS(wxMDIParentFrame) @@ -103,7 +103,7 @@ private: DECLARE_EVENT_TABLE() }; -class WXDLLEXPORT wxMDIChildFrame: public wxFrame +class WXDLLIMPEXP_CORE wxMDIChildFrame: public wxFrame { DECLARE_DYNAMIC_CLASS(wxMDIChildFrame) public: @@ -164,7 +164,7 @@ protected: * of the children. Phew! So the children are sort of 'adopted'... */ -class WXDLLEXPORT wxMDIClientWindow: public wxWindow +class WXDLLIMPEXP_CORE wxMDIClientWindow: public wxWindow { DECLARE_DYNAMIC_CLASS(wxMDIClientWindow) diff --git a/include/wx/os2/menu.h b/include/wx/os2/menu.h index a4c380faa8..95ad8e33c9 100644 --- a/include/wx/os2/menu.h +++ b/include/wx/os2/menu.h @@ -28,7 +28,7 @@ void wxSetShortCutKey(wxChar* zText); // Menu // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMenu : public wxMenuBase +class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase { public: // @@ -172,7 +172,7 @@ private: // Menu Bar (a la Windows) // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMenuBar : public wxMenuBarBase +class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase { public: // diff --git a/include/wx/os2/menuitem.h b/include/wx/os2/menuitem.h index 6a141f52f1..f1ec069468 100644 --- a/include/wx/os2/menuitem.h +++ b/include/wx/os2/menuitem.h @@ -33,7 +33,7 @@ // ---------------------------------------------------------------------------- // wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMenuItem: public wxMenuItemBase +class WXDLLIMPEXP_CORE wxMenuItem: public wxMenuItemBase #if wxUSE_OWNER_DRAWN , public wxOwnerDrawn #endif diff --git a/include/wx/os2/metafile.h b/include/wx/os2/metafile.h index 03818f44b1..4e39e32276 100644 --- a/include/wx/os2/metafile.h +++ b/include/wx/os2/metafile.h @@ -33,7 +33,7 @@ class WXDLLIMPEXP_FWD_CORE wxMetafile; -class WXDLLEXPORT wxMetafileRefData: public wxGDIRefData +class WXDLLIMPEXP_CORE wxMetafileRefData: public wxGDIRefData { friend class WXDLLIMPEXP_FWD_CORE wxMetafile; public: @@ -49,7 +49,7 @@ public: #define M_METAFILEDATA ((wxMetafileRefData *)m_refData) -class WXDLLEXPORT wxMetafile: public wxGDIObject +class WXDLLIMPEXP_CORE wxMetafile: public wxGDIObject { DECLARE_DYNAMIC_CLASS(wxMetafile) public: @@ -73,7 +73,7 @@ protected: virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; }; -class WXDLLEXPORT wxMetafileDCImpl: public wxPMDCImpl +class WXDLLIMPEXP_CORE wxMetafileDCImpl: public wxPMDCImpl { public: wxMetafileDCImpl(wxDC *owner, const wxString& file = wxEmptyString); @@ -106,7 +106,7 @@ private: DECLARE_NO_COPY_CLASS(wxMetafileDCImpl) }; -class WXDLLEXPORT wxMetafileDC: public wxDC +class WXDLLIMPEXP_CORE wxMetafileDC: public wxDC { public: // Don't supply origin and extent @@ -148,10 +148,10 @@ private: // No origin or extent #define wxMakeMetaFilePlaceable wxMakeMetafilePlaceable -bool WXDLLEXPORT wxMakeMetafilePlaceable(const wxString& filename, float scale = 1.0); +bool WXDLLIMPEXP_CORE wxMakeMetafilePlaceable(const wxString& filename, float scale = 1.0); // Optional origin and extent -bool WXDLLEXPORT wxMakeMetaFilePlaceable( const wxString& filename +bool WXDLLIMPEXP_CORE wxMakeMetaFilePlaceable( const wxString& filename ,int x1 ,int y1 ,int x2 @@ -168,7 +168,7 @@ bool WXDLLEXPORT wxMakeMetaFilePlaceable( const wxString& filename // use. #if wxUSE_DRAG_AND_DROP -class WXDLLEXPORT wxMetafileDataObject : public wxDataObject +class WXDLLIMPEXP_CORE wxMetafileDataObject : public wxDataObject { public: // ctors diff --git a/include/wx/os2/minifram.h b/include/wx/os2/minifram.h index 37c24c18d6..b339730b0e 100644 --- a/include/wx/os2/minifram.h +++ b/include/wx/os2/minifram.h @@ -16,7 +16,7 @@ #include "wx/frame.h" -class WXDLLEXPORT wxMiniFrame: public wxFrame { +class WXDLLIMPEXP_CORE wxMiniFrame: public wxFrame { DECLARE_DYNAMIC_CLASS(wxMiniFrame) diff --git a/include/wx/os2/msgdlg.h b/include/wx/os2/msgdlg.h index 9ec111886f..10d24e8346 100644 --- a/include/wx/os2/msgdlg.h +++ b/include/wx/os2/msgdlg.h @@ -13,7 +13,7 @@ #ifndef _WX_MSGBOXDLG_H_ #define _WX_MSGBOXDLG_H_ -class WXDLLEXPORT wxMessageDialog : public wxMessageDialogBase +class WXDLLIMPEXP_CORE wxMessageDialog : public wxMessageDialogBase { public: wxMessageDialog( wxWindow* pParent diff --git a/include/wx/os2/notebook.h b/include/wx/os2/notebook.h index af22bc4b54..3c94de27a7 100644 --- a/include/wx/os2/notebook.h +++ b/include/wx/os2/notebook.h @@ -23,7 +23,7 @@ // wxNotebook // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxNotebook : public wxNotebookBase +class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase { public: // diff --git a/include/wx/os2/palette.h b/include/wx/os2/palette.h index 69a8ff18cb..b489ec88e4 100644 --- a/include/wx/os2/palette.h +++ b/include/wx/os2/palette.h @@ -17,7 +17,7 @@ class WXDLLIMPEXP_FWD_CORE wxPalette; -class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData +class WXDLLIMPEXP_CORE wxPaletteRefData: public wxGDIRefData { friend class WXDLLIMPEXP_FWD_CORE wxPalette; public: @@ -30,7 +30,7 @@ public: #define M_PALETTEDATA ((wxPaletteRefData *)m_refData) -class WXDLLEXPORT wxPalette: public wxPaletteBase +class WXDLLIMPEXP_CORE wxPalette: public wxPaletteBase { public: wxPalette(); diff --git a/include/wx/os2/pen.h b/include/wx/os2/pen.h index bf31b1ed3a..dfcdb9f12f 100644 --- a/include/wx/os2/pen.h +++ b/include/wx/os2/pen.h @@ -21,7 +21,7 @@ typedef long wxPMDash; // Pen // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxPen : public wxPenBase +class WXDLLIMPEXP_CORE wxPen : public wxPenBase { public: wxPen() { } diff --git a/include/wx/os2/pnghand.h b/include/wx/os2/pnghand.h index 69a9a47890..b7b53ea184 100644 --- a/include/wx/os2/pnghand.h +++ b/include/wx/os2/pnghand.h @@ -12,7 +12,7 @@ #ifndef _WX_PNGHAND_H_ #define _WX_PNGHAND_H_ -class WXDLLEXPORT wxPNGFileHandler: public wxBitmapHandler +class WXDLLIMPEXP_CORE wxPNGFileHandler: public wxBitmapHandler { DECLARE_DYNAMIC_CLASS(wxPNGFileHandler) public: diff --git a/include/wx/os2/popupwin.h b/include/wx/os2/popupwin.h index 72ddbab4d7..4990a2a130 100644 --- a/include/wx/os2/popupwin.h +++ b/include/wx/os2/popupwin.h @@ -16,7 +16,7 @@ // wxPopupWindow // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxPopupWindow : public wxPopupWindowBase +class WXDLLIMPEXP_CORE wxPopupWindow : public wxPopupWindowBase { public: wxPopupWindow() { } diff --git a/include/wx/os2/print.h b/include/wx/os2/print.h index 34c9336604..780d0cb16b 100644 --- a/include/wx/os2/print.h +++ b/include/wx/os2/print.h @@ -18,7 +18,7 @@ * Represents the printer: manages printing a wxPrintout object */ -class WXDLLEXPORT wxOS2Printer: public wxPrinterBase +class WXDLLIMPEXP_CORE wxOS2Printer: public wxPrinterBase { DECLARE_DYNAMIC_CLASS(wxPrinter) @@ -37,7 +37,7 @@ private: * Programmer creates an object of this class to preview a wxPrintout. */ -class WXDLLEXPORT wxOS2PrintPreview: public wxPrintPreviewBase +class WXDLLIMPEXP_CORE wxOS2PrintPreview: public wxPrintPreviewBase { DECLARE_CLASS(wxPrintPreview) diff --git a/include/wx/os2/printos2.h b/include/wx/os2/printos2.h index 171ce9fd07..1a813cc91d 100644 --- a/include/wx/os2/printos2.h +++ b/include/wx/os2/printos2.h @@ -20,7 +20,7 @@ * Represents the printer: manages printing a wxPrintout object */ -class WXDLLEXPORT wxOS2Printer: public wxPrinterBase +class WXDLLIMPEXP_CORE wxOS2Printer: public wxPrinterBase { DECLARE_DYNAMIC_CLASS(wxOS2Printer) @@ -39,7 +39,7 @@ private: * Programmer creates an object of this class to preview a wxPrintout. */ -class WXDLLEXPORT wxOS2PrintPreview: public wxPrintPreviewBase +class WXDLLIMPEXP_CORE wxOS2PrintPreview: public wxPrintPreviewBase { DECLARE_CLASS(wxOS2PrintPreview) diff --git a/include/wx/os2/private.h b/include/wx/os2/private.h index 685022f9f6..a204619b51 100644 --- a/include/wx/os2/private.h +++ b/include/wx/os2/private.h @@ -94,50 +94,50 @@ class WXDLLIMPEXP_FWD_CORE wxBitmap; // // Controls // -WXDLLEXPORT_DATA(extern const char) wxButtonNameStr[]; -WXDLLEXPORT_DATA(extern const char) wxCheckBoxNameStr[]; -WXDLLEXPORT_DATA(extern const char) wxChoiceNameStr[]; -WXDLLEXPORT_DATA(extern const char) wxComboBoxNameStr[]; -WXDLLEXPORT_DATA(extern const char) wxDialogNameStr[]; -WXDLLEXPORT_DATA(extern const char) wxFrameNameStr[]; -WXDLLEXPORT_DATA(extern const char) wxGaugeNameStr[]; -WXDLLEXPORT_DATA(extern const char) wxStaticBoxNameStr[]; -WXDLLEXPORT_DATA(extern const char) wxListBoxNameStr[]; -WXDLLEXPORT_DATA(extern const char) wxStaticLineNameStr[]; -WXDLLEXPORT_DATA(extern const char) wxStaticTextNameStr[]; -WXDLLEXPORT_DATA(extern const char) wxStaticBitmapNameStr[]; -WXDLLEXPORT_DATA(extern const char) wxPanelNameStr[]; -WXDLLEXPORT_DATA(extern const char) wxRadioBoxNameStr[]; -WXDLLEXPORT_DATA(extern const char) wxRadioButtonNameStr[]; -WXDLLEXPORT_DATA(extern const char) wxBitmapRadioButtonNameStr[]; -WXDLLEXPORT_DATA(extern const char) wxScrollBarNameStr[]; -WXDLLEXPORT_DATA(extern const char) wxSliderNameStr[]; -WXDLLEXPORT_DATA(extern const char) wxTextCtrlNameStr[]; -WXDLLEXPORT_DATA(extern const char) wxToolBarNameStr[]; -WXDLLEXPORT_DATA(extern const char) wxStatusLineNameStr[]; -WXDLLEXPORT_DATA(extern const char) wxGetTextFromUserPromptStr[]; -WXDLLEXPORT_DATA(extern const char) wxMessageBoxCaptionStr[]; -WXDLLEXPORT_DATA(extern const char) wxFileSelectorPromptStr[]; -WXDLLEXPORT_DATA(extern const char) wxFileSelectorDefaultWildcardStr[]; -WXDLLEXPORT_DATA(extern const wxChar*) wxInternalErrorStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxFatalErrorStr; -WXDLLEXPORT_DATA(extern const char) wxTreeCtrlNameStr[]; -WXDLLEXPORT_DATA(extern const char) wxDirDialogNameStr[]; -WXDLLEXPORT_DATA(extern const char) wxDirDialogDefaultFolderStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxButtonNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxCheckBoxNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxChoiceNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxComboBoxNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxDialogNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxFrameNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxGaugeNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxStaticBoxNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxListBoxNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxStaticLineNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxStaticTextNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxStaticBitmapNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxPanelNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxRadioBoxNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxRadioButtonNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxBitmapRadioButtonNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxScrollBarNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxSliderNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxTextCtrlNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxToolBarNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxStatusLineNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxGetTextFromUserPromptStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxMessageBoxCaptionStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxFileSelectorPromptStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxFileSelectorDefaultWildcardStr[]; +WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxInternalErrorStr; +WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxFatalErrorStr; +WXDLLIMPEXP_DATA_CORE(extern const char) wxTreeCtrlNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxDirDialogNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxDirDialogDefaultFolderStr[]; // // Class names // -WXDLLEXPORT_DATA(extern const wxChar*) wxFrameClassName; -WXDLLEXPORT_DATA(extern const wxChar*) wxFrameClassNameNoRedraw; -WXDLLEXPORT_DATA(extern const wxChar*) wxMDIFrameClassName; -WXDLLEXPORT_DATA(extern const wxChar*) wxMDIFrameClassNameNoRedraw; -WXDLLEXPORT_DATA(extern const wxChar*) wxMDIChildFrameClassName; -WXDLLEXPORT_DATA(extern const wxChar*) wxMDIChildFrameClassNameNoRedraw; -WXDLLEXPORT_DATA(extern const wxChar*) wxPanelClassName; -WXDLLEXPORT_DATA(extern const wxChar*) wxPanelClassNameNR; -WXDLLEXPORT_DATA(extern const wxChar*) wxCanvasClassName; -WXDLLEXPORT_DATA(extern const wxChar*) wxCanvasClassNameNR; +WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxFrameClassName; +WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxFrameClassNameNoRedraw; +WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxMDIFrameClassName; +WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxMDIFrameClassNameNoRedraw; +WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxMDIChildFrameClassName; +WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxMDIChildFrameClassNameNoRedraw; +WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxPanelClassName; +WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxPanelClassNameNR; +WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxCanvasClassName; +WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxCanvasClassNameNR; // --------------------------------------------------------------------------- // standard icons from the resources @@ -145,13 +145,13 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxCanvasClassNameNR; #ifdef __WXPM__ -WXDLLEXPORT_DATA(extern HICON) wxSTD_FRAME_ICON; -WXDLLEXPORT_DATA(extern HICON) wxSTD_MDIPARENTFRAME_ICON; -WXDLLEXPORT_DATA(extern HICON) wxSTD_MDICHILDFRAME_ICON; -WXDLLEXPORT_DATA(extern HICON) wxDEFAULT_FRAME_ICON; -WXDLLEXPORT_DATA(extern HICON) wxDEFAULT_MDIPARENTFRAME_ICON; -WXDLLEXPORT_DATA(extern HICON) wxDEFAULT_MDICHILDFRAME_ICON; -WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT; +WXDLLIMPEXP_DATA_CORE(extern HICON) wxSTD_FRAME_ICON; +WXDLLIMPEXP_DATA_CORE(extern HICON) wxSTD_MDIPARENTFRAME_ICON; +WXDLLIMPEXP_DATA_CORE(extern HICON) wxSTD_MDICHILDFRAME_ICON; +WXDLLIMPEXP_DATA_CORE(extern HICON) wxDEFAULT_FRAME_ICON; +WXDLLIMPEXP_DATA_CORE(extern HICON) wxDEFAULT_MDIPARENTFRAME_ICON; +WXDLLIMPEXP_DATA_CORE(extern HICON) wxDEFAULT_MDICHILDFRAME_ICON; +WXDLLIMPEXP_DATA_CORE(extern HFONT) wxSTATUS_LINE_FONT; #endif @@ -296,9 +296,9 @@ extern HBITMAP wxCopyBmp(HBITMAP hbmp, bool flip=false, int w=0, int h=0); #ifdef __WXPM__ // The MakeProcInstance version of the function wxSubclassedGenericControlProc -WXDLLEXPORT_DATA(extern int) wxGenericControlSubClassProc; -WXDLLEXPORT_DATA(extern wxChar*) wxBuffer; -WXDLLEXPORT_DATA(extern HINSTANCE) wxhInstance; +WXDLLIMPEXP_DATA_CORE(extern int) wxGenericControlSubClassProc; +WXDLLIMPEXP_DATA_CORE(extern wxChar*) wxBuffer; +WXDLLIMPEXP_DATA_CORE(extern HINSTANCE) wxhInstance; #endif // --------------------------------------------------------------------------- @@ -308,10 +308,10 @@ WXDLLEXPORT_DATA(extern HINSTANCE) wxhInstance; #ifdef __WXPM__ extern "C" { -WXDLLEXPORT HINSTANCE wxGetInstance(); +WXDLLIMPEXP_CORE HINSTANCE wxGetInstance(); } -WXDLLEXPORT void wxSetInstance(HINSTANCE hInst); +WXDLLIMPEXP_CORE void wxSetInstance(HINSTANCE hInst); #endif #include "wx/thread.h" @@ -330,19 +330,19 @@ static inline MRESULT MySendMsg(HWND hwnd, ULONG ulMsgid, #ifdef __WXPM__ -WXDLLEXPORT void wxDrawBorder( HPS hPS +WXDLLIMPEXP_CORE void wxDrawBorder( HPS hPS ,RECTL& rRect ,WXDWORD dwStyle ); -WXDLLEXPORT wxWindow* wxFindWinFromHandle(WXHWND hWnd); +WXDLLIMPEXP_CORE wxWindow* wxFindWinFromHandle(WXHWND hWnd); -WXDLLEXPORT void wxGetCharSize(WXHWND wnd, int *x, int *y,wxFont *the_font); +WXDLLIMPEXP_CORE void wxGetCharSize(WXHWND wnd, int *x, int *y,wxFont *the_font); -WXDLLEXPORT void wxConvertVectorFontSize( FIXED fxPointSize +WXDLLIMPEXP_CORE void wxConvertVectorFontSize( FIXED fxPointSize ,PFATTRS pFattrs ); -WXDLLEXPORT void wxFillLogFont( LOGFONT* pLogFont +WXDLLIMPEXP_CORE void wxFillLogFont( LOGFONT* pLogFont ,PFACENAMEDESC pFaceName ,HPS* phPS ,bool* pbInternalPS @@ -350,37 +350,37 @@ WXDLLEXPORT void wxFillLogFont( LOGFONT* pLogFont ,wxString& sFaceName ,wxFont* pFont ); -WXDLLEXPORT wxFontEncoding wxGetFontEncFromCharSet(int nCharSet); -WXDLLEXPORT void wxOS2SelectMatchingFontByName( PFATTRS vFattrs +WXDLLIMPEXP_CORE wxFontEncoding wxGetFontEncFromCharSet(int nCharSet); +WXDLLIMPEXP_CORE void wxOS2SelectMatchingFontByName( PFATTRS vFattrs ,PFACENAMEDESC pFaceName ,PFONTMETRICS pFM ,int nNumFonts ,const wxFont* pFont ); -WXDLLEXPORT wxFont wxCreateFontFromLogFont( LOGFONT* pLogFont +WXDLLIMPEXP_CORE wxFont wxCreateFontFromLogFont( LOGFONT* pLogFont ,PFONTMETRICS pFM ,PFACENAMEDESC pFace ); -WXDLLEXPORT int wxGpiStrcmp(wxChar* s0, wxChar* s1); +WXDLLIMPEXP_CORE int wxGpiStrcmp(wxChar* s0, wxChar* s1); -WXDLLEXPORT void wxSliderEvent(WXHWND control, WXWORD wParam, WXWORD pos); -WXDLLEXPORT void wxScrollBarEvent(WXHWND hbar, WXWORD wParam, WXWORD pos); +WXDLLIMPEXP_CORE void wxSliderEvent(WXHWND control, WXWORD wParam, WXWORD pos); +WXDLLIMPEXP_CORE void wxScrollBarEvent(WXHWND hbar, WXWORD wParam, WXWORD pos); // Find maximum size of window/rectangle -WXDLLEXPORT extern void wxFindMaxSize(WXHWND hwnd, RECT *rect); +WXDLLIMPEXP_CORE extern void wxFindMaxSize(WXHWND hwnd, RECT *rect); -WXDLLEXPORT wxWindow* wxFindControlFromHandle(WXHWND hWnd); -WXDLLEXPORT void wxAddControlHandle(WXHWND hWnd, wxWindow *item); +WXDLLIMPEXP_CORE wxWindow* wxFindControlFromHandle(WXHWND hWnd); +WXDLLIMPEXP_CORE void wxAddControlHandle(WXHWND hWnd, wxWindow *item); // Safely get the window text (i.e. without using fixed size buffer) -WXDLLEXPORT extern wxString wxGetWindowText(WXHWND hWnd); +WXDLLIMPEXP_CORE extern wxString wxGetWindowText(WXHWND hWnd); // get the window class name -WXDLLEXPORT extern wxString wxGetWindowClass(WXHWND hWnd); +WXDLLIMPEXP_CORE extern wxString wxGetWindowClass(WXHWND hWnd); // get the window id (should be unsigned, hence this is not wxWindowID which // is, for mainly historical reasons, signed) -WXDLLEXPORT extern WXWORD wxGetWindowId(WXHWND hWnd); +WXDLLIMPEXP_CORE extern WXWORD wxGetWindowId(WXHWND hWnd); // Convert a PM Error code to a string WXDLLIMPEXP_BASE extern wxString wxPMErrorToStr(ERRORID vError); @@ -400,21 +400,21 @@ inline RECTL wxGetWindowRect(HWND hWnd) return vRect; } // end of wxGetWindowRect -WXDLLEXPORT extern void wxOS2SetFont( HWND hWnd +WXDLLIMPEXP_CORE extern void wxOS2SetFont( HWND hWnd ,const wxFont& rFont ); -WXDLLEXPORT extern bool wxCheckWindowWndProc( WXHWND hWnd +WXDLLIMPEXP_CORE extern bool wxCheckWindowWndProc( WXHWND hWnd ,WXFARPROC fnWndProc ); -WXDLLEXPORT extern wxBitmap wxDisableBitmap( const wxBitmap& rBmp +WXDLLIMPEXP_CORE extern wxBitmap wxDisableBitmap( const wxBitmap& rBmp ,long lColor ); #if wxUSE_GUI #include "wx/colour.h" -WXDLLEXPORT extern COLORREF wxColourToRGB(const wxColour& rColor); +WXDLLIMPEXP_CORE extern COLORREF wxColourToRGB(const wxColour& rColor); #endif #endif // __WXPM__ diff --git a/include/wx/os2/private/timer.h b/include/wx/os2/private/timer.h index be2e3d8a30..a948060903 100644 --- a/include/wx/os2/private/timer.h +++ b/include/wx/os2/private/timer.h @@ -14,7 +14,7 @@ #include "wx/private/timer.h" -class WXDLLEXPORT wxOS2TimerImpl: public wxTimerImpl +class WXDLLIMPEXP_CORE wxOS2TimerImpl: public wxTimerImpl { friend void wxProcessTimer(wxOS2TimerImpl& timer); diff --git a/include/wx/os2/radiobox.h b/include/wx/os2/radiobox.h index 04a93b0167..bb01435cdb 100644 --- a/include/wx/os2/radiobox.h +++ b/include/wx/os2/radiobox.h @@ -15,7 +15,7 @@ // List box item class WXDLLIMPEXP_FWD_CORE wxBitmap ; -class WXDLLEXPORT wxRadioBox: public wxControl, public wxRadioBoxBase +class WXDLLIMPEXP_CORE wxRadioBox: public wxControl, public wxRadioBoxBase { public: wxRadioBox(); diff --git a/include/wx/os2/radiobut.h b/include/wx/os2/radiobut.h index 1e71293c81..7d1e8196fb 100644 --- a/include/wx/os2/radiobut.h +++ b/include/wx/os2/radiobut.h @@ -14,7 +14,7 @@ #include "wx/control.h" -class WXDLLEXPORT wxRadioButton: public wxControl +class WXDLLIMPEXP_CORE wxRadioButton: public wxControl { public: inline wxRadioButton() { Init(); } diff --git a/include/wx/os2/region.h b/include/wx/os2/region.h index 126deb0937..ef4e1a12ea 100644 --- a/include/wx/os2/region.h +++ b/include/wx/os2/region.h @@ -15,7 +15,7 @@ #include "wx/list.h" #include "wx/os2/private.h" -class WXDLLEXPORT wxRegion : public wxRegionWithCombine +class WXDLLIMPEXP_CORE wxRegion : public wxRegionWithCombine { public: wxRegion( wxCoord x @@ -80,7 +80,7 @@ protected: }; // end of CLASS wxRegion -class WXDLLEXPORT wxRegionIterator : public wxObject +class WXDLLIMPEXP_CORE wxRegionIterator : public wxObject { public: wxRegionIterator(); diff --git a/include/wx/os2/scrolbar.h b/include/wx/os2/scrolbar.h index 8ec1d95814..856c1aa9ad 100644 --- a/include/wx/os2/scrolbar.h +++ b/include/wx/os2/scrolbar.h @@ -15,7 +15,7 @@ #include "wx/scrolbar.h" // Scrollbar item -class WXDLLEXPORT wxScrollBar : public wxScrollBarBase +class WXDLLIMPEXP_CORE wxScrollBar : public wxScrollBarBase { public: inline wxScrollBar() diff --git a/include/wx/os2/slider.h b/include/wx/os2/slider.h index 38d9ecfc14..9fc369c7e5 100644 --- a/include/wx/os2/slider.h +++ b/include/wx/os2/slider.h @@ -15,7 +15,7 @@ #include "wx/control.h" // Slider -class WXDLLEXPORT wxSlider: public wxSliderBase +class WXDLLIMPEXP_CORE wxSlider: public wxSliderBase { public: wxSlider(); diff --git a/include/wx/os2/spinbutt.h b/include/wx/os2/spinbutt.h index 39ba5ae572..1513ab8860 100644 --- a/include/wx/os2/spinbutt.h +++ b/include/wx/os2/spinbutt.h @@ -22,7 +22,7 @@ extern MRESULT EXPENTRY wxSpinCtrlWndProc( , MPARAM lParam ); -class WXDLLEXPORT wxSpinButton: public wxSpinButtonBase +class WXDLLIMPEXP_CORE wxSpinButton: public wxSpinButtonBase { public: // Construction diff --git a/include/wx/os2/spinctrl.h b/include/wx/os2/spinctrl.h index c28c645ef3..1b37a27fd2 100644 --- a/include/wx/os2/spinctrl.h +++ b/include/wx/os2/spinctrl.h @@ -23,7 +23,7 @@ WX_DEFINE_EXPORTED_ARRAY_PTR(wxSpinCtrl *, wxArraySpins); // control is clicked. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxSpinCtrl : public wxSpinButton +class WXDLLIMPEXP_CORE wxSpinCtrl : public wxSpinButton { public: wxSpinCtrl() { } diff --git a/include/wx/os2/statbmp.h b/include/wx/os2/statbmp.h index 3028147429..0ea76ac9ce 100644 --- a/include/wx/os2/statbmp.h +++ b/include/wx/os2/statbmp.h @@ -15,7 +15,7 @@ #include "wx/control.h" #include "wx/icon.h" -class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase +class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase { public: inline wxStaticBitmap() { Init(); } diff --git a/include/wx/os2/statbox.h b/include/wx/os2/statbox.h index ac327c6180..7a2b733ecd 100644 --- a/include/wx/os2/statbox.h +++ b/include/wx/os2/statbox.h @@ -15,7 +15,7 @@ #include "wx/control.h" // Group box -class WXDLLEXPORT wxStaticBox : public wxStaticBoxBase +class WXDLLIMPEXP_CORE wxStaticBox : public wxStaticBoxBase { public: inline wxStaticBox() {} diff --git a/include/wx/os2/statline.h b/include/wx/os2/statline.h index 76625e51ca..617e4ddf2e 100644 --- a/include/wx/os2/statline.h +++ b/include/wx/os2/statline.h @@ -15,7 +15,7 @@ // wxStaticLine // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxStaticLine : public wxStaticLineBase +class WXDLLIMPEXP_CORE wxStaticLine : public wxStaticLineBase { public: diff --git a/include/wx/os2/stattext.h b/include/wx/os2/stattext.h index 7ef0e38879..6832107804 100644 --- a/include/wx/os2/stattext.h +++ b/include/wx/os2/stattext.h @@ -14,7 +14,7 @@ #include "wx/control.h" -class WXDLLEXPORT wxStaticText : public wxStaticTextBase +class WXDLLIMPEXP_CORE wxStaticText : public wxStaticTextBase { public: inline wxStaticText() { } diff --git a/include/wx/os2/tabctrl.h b/include/wx/os2/tabctrl.h index 40049d3325..5f56241c04 100644 --- a/include/wx/os2/tabctrl.h +++ b/include/wx/os2/tabctrl.h @@ -23,7 +23,7 @@ class wxImageList; #define wxTAB_HITTEST_ONLABEL 4 #define wxTAB_HITTEST_ONITEM 6 -class WXDLLEXPORT wxTabCtrl: public wxControl +class WXDLLIMPEXP_CORE wxTabCtrl: public wxControl { DECLARE_DYNAMIC_CLASS(wxTabCtrl) public: @@ -118,7 +118,7 @@ protected: DECLARE_EVENT_TABLE() }; -class WXDLLEXPORT wxTabEvent: public wxCommandEvent +class WXDLLIMPEXP_CORE wxTabEvent: public wxCommandEvent { DECLARE_DYNAMIC_CLASS(wxTabEvent) diff --git a/include/wx/os2/textctrl.h b/include/wx/os2/textctrl.h index e693736aad..e00ff2433a 100644 --- a/include/wx/os2/textctrl.h +++ b/include/wx/os2/textctrl.h @@ -14,7 +14,7 @@ typedef int (wxCALLBACK *wxTreeCtrlCompare)(long lItem1, long lItem2, long lSortData); -class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase +class WXDLLIMPEXP_CORE wxTextCtrl : public wxTextCtrlBase { public: wxTextCtrl(); diff --git a/include/wx/os2/tglbtn.h b/include/wx/os2/tglbtn.h index a8a1e6d1c5..3f1811a6fc 100644 --- a/include/wx/os2/tglbtn.h +++ b/include/wx/os2/tglbtn.h @@ -13,10 +13,10 @@ #ifndef _WX_TOGGLEBUTTON_H_ #define _WX_TOGGLEBUTTON_H_ -extern WXDLLEXPORT_DATA(const char) wxCheckBoxNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxCheckBoxNameStr[]; // Checkbox item (single checkbox) -class WXDLLEXPORT wxToggleButton : public wxToggleButtonBase +class WXDLLIMPEXP_CORE wxToggleButton : public wxToggleButtonBase { public: wxToggleButton() {} diff --git a/include/wx/os2/toolbar.h b/include/wx/os2/toolbar.h index 77617a36ad..ab156e37f1 100644 --- a/include/wx/os2/toolbar.h +++ b/include/wx/os2/toolbar.h @@ -19,7 +19,7 @@ #define ID_TOOLTIMER 100 #define ID_TOOLEXPTIMER 101 -class WXDLLEXPORT wxToolBar: public wxToolBarBase +class WXDLLIMPEXP_CORE wxToolBar: public wxToolBarBase { public: /* diff --git a/include/wx/os2/toplevel.h b/include/wx/os2/toplevel.h index e5fa3c0723..1f775dc01d 100644 --- a/include/wx/os2/toplevel.h +++ b/include/wx/os2/toplevel.h @@ -23,7 +23,7 @@ enum ETemplateID // wxTopLevelWindowOS2 // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxTopLevelWindowOS2 : public wxTopLevelWindowBase +class WXDLLIMPEXP_CORE wxTopLevelWindowOS2 : public wxTopLevelWindowBase { public: // constructors and such diff --git a/include/wx/os2/treectrl.h b/include/wx/os2/treectrl.h index ad33b1d81d..46f497cf89 100644 --- a/include/wx/os2/treectrl.h +++ b/include/wx/os2/treectrl.h @@ -27,8 +27,8 @@ typedef long wxDataType; // fwd decl -class WXDLLEXPORT wxImageList; -class WXDLLEXPORT wxDragImage; +class WXDLLIMPEXP_CORE wxImageList; +class WXDLLIMPEXP_CORE wxDragImage; struct WXDLLIMPEXP_FWD_CORE wxTreeViewItem; // a callback function used for sorting tree items, it should return -1 if the @@ -48,7 +48,7 @@ WX_DECLARE_EXPORTED_VOIDPTR_HASH_MAP(wxTreeItemAttr *, wxMapTreeAttr); // ---------------------------------------------------------------------------- // wxTreeCtrl // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxTreeCtrl : public wxControl +class WXDLLIMPEXP_CORE wxTreeCtrl : public wxControl { public: // creation diff --git a/include/wx/os2/window.h b/include/wx/os2/window.h index 9765a809fa..70474ba32a 100644 --- a/include/wx/os2/window.h +++ b/include/wx/os2/window.h @@ -40,7 +40,7 @@ class WXDLLIMPEXP_FWD_CORE wxButton; // wxWindow declaration for OS/2 PM // --------------------------------------------------------------------------- -class WXDLLEXPORT wxWindowOS2 : public wxWindowBase +class WXDLLIMPEXP_CORE wxWindowOS2 : public wxWindowBase { public: wxWindowOS2() @@ -556,8 +556,8 @@ public: // --------------------------------------------------------------------------- // kbd code translation -WXDLLEXPORT int wxCharCodeOS2ToWX(int nKeySym); -WXDLLEXPORT int wxCharCodeWXToOS2( int nId +WXDLLIMPEXP_CORE int wxCharCodeOS2ToWX(int nKeySym); +WXDLLIMPEXP_CORE int wxCharCodeWXToOS2( int nId ,bool* pbIsVirtual = NULL ); diff --git a/include/wx/overlay.h b/include/wx/overlay.h index b89e988899..5de5bc77bb 100644 --- a/include/wx/overlay.h +++ b/include/wx/overlay.h @@ -31,7 +31,7 @@ class WXDLLIMPEXP_FWD_CORE wxOverlayImpl; class WXDLLIMPEXP_FWD_CORE wxDC; -class WXDLLEXPORT wxOverlay +class WXDLLIMPEXP_CORE wxOverlay { public: wxOverlay(); @@ -67,7 +67,7 @@ private: }; -class WXDLLEXPORT wxDCOverlay +class WXDLLIMPEXP_CORE wxDCOverlay { public: // connects this overlay to the corresponding drawing dc, if the overlay is diff --git a/include/wx/ownerdrw.h b/include/wx/ownerdrw.h index fb6ac27c1c..be2ae25d58 100644 --- a/include/wx/ownerdrw.h +++ b/include/wx/ownerdrw.h @@ -29,7 +29,7 @@ // element or one unchangeable bitmap otherwise. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxOwnerDrawn +class WXDLLIMPEXP_CORE wxOwnerDrawn { public: // ctor & dtor diff --git a/include/wx/palette.h b/include/wx/palette.h index 491838d3cd..8f9183cdfb 100644 --- a/include/wx/palette.h +++ b/include/wx/palette.h @@ -20,7 +20,7 @@ #include "wx/gdiobj.h" // wxPaletteBase -class WXDLLEXPORT wxPaletteBase: public wxGDIObject +class WXDLLIMPEXP_CORE wxPaletteBase: public wxGDIObject { public: virtual ~wxPaletteBase() { } diff --git a/include/wx/palmos/accel.h b/include/wx/palmos/accel.h index f47b035a5f..4f82696b8d 100644 --- a/include/wx/palmos/accel.h +++ b/include/wx/palmos/accel.h @@ -16,7 +16,7 @@ // the accel table has all accelerators for a given window or menu // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxAcceleratorTable : public wxObject +class WXDLLIMPEXP_CORE wxAcceleratorTable : public wxObject { public: // default ctor diff --git a/include/wx/palmos/app.h b/include/wx/palmos/app.h index 4289b470c2..c2f4fa6e93 100644 --- a/include/wx/palmos/app.h +++ b/include/wx/palmos/app.h @@ -23,7 +23,7 @@ class WXDLLIMPEXP_FWD_BASE wxLog; // Represents the application. Derive OnInit and declare // a new App object to start application -class WXDLLEXPORT wxApp : public wxAppBase +class WXDLLIMPEXP_CORE wxApp : public wxAppBase { DECLARE_DYNAMIC_CLASS(wxApp) @@ -84,8 +84,7 @@ protected: #define SW_SHOWNORMAL 1 #endif -extern int WXDLLEXPORT -wxEntry(); +extern WXDLLIMPEXP_CORE int wxEntry(); #define IMPLEMENT_WXWIN_MAIN \ \ diff --git a/include/wx/palmos/bitmap.h b/include/wx/palmos/bitmap.h index e55d2d1c6d..eff5365cb4 100644 --- a/include/wx/palmos/bitmap.h +++ b/include/wx/palmos/bitmap.h @@ -35,7 +35,7 @@ class WXDLLIMPEXP_FWD_CORE wxPixelDataBase; // wxBitmap: a mono or colour bitmap // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxBitmap : public wxGDIImage +class WXDLLIMPEXP_CORE wxBitmap : public wxGDIImage { public: // default ctor creates an invalid bitmap, you must Create() it later @@ -176,7 +176,7 @@ private: // wxMask: a mono bitmap used for drawing bitmaps transparently. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMask : public wxObject +class WXDLLIMPEXP_CORE wxMask : public wxObject { public: wxMask(); @@ -215,7 +215,7 @@ protected: // wxBitmapHandler is a class which knows how to load/save bitmaps to/from file // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxBitmapHandler : public wxGDIImageHandler +class WXDLLIMPEXP_CORE wxBitmapHandler : public wxGDIImageHandler { public: wxBitmapHandler() { m_type = wxBITMAP_TYPE_INVALID; } diff --git a/include/wx/palmos/bmpbuttn.h b/include/wx/palmos/bmpbuttn.h index f21f5bae67..c563776aed 100644 --- a/include/wx/palmos/bmpbuttn.h +++ b/include/wx/palmos/bmpbuttn.h @@ -17,7 +17,7 @@ #define wxDEFAULT_BUTTON_MARGIN 4 -class WXDLLEXPORT wxBitmapButton: public wxBitmapButtonBase +class WXDLLIMPEXP_CORE wxBitmapButton: public wxBitmapButtonBase { public: wxBitmapButton() diff --git a/include/wx/palmos/brush.h b/include/wx/palmos/brush.h index ba4bf15cc1..4d65402d49 100644 --- a/include/wx/palmos/brush.h +++ b/include/wx/palmos/brush.h @@ -22,7 +22,7 @@ class WXDLLIMPEXP_FWD_CORE wxBrush; // wxBrush // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxBrush : public wxBrushBase +class WXDLLIMPEXP_CORE wxBrush : public wxBrushBase { public: wxBrush(); diff --git a/include/wx/palmos/button.h b/include/wx/palmos/button.h index 4c1118b475..1c6d30cf21 100644 --- a/include/wx/palmos/button.h +++ b/include/wx/palmos/button.h @@ -16,7 +16,7 @@ // Pushbutton // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxButton : public wxButtonBase +class WXDLLIMPEXP_CORE wxButton : public wxButtonBase { public: wxButton() { } diff --git a/include/wx/palmos/caret.h b/include/wx/palmos/caret.h index 685fb0a1d2..0221481407 100644 --- a/include/wx/palmos/caret.h +++ b/include/wx/palmos/caret.h @@ -12,7 +12,7 @@ #ifndef _WX_CARET_H_ #define _WX_CARET_H_ -class WXDLLEXPORT wxCaret : public wxCaretBase +class WXDLLIMPEXP_CORE wxCaret : public wxCaretBase { public: wxCaret() { Init(); } diff --git a/include/wx/palmos/checkbox.h b/include/wx/palmos/checkbox.h index ff4cd9a8d6..a96f5f9db0 100644 --- a/include/wx/palmos/checkbox.h +++ b/include/wx/palmos/checkbox.h @@ -13,7 +13,7 @@ #define _WX_CHECKBOX_H_ // Checkbox item (single checkbox) -class WXDLLEXPORT wxCheckBox : public wxCheckBoxBase +class WXDLLIMPEXP_CORE wxCheckBox : public wxCheckBoxBase { public: wxCheckBox() { } diff --git a/include/wx/palmos/checklst.h b/include/wx/palmos/checklst.h index caf994612e..ba593ba141 100644 --- a/include/wx/palmos/checklst.h +++ b/include/wx/palmos/checklst.h @@ -19,7 +19,7 @@ class WXDLLIMPEXP_FWD_CORE wxOwnerDrawn; class WXDLLIMPEXP_FWD_CORE wxCheckListBoxItem; // fwd decl, defined in checklst.cpp -class WXDLLEXPORT wxCheckListBox : public wxCheckListBoxBase +class WXDLLIMPEXP_CORE wxCheckListBox : public wxCheckListBoxBase { public: // ctors diff --git a/include/wx/palmos/choice.h b/include/wx/palmos/choice.h index 7398c9d5f7..fa14020831 100644 --- a/include/wx/palmos/choice.h +++ b/include/wx/palmos/choice.h @@ -16,7 +16,7 @@ // Choice item // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxChoice : public wxChoiceBase +class WXDLLIMPEXP_CORE wxChoice : public wxChoiceBase { public: // ctors diff --git a/include/wx/palmos/clipbrd.h b/include/wx/palmos/clipbrd.h index c12699bbc0..59c8c7715a 100644 --- a/include/wx/palmos/clipbrd.h +++ b/include/wx/palmos/clipbrd.h @@ -22,24 +22,24 @@ // implement wxClipboard, and for compatibility. // open/close the clipboard -WXDLLEXPORT bool wxOpenClipboard(); -WXDLLEXPORT bool wxIsClipboardOpened(); +WXDLLIMPEXP_CORE bool wxOpenClipboard(); +WXDLLIMPEXP_CORE bool wxIsClipboardOpened(); #define wxClipboardOpen wxIsClipboardOpened -WXDLLEXPORT bool wxCloseClipboard(); +WXDLLIMPEXP_CORE bool wxCloseClipboard(); // get/set data -WXDLLEXPORT bool wxEmptyClipboard(); -WXDLLEXPORT bool wxSetClipboardData(wxDataFormat dataFormat, +WXDLLIMPEXP_CORE bool wxEmptyClipboard(); +WXDLLIMPEXP_CORE bool wxSetClipboardData(wxDataFormat dataFormat, const void *data, int width = 0, int height = 0); -WXDLLEXPORT void* wxGetClipboardData(wxDataFormat dataFormat, +WXDLLIMPEXP_CORE void* wxGetClipboardData(wxDataFormat dataFormat, long *len = NULL); // clipboard formats -WXDLLEXPORT bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat); -WXDLLEXPORT wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat); -WXDLLEXPORT int wxRegisterClipboardFormat(wxChar *formatName); -WXDLLEXPORT bool wxGetClipboardFormatName(wxDataFormat dataFormat, +WXDLLIMPEXP_CORE bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat); +WXDLLIMPEXP_CORE wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat); +WXDLLIMPEXP_CORE int wxRegisterClipboardFormat(wxChar *formatName); +WXDLLIMPEXP_CORE bool wxGetClipboardFormatName(wxDataFormat dataFormat, wxChar *formatName, int maxCount); @@ -48,7 +48,7 @@ WXDLLEXPORT bool wxGetClipboardFormatName(wxDataFormat dataFormat, //----------------------------------------------------------------------------- class WXDLLIMPEXP_FWD_CORE wxDataObject; -class WXDLLEXPORT wxClipboard : public wxObject +class WXDLLIMPEXP_CORE wxClipboard : public wxObject { DECLARE_DYNAMIC_CLASS(wxClipboard) diff --git a/include/wx/palmos/colordlg.h b/include/wx/palmos/colordlg.h index d215250f99..e6e35236b8 100644 --- a/include/wx/palmos/colordlg.h +++ b/include/wx/palmos/colordlg.h @@ -20,7 +20,7 @@ // wxColourDialog: dialog for choosing a colours // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxColourDialog : public wxDialog +class WXDLLIMPEXP_CORE wxColourDialog : public wxDialog { public: wxColourDialog(); diff --git a/include/wx/palmos/combobox.h b/include/wx/palmos/combobox.h index bfb46589c5..1de11c19ee 100644 --- a/include/wx/palmos/combobox.h +++ b/include/wx/palmos/combobox.h @@ -20,7 +20,7 @@ // Combobox control // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxComboBox: public wxChoice +class WXDLLIMPEXP_CORE wxComboBox: public wxChoice { public: wxComboBox() { } diff --git a/include/wx/palmos/control.h b/include/wx/palmos/control.h index 849ad78d26..caa3a804a4 100644 --- a/include/wx/palmos/control.h +++ b/include/wx/palmos/control.h @@ -15,7 +15,7 @@ #include "wx/dynarray.h" // General item class -class WXDLLEXPORT wxControl : public wxControlBase +class WXDLLIMPEXP_CORE wxControl : public wxControlBase { public: wxControl() { Init(); } diff --git a/include/wx/palmos/cursor.h b/include/wx/palmos/cursor.h index 856880890c..4f76be6560 100644 --- a/include/wx/palmos/cursor.h +++ b/include/wx/palmos/cursor.h @@ -17,7 +17,7 @@ class WXDLLIMPEXP_FWD_CORE wxImage; // Cursor -class WXDLLEXPORT wxCursor : public wxGDIImage +class WXDLLIMPEXP_CORE wxCursor : public wxGDIImage { public: // constructors diff --git a/include/wx/palmos/dc.h b/include/wx/palmos/dc.h index 0e02472e31..0fb07f2a7a 100644 --- a/include/wx/palmos/dc.h +++ b/include/wx/palmos/dc.h @@ -43,7 +43,7 @@ public: // this is an ABC: use one of the derived classes to create a DC associated // with a window, screen, printer and so on -class WXDLLEXPORT wxPalmDCImpl: public wxDCImpl +class WXDLLIMPEXP_CORE wxPalmDCImpl: public wxDCImpl { public: wxPalmDCImpl(wxDC *owner, WXHDC hDC); @@ -319,7 +319,7 @@ protected: // only/mainly) // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxDCTempImpl : public wxPalmDCImpl +class WXDLLIMPEXP_CORE wxDCTempImpl : public wxPalmDCImpl { public: // construct a temporary DC with the specified HDC and size (it should be @@ -355,7 +355,7 @@ private: DECLARE_NO_COPY_CLASS(wxDCTempImpl) }; -class WXDLLEXPORT wxDCTemp : public wxDC +class WXDLLIMPEXP_CORE wxDCTemp : public wxDC { public: wxDCTemp(WXHDC hdc, const wxSize& size = wxDefaultSize) diff --git a/include/wx/palmos/dcclient.h b/include/wx/palmos/dcclient.h index af3f15e8da..d45b754e44 100644 --- a/include/wx/palmos/dcclient.h +++ b/include/wx/palmos/dcclient.h @@ -34,7 +34,7 @@ WX_DECLARE_EXPORTED_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo); // DC classes // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxWindowDCImpl : public wxPalmDCImpl +class WXDLLIMPEXP_CORE wxWindowDCImpl : public wxPalmDCImpl { public: // default ctor @@ -53,7 +53,7 @@ protected: DECLARE_NO_COPY_CLASS(wxWindowDCImpl) }; -class WXDLLEXPORT wxClientDCImpl : public wxWindowDCImpl +class WXDLLIMPEXP_CORE wxClientDCImpl : public wxWindowDCImpl { public: // default ctor @@ -73,7 +73,7 @@ protected: DECLARE_NO_COPY_CLASS(wxClientDCImpl) }; -class WXDLLEXPORT wxPaintDCImpl : public wxClientDCImpl +class WXDLLIMPEXP_CORE wxPaintDCImpl : public wxClientDCImpl { public: wxPaintDCImpl( wxDC *owner ); diff --git a/include/wx/palmos/dcmemory.h b/include/wx/palmos/dcmemory.h index c1125eee7b..59b69f9859 100644 --- a/include/wx/palmos/dcmemory.h +++ b/include/wx/palmos/dcmemory.h @@ -15,7 +15,7 @@ #include "wx/dcmemory.h" #include "wx/palmos/dc.h" -class WXDLLEXPORT wxMemoryDCImpl: public wxPalmDCImpl +class WXDLLIMPEXP_CORE wxMemoryDCImpl: public wxPalmDCImpl { public: wxMemoryDCImpl( wxMemoryDC *owner ); diff --git a/include/wx/palmos/dcprint.h b/include/wx/palmos/dcprint.h index 20758ead92..6051b0a23c 100644 --- a/include/wx/palmos/dcprint.h +++ b/include/wx/palmos/dcprint.h @@ -17,7 +17,7 @@ #include "wx/dc.h" #include "wx/cmndata.h" -class WXDLLEXPORT wxPrinterDC : public wxDC +class WXDLLIMPEXP_CORE wxPrinterDC : public wxDC { public: // Create a printer DC (obsolete function: use wxPrintData version now) @@ -54,10 +54,10 @@ private: }; // Gets an HDC for the default printer configuration -// WXHDC WXDLLEXPORT wxGetPrinterDC(int orientation); +// WXHDC WXDLLIMPEXP_CORE wxGetPrinterDC(int orientation); // Gets an HDC for the specified printer configuration -WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& data); +WXHDC WXDLLIMPEXP_CORE wxGetPrinterDC(const wxPrintData& data); #endif // wxUSE_PRINTING_ARCHITECTURE diff --git a/include/wx/palmos/dcscreen.h b/include/wx/palmos/dcscreen.h index f0c5f2a97c..986247f701 100644 --- a/include/wx/palmos/dcscreen.h +++ b/include/wx/palmos/dcscreen.h @@ -15,7 +15,7 @@ #include "wx/dcscreen.h" #include "wx/palmos/dc.h" -class WXDLLEXPORT wxScreenDCImpl : public wxPalmDCImpl +class WXDLLIMPEXP_CORE wxScreenDCImpl : public wxPalmDCImpl { public: // Create a DC representing the whole screen diff --git a/include/wx/palmos/dialog.h b/include/wx/palmos/dialog.h index a2b9f74506..9fd8edeb76 100644 --- a/include/wx/palmos/dialog.h +++ b/include/wx/palmos/dialog.h @@ -14,12 +14,12 @@ #include "wx/panel.h" -//WXDLLEXPORT_DATA(extern const wxChar) wxDialogNameStr[]; +//WXDLLIMPEXP_DATA_CORE(extern const wxChar) wxDialogNameStr[]; class WXDLLIMPEXP_FWD_CORE wxDialogModalData; // Dialog boxes -class WXDLLEXPORT wxDialog : public wxDialogBase +class WXDLLIMPEXP_CORE wxDialog : public wxDialogBase { public: wxDialog() { Init(); } diff --git a/include/wx/palmos/dib.h b/include/wx/palmos/dib.h index 7b57fce36b..e68ad4ef14 100644 --- a/include/wx/palmos/dib.h +++ b/include/wx/palmos/dib.h @@ -23,7 +23,7 @@ class WXDLLIMPEXP_FWD_CORE wxPalette; // wxDIB: represents a DIB section // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxDIB +class WXDLLIMPEXP_CORE wxDIB { public: // ctors and such diff --git a/include/wx/palmos/dirdlg.h b/include/wx/palmos/dirdlg.h index a8ee2fcdb9..8437e5dc93 100644 --- a/include/wx/palmos/dirdlg.h +++ b/include/wx/palmos/dirdlg.h @@ -12,7 +12,7 @@ #ifndef _WX_DIRDLG_H_ #define _WX_DIRDLG_H_ -class WXDLLEXPORT wxDirDialog : public wxDirDialogBase +class WXDLLIMPEXP_CORE wxDirDialog : public wxDirDialogBase { public: wxDirDialog(wxWindow *parent, diff --git a/include/wx/palmos/dragimag.h b/include/wx/palmos/dragimag.h index b3c2089cc2..7da8d04407 100644 --- a/include/wx/palmos/dragimag.h +++ b/include/wx/palmos/dragimag.h @@ -88,7 +88,7 @@ * wxDragImage */ -class WXDLLEXPORT wxDragImage: public wxObject +class WXDLLIMPEXP_CORE wxDragImage: public wxObject { public: diff --git a/include/wx/palmos/enhmeta.h b/include/wx/palmos/enhmeta.h index 1501435442..e986395628 100644 --- a/include/wx/palmos/enhmeta.h +++ b/include/wx/palmos/enhmeta.h @@ -23,7 +23,7 @@ // wxEnhMetaFile: encapsulation of Win32 HENHMETAFILE // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxEnhMetaFile : public wxGDIObject +class WXDLLIMPEXP_CORE wxEnhMetaFile : public wxGDIObject { public: wxEnhMetaFile(const wxString& file = wxEmptyString) : m_filename(file) @@ -73,7 +73,7 @@ private: // wxEnhMetaFileDC: allows to create a wxEnhMetaFile // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxEnhMetaFileDC : public wxDC +class WXDLLIMPEXP_CORE wxEnhMetaFileDC : public wxDC { public: // the ctor parameters specify the filename (empty for memory metafiles), @@ -99,7 +99,7 @@ private: // notice that we want to support both CF_METAFILEPICT and CF_ENHMETAFILE and // so we derive from wxDataObject and not from wxDataObjectSimple -class WXDLLEXPORT wxEnhMetaFileDataObject : public wxDataObject +class WXDLLIMPEXP_CORE wxEnhMetaFileDataObject : public wxDataObject { public: // ctors @@ -137,7 +137,7 @@ protected: // CF_ENHMETAFILE // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxEnhMetaFileSimpleDataObject : public wxDataObjectSimple +class WXDLLIMPEXP_CORE wxEnhMetaFileSimpleDataObject : public wxDataObjectSimple { public: // ctors diff --git a/include/wx/palmos/evtloop.h b/include/wx/palmos/evtloop.h index fcc4ce9ef8..6cd10d6245 100644 --- a/include/wx/palmos/evtloop.h +++ b/include/wx/palmos/evtloop.h @@ -16,7 +16,7 @@ // wxEventLoop // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxGUIEventLoop : public wxEventLoopBase +class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxEventLoopBase { public: wxGUIEventLoop(); diff --git a/include/wx/palmos/fdrepdlg.h b/include/wx/palmos/fdrepdlg.h index b09971e0fd..e28870f29a 100644 --- a/include/wx/palmos/fdrepdlg.h +++ b/include/wx/palmos/fdrepdlg.h @@ -16,7 +16,7 @@ // wxFindReplaceDialog: dialog for searching / replacing text // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFindReplaceDialog : public wxFindReplaceDialogBase +class WXDLLIMPEXP_CORE wxFindReplaceDialog : public wxFindReplaceDialogBase { public: // ctors and such diff --git a/include/wx/palmos/filedlg.h b/include/wx/palmos/filedlg.h index 3baac18463..ca9ecafbd2 100644 --- a/include/wx/palmos/filedlg.h +++ b/include/wx/palmos/filedlg.h @@ -16,7 +16,7 @@ // wxFileDialog //------------------------------------------------------------------------- -class WXDLLEXPORT wxFileDialog: public wxFileDialogBase +class WXDLLIMPEXP_CORE wxFileDialog: public wxFileDialogBase { public: wxFileDialog(wxWindow *parent, diff --git a/include/wx/palmos/font.h b/include/wx/palmos/font.h index 17385a29a9..7319b4638f 100644 --- a/include/wx/palmos/font.h +++ b/include/wx/palmos/font.h @@ -18,7 +18,7 @@ // wxFont // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFont : public wxFontBase +class WXDLLIMPEXP_CORE wxFont : public wxFontBase { public: // ctors and such diff --git a/include/wx/palmos/fontdlg.h b/include/wx/palmos/fontdlg.h index 7fb66d71e5..3c3dcbf85f 100644 --- a/include/wx/palmos/fontdlg.h +++ b/include/wx/palmos/fontdlg.h @@ -16,7 +16,7 @@ // wxFontDialog // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFontDialog : public wxFontDialogBase +class WXDLLIMPEXP_CORE wxFontDialog : public wxFontDialogBase { public: wxFontDialog() : wxFontDialogBase() { /* must be Create()d later */ } diff --git a/include/wx/palmos/frame.h b/include/wx/palmos/frame.h index 9f1d190bf4..ed9166a712 100644 --- a/include/wx/palmos/frame.h +++ b/include/wx/palmos/frame.h @@ -12,7 +12,7 @@ #ifndef _WX_FRAME_H_ #define _WX_FRAME_H_ -class WXDLLEXPORT wxFrame : public wxFrameBase +class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase { public: // construction diff --git a/include/wx/palmos/gauge.h b/include/wx/palmos/gauge.h index b3de89d800..97c413b684 100644 --- a/include/wx/palmos/gauge.h +++ b/include/wx/palmos/gauge.h @@ -14,10 +14,10 @@ #if wxUSE_GAUGE -WXDLLEXPORT_DATA(extern const wxChar) wxGaugeNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const wxChar) wxGaugeNameStr[]; // Group box -class WXDLLEXPORT wxGauge : public wxGaugeBase +class WXDLLIMPEXP_CORE wxGauge : public wxGaugeBase { public: wxGauge() { } diff --git a/include/wx/palmos/gdiimage.h b/include/wx/palmos/gdiimage.h index debcecebfa..512d373a28 100644 --- a/include/wx/palmos/gdiimage.h +++ b/include/wx/palmos/gdiimage.h @@ -30,7 +30,7 @@ WX_DECLARE_EXPORTED_LIST(wxGDIImageHandler, wxGDIImageHandlerList); // wxGDIImageRefData: common data fields for all derived classes // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxGDIImageRefData : public wxGDIRefData +class WXDLLIMPEXP_CORE wxGDIImageRefData : public wxGDIRefData { public: wxGDIImageRefData() @@ -70,7 +70,7 @@ public: // wxGDIImageHandler: a class which knows how to load/save wxGDIImages. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxGDIImageHandler : public wxObject +class WXDLLIMPEXP_CORE wxGDIImageHandler : public wxObject { public: // ctor @@ -117,7 +117,7 @@ protected: // format. It also falls back to wxImage if no appropriate image is found. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxGDIImage : public wxGDIObject +class WXDLLIMPEXP_CORE wxGDIImage : public wxGDIObject { public: // handlers list interface diff --git a/include/wx/palmos/help.h b/include/wx/palmos/help.h index 3b4e831fdb..379c5bf7d9 100644 --- a/include/wx/palmos/help.h +++ b/include/wx/palmos/help.h @@ -18,7 +18,7 @@ #include "wx/helpbase.h" -class WXDLLEXPORT wxPalmHelpController: public wxHelpControllerBase +class WXDLLIMPEXP_CORE wxPalmHelpController: public wxHelpControllerBase { DECLARE_CLASS(wxPalmHelpController) diff --git a/include/wx/palmos/imaglist.h b/include/wx/palmos/imaglist.h index 5b1cc588ce..7f910d68d9 100644 --- a/include/wx/palmos/imaglist.h +++ b/include/wx/palmos/imaglist.h @@ -32,7 +32,7 @@ // now, the app must take care of ownership issues. That is, the // image lists must be explicitly deleted after the control(s) that uses them // is (are) deleted, or when the app exits. -class WXDLLEXPORT wxImageList : public wxObject +class WXDLLIMPEXP_CORE wxImageList : public wxObject { public: /* diff --git a/include/wx/palmos/listbox.h b/include/wx/palmos/listbox.h index 1bf96f567a..9cbd0a71a2 100644 --- a/include/wx/palmos/listbox.h +++ b/include/wx/palmos/listbox.h @@ -34,7 +34,7 @@ class wxArrayInt; // List box control // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxListBox : public wxListBoxBase +class WXDLLIMPEXP_CORE wxListBox : public wxListBoxBase { public: // ctors and such diff --git a/include/wx/palmos/listctrl.h b/include/wx/palmos/listctrl.h index 7309d66b70..88372b49ad 100644 --- a/include/wx/palmos/listctrl.h +++ b/include/wx/palmos/listctrl.h @@ -73,7 +73,7 @@ class WXDLLIMPEXP_FWD_CORE wxImageList; */ -class WXDLLEXPORT wxListCtrl: public wxControl +class WXDLLIMPEXP_CORE wxListCtrl: public wxControl { public: /* diff --git a/include/wx/palmos/mdi.h b/include/wx/palmos/mdi.h index 2743319b68..e4d3f07c86 100644 --- a/include/wx/palmos/mdi.h +++ b/include/wx/palmos/mdi.h @@ -14,7 +14,7 @@ #include "wx/frame.h" -WXDLLEXPORT_DATA(extern const wxChar) wxStatusLineNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const wxChar) wxStatusLineNameStr[]; class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow; class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame; @@ -23,7 +23,7 @@ class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame; // wxMDIParentFrame // --------------------------------------------------------------------------- -class WXDLLEXPORT wxMDIParentFrame : public wxFrame +class WXDLLIMPEXP_CORE wxMDIParentFrame : public wxFrame { public: wxMDIParentFrame(); @@ -110,7 +110,7 @@ private: // wxMDIChildFrame // --------------------------------------------------------------------------- -class WXDLLEXPORT wxMDIChildFrame : public wxFrame +class WXDLLIMPEXP_CORE wxMDIChildFrame : public wxFrame { public: wxMDIChildFrame() { Init(); } @@ -183,7 +183,7 @@ private: // wxMDIClientWindow // --------------------------------------------------------------------------- -class WXDLLEXPORT wxMDIClientWindow : public wxWindow +class WXDLLIMPEXP_CORE wxMDIClientWindow : public wxWindow { public: wxMDIClientWindow() { Init(); } diff --git a/include/wx/palmos/menu.h b/include/wx/palmos/menu.h index 6859d70bbb..fd27224ec0 100644 --- a/include/wx/palmos/menu.h +++ b/include/wx/palmos/menu.h @@ -31,7 +31,7 @@ class WXDLLIMPEXP_FWD_CORE wxToolBar; // Menu // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMenu : public wxMenuBase +class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase { public: // ctors & dtor @@ -103,7 +103,7 @@ private: // Menu Bar (a la Windows) // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMenuInfo : public wxObject +class WXDLLIMPEXP_CORE wxMenuInfo : public wxObject { public : wxMenuInfo() { m_menu = NULL ; } @@ -122,7 +122,7 @@ private : WX_DECLARE_EXPORTED_LIST(wxMenuInfo, wxMenuInfoList ); -class WXDLLEXPORT wxMenuBar : public wxMenuBarBase +class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase { public: // ctors & dtor diff --git a/include/wx/palmos/menuitem.h b/include/wx/palmos/menuitem.h index df01b0092f..b9cec3003f 100644 --- a/include/wx/palmos/menuitem.h +++ b/include/wx/palmos/menuitem.h @@ -24,7 +24,7 @@ // wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMenuItem : public wxMenuItemBase +class WXDLLIMPEXP_CORE wxMenuItem : public wxMenuItemBase #if wxUSE_OWNER_DRAWN , public wxOwnerDrawn #endif diff --git a/include/wx/palmos/metafile.h b/include/wx/palmos/metafile.h index 3a0c60eb8a..0986bcb4ba 100644 --- a/include/wx/palmos/metafile.h +++ b/include/wx/palmos/metafile.h @@ -25,7 +25,7 @@ class WXDLLIMPEXP_FWD_CORE wxMetafile; -class WXDLLEXPORT wxMetafileRefData: public wxGDIRefData +class WXDLLIMPEXP_CORE wxMetafileRefData: public wxGDIRefData { public: wxMetafileRefData(); @@ -43,7 +43,7 @@ public: #define M_METAFILEDATA ((wxMetafileRefData *)m_refData) -class WXDLLEXPORT wxMetafile: public wxGDIObject +class WXDLLIMPEXP_CORE wxMetafile: public wxGDIObject { public: wxMetafile(const wxString& file = wxEmptyString); @@ -73,7 +73,7 @@ private: DECLARE_DYNAMIC_CLASS(wxMetafile) }; -class WXDLLEXPORT wxMetafileDC: public wxDC +class WXDLLIMPEXP_CORE wxMetafileDC: public wxDC { public: // Don't supply origin and extent @@ -115,10 +115,10 @@ private: */ // No origin or extent -bool WXDLLEXPORT wxMakeMetafilePlaceable(const wxString& filename, float scale = 1.0); +bool WXDLLIMPEXP_CORE wxMakeMetafilePlaceable(const wxString& filename, float scale = 1.0); // Optional origin and extent -bool WXDLLEXPORT wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y1, int x2, int y2, float scale = 1.0, bool useOriginAndExtent = TRUE); +bool WXDLLIMPEXP_CORE wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y1, int x2, int y2, float scale = 1.0, bool useOriginAndExtent = TRUE); // ---------------------------------------------------------------------------- // wxMetafileDataObject is a specialization of wxDataObject for metafile data @@ -126,7 +126,7 @@ bool WXDLLEXPORT wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y #if wxUSE_DRAG_AND_DROP -class WXDLLEXPORT wxMetafileDataObject : public wxDataObjectSimple +class WXDLLIMPEXP_CORE wxMetafileDataObject : public wxDataObjectSimple { public: // ctors diff --git a/include/wx/palmos/minifram.h b/include/wx/palmos/minifram.h index 64862e1a64..59f6442e6e 100644 --- a/include/wx/palmos/minifram.h +++ b/include/wx/palmos/minifram.h @@ -14,7 +14,7 @@ #include "wx/frame.h" -class WXDLLEXPORT wxMiniFrame : public wxFrame +class WXDLLIMPEXP_CORE wxMiniFrame : public wxFrame { public: wxMiniFrame() { } diff --git a/include/wx/palmos/msgdlg.h b/include/wx/palmos/msgdlg.h index 2fadd44d00..e337c0c7e3 100644 --- a/include/wx/palmos/msgdlg.h +++ b/include/wx/palmos/msgdlg.h @@ -12,7 +12,7 @@ #ifndef _WX_MSGBOXDLG_H_ #define _WX_MSGBOXDLG_H_ -class WXDLLEXPORT wxMessageDialog : public wxMessageDialogBase +class WXDLLIMPEXP_CORE wxMessageDialog : public wxMessageDialogBase { public: wxMessageDialog(wxWindow *parent, diff --git a/include/wx/palmos/mslu.h b/include/wx/palmos/mslu.h index 084e5d74e8..908d22fd80 100644 --- a/include/wx/palmos/mslu.h +++ b/include/wx/palmos/mslu.h @@ -33,7 +33,7 @@ inline bool wxUsingUnicowsDll() #if wxUSE_GUI -WXDLLEXPORT int wxMSLU_DrawStateW(WXHDC dc, WXHBRUSH br, WXFARPROC outputFunc, +WXDLLIMPEXP_CORE int wxMSLU_DrawStateW(WXHDC dc, WXHBRUSH br, WXFARPROC outputFunc, WXLPARAM lData, WXWPARAM wData, int x, int y, int cx, int cy, unsigned int flags); @@ -41,10 +41,10 @@ WXDLLEXPORT int wxMSLU_DrawStateW(WXHDC dc, WXHBRUSH br, WXFARPROC outputFunc, wxMSLU_DrawStateW((WXHDC)dc,(WXHBRUSH)br,(WXFARPROC)func, \ ld, wd, x, y, cx, cy, flags) -WXDLLEXPORT int wxMSLU_GetOpenFileNameW(void *ofn); +WXDLLIMPEXP_CORE int wxMSLU_GetOpenFileNameW(void *ofn); #define GetOpenFileNameW(ofn) wxMSLU_GetOpenFileNameW((void*)ofn) -WXDLLEXPORT int wxMSLU_GetSaveFileNameW(void *ofn); +WXDLLIMPEXP_CORE int wxMSLU_GetSaveFileNameW(void *ofn); #define GetSaveFileNameW(ofn) wxMSLU_GetSaveFileNameW((void*)ofn) #endif @@ -53,8 +53,8 @@ WXDLLEXPORT int wxMSLU_GetSaveFileNameW(void *ofn); // Missing libc file manipulation functions in Win9x //------------------------------------------------------------------------ -WXDLLEXPORT int wxMSLU__trename(const wxChar *oldname, const wxChar *newname); -WXDLLEXPORT int wxMSLU__tremove(const wxChar *name); +WXDLLIMPEXP_CORE int wxMSLU__trename(const wxChar *oldname, const wxChar *newname); +WXDLLIMPEXP_CORE int wxMSLU__tremove(const wxChar *name); #endif // wxUSE_UNICODE_MSLU diff --git a/include/wx/palmos/notebook.h b/include/wx/palmos/notebook.h index f4ef524cda..5a6b32e909 100644 --- a/include/wx/palmos/notebook.h +++ b/include/wx/palmos/notebook.h @@ -24,7 +24,7 @@ // wxNotebook // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxNotebookPageInfo : public wxObject +class WXDLLIMPEXP_CORE wxNotebookPageInfo : public wxObject { public : wxNotebookPageInfo() { m_page = NULL ; m_imageId = -1 ; m_selected = false ; } @@ -48,7 +48,7 @@ private : WX_DECLARE_EXPORTED_LIST(wxNotebookPageInfo, wxNotebookPageInfoList ); -class WXDLLEXPORT wxNotebook : public wxNotebookBase +class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase { public: // ctors diff --git a/include/wx/palmos/palette.h b/include/wx/palmos/palette.h index 86c6a6970f..f4c1ad4229 100644 --- a/include/wx/palmos/palette.h +++ b/include/wx/palmos/palette.h @@ -16,7 +16,7 @@ class WXDLLIMPEXP_FWD_CORE wxPalette; -class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData +class WXDLLIMPEXP_CORE wxPaletteRefData: public wxGDIRefData { friend class WXDLLIMPEXP_FWD_CORE wxPalette; public: @@ -28,7 +28,7 @@ protected: #define M_PALETTEDATA ((wxPaletteRefData *)m_refData) -class WXDLLEXPORT wxPalette: public wxPaletteBase +class WXDLLIMPEXP_CORE wxPalette: public wxPaletteBase { DECLARE_DYNAMIC_CLASS(wxPalette) diff --git a/include/wx/palmos/pen.h b/include/wx/palmos/pen.h index 0afaf1c925..aa8e644314 100644 --- a/include/wx/palmos/pen.h +++ b/include/wx/palmos/pen.h @@ -21,7 +21,7 @@ typedef WXDWORD wxMSWDash; class WXDLLIMPEXP_FWD_CORE wxPen; // VZ: this class should be made private -class WXDLLEXPORT wxPenRefData : public wxGDIRefData +class WXDLLIMPEXP_CORE wxPenRefData : public wxGDIRefData { public: wxPenRefData(); @@ -71,7 +71,7 @@ private: // Pen // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxPen : public wxPenBase +class WXDLLIMPEXP_CORE wxPen : public wxPenBase { public: wxPen(); diff --git a/include/wx/palmos/popupwin.h b/include/wx/palmos/popupwin.h index 0317f5172f..ec04565614 100644 --- a/include/wx/palmos/popupwin.h +++ b/include/wx/palmos/popupwin.h @@ -16,7 +16,7 @@ // wxPopupWindow // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxPopupWindow : public wxPopupWindowBase +class WXDLLIMPEXP_CORE wxPopupWindow : public wxPopupWindowBase { public: wxPopupWindow() { } diff --git a/include/wx/palmos/printdlg.h b/include/wx/palmos/printdlg.h index 3276d0e6f0..9ba71df71b 100644 --- a/include/wx/palmos/printdlg.h +++ b/include/wx/palmos/printdlg.h @@ -23,7 +23,7 @@ class WXDLLIMPEXP_FWD_CORE wxDC; // wxPrinterDialog: the common dialog for printing. // --------------------------------------------------------------------------- -class WXDLLEXPORT wxPrintDialog : public wxDialog +class WXDLLIMPEXP_CORE wxPrintDialog : public wxDialog { DECLARE_DYNAMIC_CLASS(wxPrintDialog) @@ -49,7 +49,7 @@ private: DECLARE_NO_COPY_CLASS(wxPrintDialog) }; -class WXDLLEXPORT wxPageSetupDialog: public wxDialog +class WXDLLIMPEXP_CORE wxPageSetupDialog: public wxDialog { DECLARE_DYNAMIC_CLASS(wxPageSetupDialog) diff --git a/include/wx/palmos/printpalm.h b/include/wx/palmos/printpalm.h index ba2af97c36..545643082b 100644 --- a/include/wx/palmos/printpalm.h +++ b/include/wx/palmos/printpalm.h @@ -18,7 +18,7 @@ // Represents the printer: manages printing a wxPrintout object // --------------------------------------------------------------------------- -class WXDLLEXPORT wxPalmPrinter : public wxPrinterBase +class WXDLLIMPEXP_CORE wxPalmPrinter : public wxPrinterBase { DECLARE_DYNAMIC_CLASS(wxPalmPrinter) @@ -43,7 +43,7 @@ private: // wxPrintout. // --------------------------------------------------------------------------- -class WXDLLEXPORT wxPalmPrintPreview : public wxPrintPreviewBase +class WXDLLIMPEXP_CORE wxPalmPrintPreview : public wxPrintPreviewBase { public: wxPalmPrintPreview(wxPrintout *printout, diff --git a/include/wx/palmos/private/timer.h b/include/wx/palmos/private/timer.h index 08847ee28b..feac2d5e94 100644 --- a/include/wx/palmos/private/timer.h +++ b/include/wx/palmos/private/timer.h @@ -14,7 +14,7 @@ #include "wx/private/timer.h" -class WXDLLEXPORT wxPalmOSTimerImpl : public wxTimerImpl +class WXDLLIMPEXP_CORE wxPalmOSTimerImpl : public wxTimerImpl { friend void wxProcessTimer(wxTimer& timer); diff --git a/include/wx/palmos/progdlg.h b/include/wx/palmos/progdlg.h index fa897d81f3..a6de9ec0b7 100644 --- a/include/wx/palmos/progdlg.h +++ b/include/wx/palmos/progdlg.h @@ -18,7 +18,7 @@ #include "wx/dialog.h" -class WXDLLEXPORT wxProgressDialog : public wxDialog +class WXDLLIMPEXP_CORE wxProgressDialog : public wxDialog { DECLARE_DYNAMIC_CLASS(wxProgressDialog) public: diff --git a/include/wx/palmos/radiobox.h b/include/wx/palmos/radiobox.h index 4b34521de5..e0b2ec666b 100644 --- a/include/wx/palmos/radiobox.h +++ b/include/wx/palmos/radiobox.h @@ -19,7 +19,7 @@ class WXDLLIMPEXP_FWD_CORE wxRadioButton; // wxRadioBox // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxRadioBox : public wxControl, public wxRadioBoxBase +class WXDLLIMPEXP_CORE wxRadioBox : public wxControl, public wxRadioBoxBase { public: wxRadioBox():m_radios(wxKEY_INTEGER,32) diff --git a/include/wx/palmos/radiobut.h b/include/wx/palmos/radiobut.h index 25c36d35e8..7c6f4f201c 100644 --- a/include/wx/palmos/radiobut.h +++ b/include/wx/palmos/radiobut.h @@ -12,7 +12,7 @@ #ifndef _WX_RADIOBUT_H_ #define _WX_RADIOBUT_H_ -class WXDLLEXPORT wxRadioButton: public wxControl +class WXDLLIMPEXP_CORE wxRadioButton: public wxControl { public: // ctors and creation functions diff --git a/include/wx/palmos/region.h b/include/wx/palmos/region.h index ce0586c21b..9ca01e8071 100644 --- a/include/wx/palmos/region.h +++ b/include/wx/palmos/region.h @@ -12,7 +12,7 @@ #ifndef _WX_PALMOS_REGION_H_ #define _WX_PALMOS_REGION_H_ -class WXDLLEXPORT wxRegion : public wxRegionWithCombine +class WXDLLIMPEXP_CORE wxRegion : public wxRegionWithCombine { public: wxRegion(); @@ -60,7 +60,7 @@ protected: DECLARE_DYNAMIC_CLASS(wxRegion) }; -class WXDLLEXPORT wxRegionIterator : public wxObject +class WXDLLIMPEXP_CORE wxRegionIterator : public wxObject { public: wxRegionIterator() { Init(); } diff --git a/include/wx/palmos/scrolbar.h b/include/wx/palmos/scrolbar.h index edcc06dca0..e0c3624fa9 100644 --- a/include/wx/palmos/scrolbar.h +++ b/include/wx/palmos/scrolbar.h @@ -13,7 +13,7 @@ #define _WX_SCROLBAR_H_ // Scrollbar item -class WXDLLEXPORT wxScrollBar: public wxScrollBarBase +class WXDLLIMPEXP_CORE wxScrollBar: public wxScrollBarBase { public: wxScrollBar() { m_pageSize = 0; m_viewSize = 0; m_objectSize = 0; } diff --git a/include/wx/palmos/slider.h b/include/wx/palmos/slider.h index 263e4a7153..078d5d23ec 100644 --- a/include/wx/palmos/slider.h +++ b/include/wx/palmos/slider.h @@ -13,7 +13,7 @@ #define _SLIDERPALM_H_ // Slider -class WXDLLEXPORT wxSlider : public wxSliderBase +class WXDLLIMPEXP_CORE wxSlider : public wxSliderBase { public: wxSlider() diff --git a/include/wx/palmos/spinbutt.h b/include/wx/palmos/spinbutt.h index c745738edc..e6cc319c44 100644 --- a/include/wx/palmos/spinbutt.h +++ b/include/wx/palmos/spinbutt.h @@ -15,7 +15,7 @@ #include "wx/control.h" #include "wx/event.h" -class WXDLLEXPORT wxSpinButton : public wxSpinButtonBase +class WXDLLIMPEXP_CORE wxSpinButton : public wxSpinButtonBase { public: // construction diff --git a/include/wx/palmos/spinctrl.h b/include/wx/palmos/spinctrl.h index d0237f1346..677c340625 100644 --- a/include/wx/palmos/spinctrl.h +++ b/include/wx/palmos/spinctrl.h @@ -25,7 +25,7 @@ WX_DEFINE_EXPORTED_ARRAY_PTR(wxSpinCtrl *, wxArraySpins); // control is clicked. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxSpinCtrl : public wxSpinButton +class WXDLLIMPEXP_CORE wxSpinCtrl : public wxSpinButton { public: wxSpinCtrl() { } diff --git a/include/wx/palmos/statbmp.h b/include/wx/palmos/statbmp.h index 4372ce743b..b54ec30d9c 100644 --- a/include/wx/palmos/statbmp.h +++ b/include/wx/palmos/statbmp.h @@ -16,10 +16,10 @@ #include "wx/icon.h" #include "wx/bitmap.h" -WXDLLEXPORT_DATA(extern const wxChar) wxStaticBitmapNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const wxChar) wxStaticBitmapNameStr[]; // a control showing an icon or a bitmap -class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase +class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase { public: wxStaticBitmap() { Init(); } diff --git a/include/wx/palmos/statbox.h b/include/wx/palmos/statbox.h index 14972db4cf..27931fae5a 100644 --- a/include/wx/palmos/statbox.h +++ b/include/wx/palmos/statbox.h @@ -13,7 +13,7 @@ #define _WX_STATBOX_H_ // Group box -class WXDLLEXPORT wxStaticBox : public wxStaticBoxBase +class WXDLLIMPEXP_CORE wxStaticBox : public wxStaticBoxBase { public: wxStaticBox() { } diff --git a/include/wx/palmos/statline.h b/include/wx/palmos/statline.h index 3101682bea..88854ee9b2 100644 --- a/include/wx/palmos/statline.h +++ b/include/wx/palmos/statline.h @@ -16,7 +16,7 @@ // wxStaticLine // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxStaticLine : public wxStaticLineBase +class WXDLLIMPEXP_CORE wxStaticLine : public wxStaticLineBase { public: // constructors and pseudo-constructors diff --git a/include/wx/palmos/stattext.h b/include/wx/palmos/stattext.h index 50aa42f64d..eb1c9d3ba7 100644 --- a/include/wx/palmos/stattext.h +++ b/include/wx/palmos/stattext.h @@ -12,7 +12,7 @@ #ifndef _WX_STATTEXT_H_ #define _WX_STATTEXT_H_ -class WXDLLEXPORT wxStaticText : public wxStaticTextBase +class WXDLLIMPEXP_CORE wxStaticText : public wxStaticTextBase { public: wxStaticText() { } diff --git a/include/wx/palmos/statusbr.h b/include/wx/palmos/statusbr.h index ee376f8841..af51252d21 100644 --- a/include/wx/palmos/statusbr.h +++ b/include/wx/palmos/statusbr.h @@ -14,7 +14,7 @@ #if wxUSE_NATIVE_STATUSBAR -class WXDLLEXPORT wxStatusBarPalm : public wxStatusBarBase +class WXDLLIMPEXP_CORE wxStatusBarPalm : public wxStatusBarBase { public: // ctors and such diff --git a/include/wx/palmos/tabctrl.h b/include/wx/palmos/tabctrl.h index f0a5207017..6a2b60eec1 100644 --- a/include/wx/palmos/tabctrl.h +++ b/include/wx/palmos/tabctrl.h @@ -14,7 +14,7 @@ class wxImageList; -// WXDLLEXPORT_DATA(extern const wxChar) wxToolBarNameStr[]; +// WXDLLIMPEXP_DATA_CORE(extern const wxChar) wxToolBarNameStr[]; /* * Flags returned by HitTest @@ -25,7 +25,7 @@ class wxImageList; #define wxTAB_HITTEST_ONLABEL 4 #define wxTAB_HITTEST_ONITEM 6 -class WXDLLEXPORT wxTabCtrl: public wxControl +class WXDLLIMPEXP_CORE wxTabCtrl: public wxControl { DECLARE_DYNAMIC_CLASS(wxTabCtrl) public: @@ -120,7 +120,7 @@ DECLARE_EVENT_TABLE() DECLARE_NO_COPY_CLASS(wxTabCtrl) }; -class WXDLLEXPORT wxTabEvent : public wxNotifyEvent +class WXDLLIMPEXP_CORE wxTabEvent : public wxNotifyEvent { public: wxTabEvent(wxEventType commandType = wxEVT_NULL, int id = 0, diff --git a/include/wx/palmos/textctrl.h b/include/wx/palmos/textctrl.h index 930890eee8..4d9fc4c414 100644 --- a/include/wx/palmos/textctrl.h +++ b/include/wx/palmos/textctrl.h @@ -12,7 +12,7 @@ #ifndef _WX_TEXTCTRL_H_ #define _WX_TEXTCTRL_H_ -class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase +class WXDLLIMPEXP_CORE wxTextCtrl : public wxTextCtrlBase { public: // creation diff --git a/include/wx/palmos/tglbtn.h b/include/wx/palmos/tglbtn.h index 8e0b1d0453..ff31ea7e2a 100644 --- a/include/wx/palmos/tglbtn.h +++ b/include/wx/palmos/tglbtn.h @@ -14,10 +14,10 @@ #define _WX_TOGGLEBUTTON_H_ #include "wx/checkbox.h" // wxCheckBoxNameStr, in Datacmn.cpp -//WXDLLEXPORT_DATA(extern const wxChar) wxCheckBoxNameStr[]; +//WXDLLIMPEXP_DATA_CORE(extern const wxChar) wxCheckBoxNameStr[]; // Checkbox item (single checkbox) -class WXDLLEXPORT wxToggleButton : public wxToggleButtonBase +class WXDLLIMPEXP_CORE wxToggleButton : public wxToggleButtonBase { public: wxToggleButton() {} diff --git a/include/wx/palmos/toolbar.h b/include/wx/palmos/toolbar.h index 4e4d85455e..27b9291093 100644 --- a/include/wx/palmos/toolbar.h +++ b/include/wx/palmos/toolbar.h @@ -16,7 +16,7 @@ #include "wx/dynarray.h" -class WXDLLEXPORT wxToolBar : public wxToolBarBase +class WXDLLIMPEXP_CORE wxToolBar : public wxToolBarBase { public: // ctors and dtor diff --git a/include/wx/palmos/tooltip.h b/include/wx/palmos/tooltip.h index a7af972c54..31b05273cc 100644 --- a/include/wx/palmos/tooltip.h +++ b/include/wx/palmos/tooltip.h @@ -12,7 +12,7 @@ #ifndef _WX_PALMOS_TOOLTIP_H_ #define _WX_PALMOS_TOOLTIP_H_ -class WXDLLEXPORT wxToolTip : public wxObject +class WXDLLIMPEXP_CORE wxToolTip : public wxObject { public: // ctor & dtor diff --git a/include/wx/palmos/toplevel.h b/include/wx/palmos/toplevel.h index a931c9e3b9..c690943259 100644 --- a/include/wx/palmos/toplevel.h +++ b/include/wx/palmos/toplevel.h @@ -16,7 +16,7 @@ // wxTopLevelWindowPalm // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxTopLevelWindowPalm : public wxTopLevelWindowBase +class WXDLLIMPEXP_CORE wxTopLevelWindowPalm : public wxTopLevelWindowBase { public: // constructors and such diff --git a/include/wx/palmos/treectrl.h b/include/wx/palmos/treectrl.h index 7c235454df..9349196ef7 100644 --- a/include/wx/palmos/treectrl.h +++ b/include/wx/palmos/treectrl.h @@ -24,8 +24,8 @@ #include "wx/hashmap.h" // fwd decl -class WXDLLEXPORT wxImageList; -class WXDLLEXPORT wxDragImage; +class WXDLLIMPEXP_CORE wxImageList; +class WXDLLIMPEXP_CORE wxDragImage; struct WXDLLIMPEXP_FWD_CORE wxTreeViewItem; // hash storing attributes for our items @@ -35,7 +35,7 @@ WX_DECLARE_EXPORTED_VOIDPTR_HASH_MAP(wxTreeItemAttr *, wxMapTreeAttr); // wxTreeCtrl // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxTreeCtrl : public wxControl +class WXDLLIMPEXP_CORE wxTreeCtrl : public wxControl { public: // creation diff --git a/include/wx/palmos/window.h b/include/wx/palmos/window.h index 25965867b9..09c8d5dd9f 100644 --- a/include/wx/palmos/window.h +++ b/include/wx/palmos/window.h @@ -27,7 +27,7 @@ // wxWindow declaration for Palm // --------------------------------------------------------------------------- -class WXDLLEXPORT wxWindowPalm : public wxWindowBase +class WXDLLIMPEXP_CORE wxWindowPalm : public wxWindowBase { public: wxWindowPalm() { Init(); } diff --git a/include/wx/paper.h b/include/wx/paper.h index 2d2bf3f7b5..5b42a80bed 100644 --- a/include/wx/paper.h +++ b/include/wx/paper.h @@ -30,7 +30,7 @@ #define WXADDPAPER(paperId, platformId, name, w, h) AddPaperType(paperId, 0, name, w, h) #endif -class WXDLLEXPORT wxPrintPaperType: public wxObject +class WXDLLIMPEXP_CORE wxPrintPaperType: public wxObject { public: wxPrintPaperType(); @@ -70,7 +70,7 @@ WX_DECLARE_STRING_HASH_MAP(wxPrintPaperType*, wxStringToPrintPaperTypeHashMap); class WXDLLIMPEXP_FWD_CORE wxPrintPaperTypeList; -class WXDLLEXPORT wxPrintPaperDatabase +class WXDLLIMPEXP_CORE wxPrintPaperDatabase { public: wxPrintPaperDatabase(); @@ -115,7 +115,7 @@ private: // DECLARE_DYNAMIC_CLASS(wxPrintPaperDatabase) }; -extern WXDLLEXPORT_DATA(wxPrintPaperDatabase*) wxThePrintPaperDatabase; +extern WXDLLIMPEXP_DATA_CORE(wxPrintPaperDatabase*) wxThePrintPaperDatabase; #endif diff --git a/include/wx/pen.h b/include/wx/pen.h index b94486f364..379f560c44 100644 --- a/include/wx/pen.h +++ b/include/wx/pen.h @@ -62,7 +62,7 @@ enum wxPenCap }; -class WXDLLEXPORT wxPenBase : public wxGDIObject +class WXDLLIMPEXP_CORE wxPenBase : public wxGDIObject { public: virtual ~wxPenBase() { } @@ -130,7 +130,7 @@ public: #endif }; -extern WXDLLEXPORT_DATA(wxPenList*) wxThePenList; +extern WXDLLIMPEXP_DATA_CORE(wxPenList*) wxThePenList; // provide comparison operators to allow code such as // diff --git a/include/wx/pickerbase.h b/include/wx/pickerbase.h index e8c6cf0d8e..1982838cc2 100644 --- a/include/wx/pickerbase.h +++ b/include/wx/pickerbase.h @@ -19,7 +19,7 @@ class WXDLLIMPEXP_FWD_CORE wxTextCtrl; class WXDLLIMPEXP_FWD_CORE wxToolTip; -extern WXDLLEXPORT_DATA(const char) wxButtonNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxButtonNameStr[]; // ---------------------------------------------------------------------------- // wxPickerBase is the base class for the picker controls which support diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h index 72f2518c26..6e10cc2c36 100644 --- a/include/wx/popupwin.h +++ b/include/wx/popupwin.h @@ -23,7 +23,7 @@ // combobox popups and such. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxPopupWindowBase : public wxNonOwnedWindow +class WXDLLIMPEXP_CORE wxPopupWindowBase : public wxNonOwnedWindow { public: wxPopupWindowBase() { } @@ -82,7 +82,7 @@ public: class WXDLLIMPEXP_FWD_CORE wxPopupWindowHandler; class WXDLLIMPEXP_FWD_CORE wxPopupFocusHandler; -class WXDLLEXPORT wxPopupTransientWindow : public wxPopupWindow +class WXDLLIMPEXP_CORE wxPopupTransientWindow : public wxPopupWindow { public: // ctors @@ -162,7 +162,7 @@ protected: class WXDLLIMPEXP_FWD_CORE wxComboBox; class WXDLLIMPEXP_FWD_CORE wxComboCtrl; -class WXDLLEXPORT wxPopupComboWindow : public wxPopupTransientWindow +class WXDLLIMPEXP_CORE wxPopupComboWindow : public wxPopupTransientWindow { public: wxPopupComboWindow() { m_combo = NULL; } diff --git a/include/wx/printdlg.h b/include/wx/printdlg.h index 6079f4a100..1889279904 100644 --- a/include/wx/printdlg.h +++ b/include/wx/printdlg.h @@ -26,7 +26,7 @@ // wxPrintDialogBase: interface for the dialog for printing // --------------------------------------------------------------------------- -class WXDLLEXPORT wxPrintDialogBase : public wxDialog +class WXDLLIMPEXP_CORE wxPrintDialogBase : public wxDialog { public: wxPrintDialogBase() { } @@ -50,7 +50,7 @@ private: // wxPrintDialog: the dialog for printing. // --------------------------------------------------------------------------- -class WXDLLEXPORT wxPrintDialog : public wxObject +class WXDLLIMPEXP_CORE wxPrintDialog : public wxObject { public: wxPrintDialog(wxWindow *parent, wxPrintDialogData* data = NULL); @@ -75,7 +75,7 @@ private: // wxPageSetupDialogBase: interface for the page setup dialog // --------------------------------------------------------------------------- -class WXDLLEXPORT wxPageSetupDialogBase: public wxDialog +class WXDLLIMPEXP_CORE wxPageSetupDialogBase: public wxDialog { public: wxPageSetupDialogBase() { } @@ -97,7 +97,7 @@ private: // wxPageSetupDialog: the page setup dialog // --------------------------------------------------------------------------- -class WXDLLEXPORT wxPageSetupDialog: public wxObject +class WXDLLIMPEXP_CORE wxPageSetupDialog: public wxObject { public: wxPageSetupDialog(wxWindow *parent, wxPageSetupDialogData *data = NULL); diff --git a/include/wx/prntbase.h b/include/wx/prntbase.h index 1dd8637927..b20a9f6cd5 100644 --- a/include/wx/prntbase.h +++ b/include/wx/prntbase.h @@ -55,7 +55,7 @@ enum wxPrinterError // wxPrintFactory //---------------------------------------------------------------------------- -class WXDLLEXPORT wxPrintFactory +class WXDLLIMPEXP_CORE wxPrintFactory { public: wxPrintFactory() {} @@ -102,7 +102,7 @@ private: static wxPrintFactory *m_factory; }; -class WXDLLEXPORT wxNativePrintFactory: public wxPrintFactory +class WXDLLIMPEXP_CORE wxNativePrintFactory: public wxPrintFactory { public: virtual wxPrinterBase *CreatePrinter( wxPrintDialogData *data ); @@ -139,7 +139,7 @@ public: // wxPrintNativeDataBase //---------------------------------------------------------------------------- -class WXDLLEXPORT wxPrintNativeDataBase: public wxObject +class WXDLLIMPEXP_CORE wxPrintNativeDataBase: public wxObject { public: wxPrintNativeDataBase(); @@ -166,7 +166,7 @@ private: * Represents the printer: manages printing a wxPrintout object */ -class WXDLLEXPORT wxPrinterBase: public wxObject +class WXDLLIMPEXP_CORE wxPrinterBase: public wxObject { public: wxPrinterBase(wxPrintDialogData *data = (wxPrintDialogData *) NULL); @@ -206,7 +206,7 @@ private: // wxPrinter //---------------------------------------------------------------------------- -class WXDLLEXPORT wxPrinter: public wxPrinterBase +class WXDLLIMPEXP_CORE wxPrinter: public wxPrinterBase { public: wxPrinter(wxPrintDialogData *data = (wxPrintDialogData *) NULL); @@ -240,7 +240,7 @@ private: * object for previewing. */ -class WXDLLEXPORT wxPrintout: public wxObject +class WXDLLIMPEXP_CORE wxPrintout: public wxObject { public: wxPrintout(const wxString& title = wxT("Printout")); @@ -327,7 +327,7 @@ private: * Canvas upon which a preview is drawn. */ -class WXDLLEXPORT wxPreviewCanvas: public wxScrolledWindow +class WXDLLIMPEXP_CORE wxPreviewCanvas: public wxScrolledWindow { public: wxPreviewCanvas(wxPrintPreviewBase *preview, @@ -363,7 +363,7 @@ private: * Default frame for showing preview. */ -class WXDLLEXPORT wxPreviewFrame: public wxFrame +class WXDLLIMPEXP_CORE wxPreviewFrame: public wxFrame { public: wxPreviewFrame(wxPrintPreviewBase *preview, @@ -427,7 +427,7 @@ private: #define wxID_PREVIEW_LAST 7 #define wxID_PREVIEW_GOTO 8 -class WXDLLEXPORT wxPreviewControlBar: public wxPanel +class WXDLLIMPEXP_CORE wxPreviewControlBar: public wxPanel { DECLARE_CLASS(wxPreviewControlBar) @@ -488,7 +488,7 @@ private: * Programmer creates an object of this class to preview a wxPrintout. */ -class WXDLLEXPORT wxPrintPreviewBase: public wxObject +class WXDLLIMPEXP_CORE wxPrintPreviewBase: public wxObject { public: wxPrintPreviewBase(wxPrintout *printout, @@ -586,7 +586,7 @@ private: // wxPrintPreview //---------------------------------------------------------------------------- -class WXDLLEXPORT wxPrintPreview: public wxPrintPreviewBase +class WXDLLIMPEXP_CORE wxPrintPreview: public wxPrintPreviewBase { public: wxPrintPreview(wxPrintout *printout, @@ -638,7 +638,7 @@ private: // wxPrintAbortDialog //---------------------------------------------------------------------------- -class WXDLLEXPORT wxPrintAbortDialog: public wxDialog +class WXDLLIMPEXP_CORE wxPrintAbortDialog: public wxDialog { public: wxPrintAbortDialog(wxWindow *parent, diff --git a/include/wx/quantize.h b/include/wx/quantize.h index 6726d176f9..2c01c1d72a 100644 --- a/include/wx/quantize.h +++ b/include/wx/quantize.h @@ -34,7 +34,7 @@ class WXDLLIMPEXP_FWD_CORE wxPalette; #define wxQUANTIZE_RETURN_8BIT_DATA 0x02 #define wxQUANTIZE_FILL_DESTINATION_IMAGE 0x04 -class WXDLLEXPORT wxQuantize: public wxObject +class WXDLLIMPEXP_CORE wxQuantize: public wxObject { public: DECLARE_DYNAMIC_CLASS(wxQuantize) diff --git a/include/wx/radiobox.h b/include/wx/radiobox.h index de331d09dc..153927aec8 100644 --- a/include/wx/radiobox.h +++ b/include/wx/radiobox.h @@ -26,7 +26,7 @@ WX_DEFINE_EXPORTED_ARRAY_PTR(wxToolTip *, wxToolTipArray); #endif // wxUSE_TOOLTIPS -extern WXDLLEXPORT_DATA(const char) wxRadioBoxNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxRadioBoxNameStr[]; // ---------------------------------------------------------------------------- // wxRadioBoxBase is not a normal base class, but rather a mix-in because the @@ -34,7 +34,7 @@ extern WXDLLEXPORT_DATA(const char) wxRadioBoxNameStr[]; // example, it is a wxStaticBox in wxUniv and wxMSW but not in other ports // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxRadioBoxBase : public wxItemContainerImmutable +class WXDLLIMPEXP_CORE wxRadioBoxBase : public wxItemContainerImmutable { public: virtual ~wxRadioBoxBase(); diff --git a/include/wx/radiobut.h b/include/wx/radiobut.h index 831655702e..33b04ef936 100644 --- a/include/wx/radiobut.h +++ b/include/wx/radiobut.h @@ -33,7 +33,7 @@ #include "wx/control.h" -extern WXDLLEXPORT_DATA(const char) wxRadioButtonNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxRadioButtonNameStr[]; #if defined(__WXUNIVERSAL__) #include "wx/univ/radiobut.h" diff --git a/include/wx/rawbmp.h b/include/wx/rawbmp.h index 3e599a602b..9de976c0ea 100644 --- a/include/wx/rawbmp.h +++ b/include/wx/rawbmp.h @@ -72,7 +72,7 @@ */ /* - Note: we do not use WXDLLEXPORT with classes in this file because VC++ has + Note: we do not use WXDLLIMPEXP_CORE with classes in this file because VC++ has problems with exporting inner class defined inside a specialization of a template class from a DLL. Besides, as all the methods are inline it's not really necessary to put them in DLL at all. diff --git a/include/wx/region.h b/include/wx/region.h index e2c82500b4..1b1f627953 100644 --- a/include/wx/region.h +++ b/include/wx/region.h @@ -55,7 +55,7 @@ enum wxRegionOp // wxRegionBase defines wxRegion API // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxRegionBase : public wxGDIObject +class WXDLLIMPEXP_CORE wxRegionBase : public wxGDIObject { public: // ctors @@ -188,7 +188,7 @@ protected: #define wxHAS_REGION_COMBINE -class WXDLLEXPORT wxRegionWithCombine : public wxRegionBase +class WXDLLIMPEXP_CORE wxRegionWithCombine : public wxRegionBase { public: // these methods are not part of public API as they're not implemented on diff --git a/include/wx/renderer.h b/include/wx/renderer.h index 2097782e73..9b84247093 100644 --- a/include/wx/renderer.h +++ b/include/wx/renderer.h @@ -75,7 +75,7 @@ enum // ---------------------------------------------------------------------------- // wxSplitterWindow parameters -struct WXDLLEXPORT wxSplitterRenderParams +struct WXDLLIMPEXP_CORE wxSplitterRenderParams { // the only way to initialize this struct is by using this ctor wxSplitterRenderParams(wxCoord widthSash_, wxCoord border_, bool isSens_) @@ -95,7 +95,7 @@ struct WXDLLEXPORT wxSplitterRenderParams // extra optional parameters for DrawHeaderButton -struct WXDLLEXPORT wxHeaderButtonParams +struct WXDLLIMPEXP_CORE wxHeaderButtonParams { wxHeaderButtonParams() : m_labelAlignment(wxALIGN_LEFT) @@ -118,7 +118,7 @@ enum wxHeaderSortIconType { // wxRendererNative interface version -struct WXDLLEXPORT wxRendererVersion +struct WXDLLIMPEXP_CORE wxRendererVersion { wxRendererVersion(int version_, int age_) : version(version_), age(age_) { } @@ -152,7 +152,7 @@ struct WXDLLEXPORT wxRendererVersion // wxRendererNative: abstracts drawing methods needed by the native controls // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxRendererNative +class WXDLLIMPEXP_CORE wxRendererNative { public: // drawing functions @@ -305,7 +305,7 @@ public: // wxDelegateRendererNative: allows reuse of renderers code // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxDelegateRendererNative : public wxRendererNative +class WXDLLIMPEXP_CORE wxDelegateRendererNative : public wxRendererNative { public: wxDelegateRendererNative() diff --git a/include/wx/scrolbar.h b/include/wx/scrolbar.h index fc46906736..868c0ff593 100644 --- a/include/wx/scrolbar.h +++ b/include/wx/scrolbar.h @@ -18,13 +18,13 @@ #include "wx/control.h" -extern WXDLLEXPORT_DATA(const char) wxScrollBarNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxScrollBarNameStr[]; // ---------------------------------------------------------------------------- // wxScrollBar: a scroll bar control // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxScrollBarBase : public wxControl +class WXDLLIMPEXP_CORE wxScrollBarBase : public wxControl { public: wxScrollBarBase() { } diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h index 9612721763..0215586e95 100644 --- a/include/wx/scrolwin.h +++ b/include/wx/scrolwin.h @@ -48,7 +48,7 @@ class WXDLLIMPEXP_FWD_BASE wxTimer; // // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxScrollHelper +class WXDLLIMPEXP_CORE wxScrollHelper { public: // ctor must be given the associated window @@ -260,7 +260,7 @@ public: \ // wxScrolledWindow: a wxWindow which knows how to scroll // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxScrolledWindow : public wxPanel, +class WXDLLIMPEXP_CORE wxScrolledWindow : public wxPanel, public wxScrollHelperNative { public: diff --git a/include/wx/selstore.h b/include/wx/selstore.h index b0c0b4e2ba..bf5760e336 100644 --- a/include/wx/selstore.h +++ b/include/wx/selstore.h @@ -39,7 +39,7 @@ WX_DEFINE_SORTED_EXPORTED_ARRAY_CMP_SIZE_T(size_t, // individual items) without changing its API. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxSelectionStore +class WXDLLIMPEXP_CORE wxSelectionStore { public: wxSelectionStore() : m_itemsSel(wxSizeTCmpFn) { Init(); } diff --git a/include/wx/settings.h b/include/wx/settings.h index e49ebcad65..4ec32c1b03 100644 --- a/include/wx/settings.h +++ b/include/wx/settings.h @@ -159,7 +159,7 @@ enum wxSystemScreenType // files (i.e. this is not a real base class as we can't override its virtual // functions because it doesn't have any) -class WXDLLEXPORT wxSystemSettingsNative +class WXDLLIMPEXP_CORE wxSystemSettingsNative { public: // get a standard system colour @@ -179,7 +179,7 @@ public: // include the declaration of the real platform-dependent class // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxSystemSettings : public wxSystemSettingsNative +class WXDLLIMPEXP_CORE wxSystemSettings : public wxSystemSettingsNative { public: #ifdef __WXUNIVERSAL__ diff --git a/include/wx/sizer.h b/include/wx/sizer.h index bd932e89ce..461099389b 100644 --- a/include/wx/sizer.h +++ b/include/wx/sizer.h @@ -38,7 +38,7 @@ class WXDLLIMPEXP_FWD_CORE wxSizer; // wxSizerFlags: flags used for an item in the sizer // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxSizerFlags +class WXDLLIMPEXP_CORE wxSizerFlags { public: // construct the flags object initialized with the given proportion (0 by @@ -199,7 +199,7 @@ private: // wxSizerSpacer: used by wxSizerItem to represent a spacer // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxSizerSpacer +class WXDLLIMPEXP_CORE wxSizerSpacer { public: wxSizerSpacer(const wxSize& size) : m_size(size), m_isShown(true) { } @@ -222,7 +222,7 @@ private: // wxSizerItem // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxSizerItem : public wxObject +class WXDLLIMPEXP_CORE wxSizerItem : public wxObject { public: // window @@ -457,7 +457,7 @@ WX_DECLARE_EXPORTED_LIST( wxSizerItem, wxSizerItemList ); // wxSizer //--------------------------------------------------------------------------- -class WXDLLEXPORT wxSizer: public wxObject, public wxClientDataContainer +class WXDLLIMPEXP_CORE wxSizer: public wxObject, public wxClientDataContainer { public: wxSizer() { m_containingWindow = NULL; } @@ -687,7 +687,7 @@ private: // wxGridSizer //--------------------------------------------------------------------------- -class WXDLLEXPORT wxGridSizer: public wxSizer +class WXDLLIMPEXP_CORE wxGridSizer: public wxSizer { public: wxGridSizer( int rows, int cols, int vgap, int hgap ); @@ -738,7 +738,7 @@ enum wxFlexSizerGrowMode wxFLEX_GROWMODE_ALL }; -class WXDLLEXPORT wxFlexGridSizer: public wxGridSizer +class WXDLLIMPEXP_CORE wxFlexGridSizer: public wxGridSizer { public: // ctors/dtor @@ -809,7 +809,7 @@ private: // wxBoxSizer //--------------------------------------------------------------------------- -class WXDLLEXPORT wxBoxSizer: public wxSizer +class WXDLLIMPEXP_CORE wxBoxSizer: public wxSizer { public: wxBoxSizer(int orient) @@ -900,7 +900,7 @@ private: // Borrow unused flag value #define wxEXTEND_LAST_ON_EACH_LINE wxFULL_REPAINT_ON_RESIZE -class WXDLLEXPORT wxWrapSizer: public wxBoxSizer +class WXDLLIMPEXP_CORE wxWrapSizer: public wxBoxSizer { public: wxWrapSizer( int orient=wxHORIZONTAL, int flags=wxEXTEND_LAST_ON_EACH_LINE ); @@ -930,7 +930,7 @@ protected: class WXDLLIMPEXP_FWD_CORE wxStaticBox; -class WXDLLEXPORT wxStaticBoxSizer: public wxBoxSizer +class WXDLLIMPEXP_CORE wxStaticBoxSizer: public wxBoxSizer { public: wxStaticBoxSizer(wxStaticBox *box, int orient); @@ -962,7 +962,7 @@ private: #if wxUSE_BUTTON -class WXDLLEXPORT wxStdDialogButtonSizer: public wxBoxSizer +class WXDLLIMPEXP_CORE wxStdDialogButtonSizer: public wxBoxSizer { public: // Constructor just creates a new wxBoxSizer, not much else. diff --git a/include/wx/slider.h b/include/wx/slider.h index c48b004473..6294fabc1a 100644 --- a/include/wx/slider.h +++ b/include/wx/slider.h @@ -45,13 +45,13 @@ #define wxSL_NOTIFY_DRAG 0x0000 #endif // WXWIN_COMPATIBILITY_2_6 -extern WXDLLEXPORT_DATA(const char) wxSliderNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxSliderNameStr[]; // ---------------------------------------------------------------------------- // wxSliderBase: define wxSlider interface // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxSliderBase : public wxControl +class WXDLLIMPEXP_CORE wxSliderBase : public wxControl { public: /* the ctor of the derived class should have the following form: diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h index ae2346316c..820e8c33b4 100644 --- a/include/wx/spinbutt.h +++ b/include/wx/spinbutt.h @@ -36,7 +36,7 @@ // wxSP_WRAP: value wraps at either end // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxSpinButtonBase : public wxControl +class WXDLLIMPEXP_CORE wxSpinButtonBase : public wxControl { public: // ctor initializes the range with the default (0..100) values @@ -94,7 +94,7 @@ protected: // the wxSpinButton event // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxSpinEvent : public wxNotifyEvent +class WXDLLIMPEXP_CORE wxSpinEvent : public wxNotifyEvent { public: wxSpinEvent(wxEventType commandType = wxEVT_NULL, int winid = 0) diff --git a/include/wx/spinctrl.h b/include/wx/spinctrl.h index 4314dd93ee..5c00f53410 100644 --- a/include/wx/spinctrl.h +++ b/include/wx/spinctrl.h @@ -24,7 +24,7 @@ // There are two kinds for number types T=integer or T=double. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxSpinCtrlBase : public wxControl +class WXDLLIMPEXP_CORE wxSpinCtrlBase : public wxControl { public: wxSpinCtrlBase() {} @@ -56,7 +56,7 @@ private: // wxSpinDoubleEvent - a wxSpinEvent for double valued controls // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxSpinDoubleEvent : public wxNotifyEvent +class WXDLLIMPEXP_CORE wxSpinDoubleEvent : public wxNotifyEvent { public: wxSpinDoubleEvent(wxEventType commandType = wxEVT_NULL, int winid = 0, diff --git a/include/wx/srchctrl.h b/include/wx/srchctrl.h index a3d1c2aa22..32cc614d95 100644 --- a/include/wx/srchctrl.h +++ b/include/wx/srchctrl.h @@ -36,7 +36,7 @@ // constants // ---------------------------------------------------------------------------- -extern WXDLLEXPORT_DATA(const char) wxSearchCtrlNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxSearchCtrlNameStr[]; extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN; extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN; @@ -46,7 +46,7 @@ extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN; // it is based on the MacOSX 10.3 control HISearchFieldCreate // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxSearchCtrlBase : public wxSearchCtrlBaseBaseClass +class WXDLLIMPEXP_CORE wxSearchCtrlBase : public wxSearchCtrlBaseBaseClass { public: wxSearchCtrlBase() { } diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h index b80459f3ff..72934c25e6 100644 --- a/include/wx/statbmp.h +++ b/include/wx/statbmp.h @@ -20,10 +20,10 @@ #include "wx/bitmap.h" #include "wx/icon.h" -extern WXDLLEXPORT_DATA(const char) wxStaticBitmapNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticBitmapNameStr[]; // a control showing an icon or a bitmap -class WXDLLEXPORT wxStaticBitmapBase : public wxControl +class WXDLLIMPEXP_CORE wxStaticBitmapBase : public wxControl { public: wxStaticBitmapBase() { } diff --git a/include/wx/statbox.h b/include/wx/statbox.h index 873e5d15e5..e8f48c3eb3 100644 --- a/include/wx/statbox.h +++ b/include/wx/statbox.h @@ -18,13 +18,13 @@ #include "wx/control.h" -extern WXDLLEXPORT_DATA(const char) wxStaticBoxNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticBoxNameStr[]; // ---------------------------------------------------------------------------- // wxStaticBox: a grouping box with a label // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxStaticBoxBase : public wxControl +class WXDLLIMPEXP_CORE wxStaticBoxBase : public wxControl { public: wxStaticBoxBase() { } diff --git a/include/wx/statline.h b/include/wx/statline.h index 87115f6f13..8b36eb4c8c 100644 --- a/include/wx/statline.h +++ b/include/wx/statline.h @@ -28,13 +28,13 @@ // ---------------------------------------------------------------------------- // the default name for objects of class wxStaticLine -extern WXDLLEXPORT_DATA(const char) wxStaticLineNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticLineNameStr[]; // ---------------------------------------------------------------------------- // wxStaticLine - a line in a dialog // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxStaticLineBase : public wxControl +class WXDLLIMPEXP_CORE wxStaticLineBase : public wxControl { public: // constructor diff --git a/include/wx/stattext.h b/include/wx/stattext.h index 395b19066a..e6e38f1da4 100644 --- a/include/wx/stattext.h +++ b/include/wx/stattext.h @@ -29,9 +29,9 @@ #define wxST_ELLIPSIZE_END 0x0010 -extern WXDLLEXPORT_DATA(const char) wxStaticTextNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticTextNameStr[]; -class WXDLLEXPORT wxStaticTextBase : public wxControl +class WXDLLIMPEXP_CORE wxStaticTextBase : public wxControl { public: wxStaticTextBase() { } diff --git a/include/wx/statusbr.h b/include/wx/statusbr.h index d1f666a055..f75d053720 100644 --- a/include/wx/statusbr.h +++ b/include/wx/statusbr.h @@ -37,7 +37,7 @@ WX_DECLARE_LIST(wxString, wxListString); // wxStatusBar: a window near the bottom of the frame used for status info // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxStatusBarBase : public wxWindow +class WXDLLIMPEXP_CORE wxStatusBarBase : public wxWindow { public: wxStatusBarBase(); diff --git a/include/wx/stockitem.h b/include/wx/stockitem.h index 7ca7bb8e5c..19cdc59321 100644 --- a/include/wx/stockitem.h +++ b/include/wx/stockitem.h @@ -22,11 +22,11 @@ // ---------------------------------------------------------------------------- // Returns true if the ID is in the list of recognized stock actions -WXDLLEXPORT bool wxIsStockID(wxWindowID id); +WXDLLIMPEXP_CORE bool wxIsStockID(wxWindowID id); // Returns true of the label is empty or label of a stock button with // given ID -WXDLLEXPORT bool wxIsStockLabel(wxWindowID id, const wxString& label); +WXDLLIMPEXP_CORE bool wxIsStockLabel(wxWindowID id, const wxString& label); enum wxStockLabelQueryFlag { @@ -40,14 +40,14 @@ enum wxStockLabelQueryFlag // for wxSTOCK_OK); if wxSTOCK_WITH_MNEMONIC is given, the & character // is included; if wxSTOCK_WITH_ACCELERATOR is given, the stock accelerator // for given ID is concatenated to the label using \t as separator -WXDLLEXPORT wxString wxGetStockLabel(wxWindowID id, +WXDLLIMPEXP_CORE wxString wxGetStockLabel(wxWindowID id, long flags = wxSTOCK_WITH_MNEMONIC); #if wxUSE_ACCEL // Returns the accelerator that should be used for given stock UI element // (e.g. "Ctrl+x" for wxSTOCK_EXIT) - WXDLLEXPORT wxAcceleratorEntry wxGetStockAccelerator(wxWindowID id); + WXDLLIMPEXP_CORE wxAcceleratorEntry wxGetStockAccelerator(wxWindowID id); #endif @@ -59,14 +59,14 @@ enum wxStockHelpStringClient }; // Returns an help string for the given stock UI element and for the given "context". -WXDLLEXPORT wxString wxGetStockHelpString(wxWindowID id, +WXDLLIMPEXP_CORE wxString wxGetStockHelpString(wxWindowID id, wxStockHelpStringClient client = wxSTOCK_MENU); #ifdef __WXGTK20__ // Translates stock ID to GTK+'s stock item string indentifier: -WXDLLEXPORT const char *wxGetStockGtkID(wxWindowID id); +WXDLLIMPEXP_CORE const char *wxGetStockGtkID(wxWindowID id); #endif diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h index 0ffef62ce3..586f6c3d71 100644 --- a/include/wx/tbarbase.h +++ b/include/wx/tbarbase.h @@ -32,9 +32,9 @@ class WXDLLIMPEXP_FWD_CORE wxImage; // constants // ---------------------------------------------------------------------------- -extern WXDLLEXPORT_DATA(const char) wxToolBarNameStr[]; -extern WXDLLEXPORT_DATA(const wxSize) wxDefaultSize; -extern WXDLLEXPORT_DATA(const wxPoint) wxDefaultPosition; +extern WXDLLIMPEXP_DATA_CORE(const char) wxToolBarNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const wxSize) wxDefaultSize; +extern WXDLLIMPEXP_DATA_CORE(const wxPoint) wxDefaultPosition; enum wxToolBarToolStyle { @@ -54,7 +54,7 @@ enum wxToolBarToolStyle // for the applications status bar. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxToolBarToolBase : public wxObject +class WXDLLIMPEXP_CORE wxToolBarToolBase : public wxObject { public: // ctors & dtor @@ -247,7 +247,7 @@ WX_DECLARE_EXPORTED_LIST(wxToolBarToolBase, wxToolBarToolsList); // the base class for all toolbars // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxToolBarBase : public wxControl +class WXDLLIMPEXP_CORE wxToolBarBase : public wxControl { public: wxToolBarBase(); diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h index 23f9a46549..5ace5a3d19 100644 --- a/include/wx/textctrl.h +++ b/include/wx/textctrl.h @@ -53,7 +53,7 @@ typedef long wxTextCoord; // constants // ---------------------------------------------------------------------------- -extern WXDLLEXPORT_DATA(const char) wxTextCtrlNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxTextCtrlNameStr[]; // this is intentionally not enum to avoid warning fixes with // typecasting from enum type to wxTextCoord @@ -252,7 +252,7 @@ enum wxTextAttrAlignment // wxTextAttr: a structure containing the visual attributes of a text // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxTextAttr +class WXDLLIMPEXP_CORE wxTextAttr { public: // ctors @@ -591,7 +591,7 @@ private: // wxTextCtrl: a single or multiple line text zone where user can edit text // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxTextCtrlBase : public wxControl, +class WXDLLIMPEXP_CORE wxTextCtrlBase : public wxControl, #if wxHAS_TEXT_WINDOW_STREAM public wxSTD streambuf, #endif @@ -705,7 +705,7 @@ extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TEXT_ENTER; extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TEXT_URL; extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TEXT_MAXLEN; -class WXDLLEXPORT wxTextUrlEvent : public wxCommandEvent +class WXDLLIMPEXP_CORE wxTextUrlEvent : public wxCommandEvent { public: wxTextUrlEvent(int winid, const wxMouseEvent& evtMouse, @@ -763,7 +763,7 @@ typedef void (wxEvtHandler::*wxTextUrlEventFunction)(wxTextUrlEvent&); // C++ stream to the wxTextCtrl given to its ctor during its lifetime. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxStreamToTextRedirector +class WXDLLIMPEXP_CORE wxStreamToTextRedirector { private: void Init(wxTextCtrl *text) diff --git a/include/wx/tglbtn.h b/include/wx/tglbtn.h index d212176102..e4ab3394dc 100644 --- a/include/wx/tglbtn.h +++ b/include/wx/tglbtn.h @@ -26,7 +26,7 @@ extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TOGGLEBUTTON_CLICKED; // wxToggleButtonBase // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxToggleButtonBase : public wxControl +class WXDLLIMPEXP_CORE wxToggleButtonBase : public wxControl { public: wxToggleButtonBase() { } diff --git a/include/wx/tipwin.h b/include/wx/tipwin.h index 898ca6805f..6b448ec101 100644 --- a/include/wx/tipwin.h +++ b/include/wx/tipwin.h @@ -32,7 +32,7 @@ class WXDLLIMPEXP_FWD_CORE wxTipWindowView; // wxTipWindow // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxTipWindow : public wxTipWindowBase +class WXDLLIMPEXP_CORE wxTipWindow : public wxTipWindowBase { public: // the mandatory ctor parameters are: the parent window and the text to diff --git a/include/wx/toolbook.h b/include/wx/toolbook.h index a45d87815d..c6b60383d5 100644 --- a/include/wx/toolbook.h +++ b/include/wx/toolbook.h @@ -40,7 +40,7 @@ extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING; // wxToolbook // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxToolbook : public wxBookCtrlBase +class WXDLLIMPEXP_CORE wxToolbook : public wxBookCtrlBase { public: wxToolbook() @@ -135,7 +135,7 @@ private: // listbook event class and related stuff // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxToolbookEvent : public wxBookCtrlBaseEvent +class WXDLLIMPEXP_CORE wxToolbookEvent : public wxBookCtrlBaseEvent { public: wxToolbookEvent(wxEventType commandType = wxEVT_NULL, int id = 0, diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h index e770e8fee2..ed8b2e9f5f 100644 --- a/include/wx/toplevel.h +++ b/include/wx/toplevel.h @@ -23,7 +23,7 @@ #include "wx/containr.h" // the default names for various classes -extern WXDLLEXPORT_DATA(const char) wxFrameNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxFrameNameStr[]; class WXDLLIMPEXP_FWD_CORE wxTopLevelWindowBase; @@ -116,7 +116,7 @@ enum // wxTopLevelWindow: a top level (as opposed to child) window // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxTopLevelWindowBase : public wxNonOwnedWindow +class WXDLLIMPEXP_CORE wxTopLevelWindowBase : public wxNonOwnedWindow { public: // construction @@ -348,7 +348,7 @@ protected: #include "wx/univ/toplevel.h" #else // !__WXUNIVERSAL__ #ifdef wxTopLevelWindowNative - class WXDLLEXPORT wxTopLevelWindow : public wxTopLevelWindowNative + class WXDLLIMPEXP_CORE wxTopLevelWindow : public wxTopLevelWindowNative { public: // construction diff --git a/include/wx/treebase.h b/include/wx/treebase.h index 54582f8a0b..937b658422 100644 --- a/include/wx/treebase.h +++ b/include/wx/treebase.h @@ -47,7 +47,7 @@ enum // Using this typedef removes an ambiguity when calling Remove() typedef void *wxTreeItemIdValue; -class WXDLLEXPORT wxTreeItemId +class WXDLLIMPEXP_CORE wxTreeItemId { friend bool operator==(const wxTreeItemId&, const wxTreeItemId&); public: @@ -99,7 +99,7 @@ inline bool operator!=(const wxTreeItemId& i1, const wxTreeItemId& i2) // always be allocated on the heap! // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxTreeItemData: public wxClientData +class WXDLLIMPEXP_CORE wxTreeItemData: public wxClientData { friend class WXDLLIMPEXP_FWD_CORE wxTreeCtrl; friend class WXDLLIMPEXP_FWD_CORE wxGenericTreeCtrl; @@ -124,7 +124,7 @@ WX_DEFINE_EXPORTED_ARRAY_PTR(wxTreeItemIdValue, wxArrayTreeItemIdsBase); // this is a wrapper around the array class defined above which allow to wok // with vaue of natural wxTreeItemId type instead of using wxTreeItemIdValue // and does it without any loss of efficiency -class WXDLLEXPORT wxArrayTreeItemIds : public wxArrayTreeItemIdsBase +class WXDLLIMPEXP_CORE wxArrayTreeItemIds : public wxArrayTreeItemIdsBase { public: void Add(const wxTreeItemId& id) @@ -225,13 +225,13 @@ static const int wxTREE_HITTEST_ONITEM = wxTREE_HITTEST_ONITEMICON | wxTREE_HITTEST_ONITEMLABEL; // tree ctrl default name -extern WXDLLEXPORT_DATA(const char) wxTreeCtrlNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxTreeCtrlNameStr[]; // ---------------------------------------------------------------------------- // wxTreeItemAttr: a structure containing the visual attributes of an item // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxTreeItemAttr +class WXDLLIMPEXP_CORE wxTreeItemAttr { public: // ctors @@ -270,7 +270,7 @@ private: class WXDLLIMPEXP_FWD_CORE wxTreeCtrlBase; -class WXDLLEXPORT wxTreeEvent : public wxNotifyEvent +class WXDLLIMPEXP_CORE wxTreeEvent : public wxNotifyEvent { public: wxTreeEvent(wxEventType commandType, diff --git a/include/wx/treebook.h b/include/wx/treebook.h index 798acf318b..bd60e6dca1 100644 --- a/include/wx/treebook.h +++ b/include/wx/treebook.h @@ -27,7 +27,7 @@ class WXDLLIMPEXP_FWD_CORE wxTreeEvent; // wxTreebook // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxTreebook : public wxBookCtrlBase +class WXDLLIMPEXP_CORE wxTreebook : public wxBookCtrlBase { public: // Constructors and such @@ -233,7 +233,7 @@ private: // treebook event class and related stuff // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxTreebookEvent : public wxBookCtrlBaseEvent +class WXDLLIMPEXP_CORE wxTreebookEvent : public wxBookCtrlBaseEvent { public: wxTreebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0, diff --git a/include/wx/treectrl.h b/include/wx/treectrl.h index cb808f4329..bdcc2b3201 100644 --- a/include/wx/treectrl.h +++ b/include/wx/treectrl.h @@ -30,7 +30,7 @@ class WXDLLIMPEXP_FWD_CORE wxImageList; // wxTreeCtrlBase // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxTreeCtrlBase : public wxControl +class WXDLLIMPEXP_CORE wxTreeCtrlBase : public wxControl { public: wxTreeCtrlBase() diff --git a/include/wx/univ/app.h b/include/wx/univ/app.h index 1b3b801b53..a0dee87bea 100644 --- a/include/wx/univ/app.h +++ b/include/wx/univ/app.h @@ -12,7 +12,7 @@ #ifndef _WX_UNIX_APP_H_ #define _WX_UNIX_APP_H_ -class WXDLLEXPORT wxUniversalApp : public wxApp +class WXDLLIMPEXP_CORE wxUniversalApp : public wxApp { public: }; diff --git a/include/wx/univ/bmpbuttn.h b/include/wx/univ/bmpbuttn.h index 5d4d725aac..b3b81d0d66 100644 --- a/include/wx/univ/bmpbuttn.h +++ b/include/wx/univ/bmpbuttn.h @@ -12,7 +12,7 @@ #ifndef _WX_UNIV_BMPBUTTN_H_ #define _WX_UNIV_BMPBUTTN_H_ -class WXDLLEXPORT wxBitmapButton : public wxBitmapButtonBase +class WXDLLIMPEXP_CORE wxBitmapButton : public wxBitmapButtonBase { public: wxBitmapButton() { } diff --git a/include/wx/univ/button.h b/include/wx/univ/button.h index 59e97a533a..2aaf0cf4b2 100644 --- a/include/wx/univ/button.h +++ b/include/wx/univ/button.h @@ -29,7 +29,7 @@ class WXDLLIMPEXP_FWD_CORE wxInputHandler; // wxButton: a push button // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxButton : public wxButtonBase +class WXDLLIMPEXP_CORE wxButton : public wxButtonBase { public: wxButton() { Init(); } diff --git a/include/wx/univ/checkbox.h b/include/wx/univ/checkbox.h index c7ffee5be9..aaa1dee616 100644 --- a/include/wx/univ/checkbox.h +++ b/include/wx/univ/checkbox.h @@ -28,7 +28,7 @@ // wxCheckBox // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxCheckBox : public wxCheckBoxBase +class WXDLLIMPEXP_CORE wxCheckBox : public wxCheckBoxBase { public: // checkbox constants diff --git a/include/wx/univ/checklst.h b/include/wx/univ/checklst.h index 3df4668770..d22b8f069e 100644 --- a/include/wx/univ/checklst.h +++ b/include/wx/univ/checklst.h @@ -22,7 +22,7 @@ // wxCheckListBox // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxCheckListBox : public wxCheckListBoxBase +class WXDLLIMPEXP_CORE wxCheckListBox : public wxCheckListBoxBase { public: // ctors diff --git a/include/wx/univ/choice.h b/include/wx/univ/choice.h index f56590f372..3c28c5f4bd 100644 --- a/include/wx/univ/choice.h +++ b/include/wx/univ/choice.h @@ -16,7 +16,7 @@ // VS: This is only a *temporary* implementation, real wxChoice should not // derive from wxComboBox and may have different l&f -class WXDLLEXPORT wxChoice : public wxComboBox +class WXDLLIMPEXP_CORE wxChoice : public wxComboBox { public: wxChoice() {} diff --git a/include/wx/univ/colschem.h b/include/wx/univ/colschem.h index b591c7d0e2..ff4b728aac 100644 --- a/include/wx/univ/colschem.h +++ b/include/wx/univ/colschem.h @@ -21,7 +21,7 @@ class WXDLLIMPEXP_FWD_CORE wxWindow; // wxColourScheme // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxColourScheme +class WXDLLIMPEXP_CORE wxColourScheme { public: // the standard colours diff --git a/include/wx/univ/combobox.h b/include/wx/univ/combobox.h index 78bdc7059a..2b26eb5180 100644 --- a/include/wx/univ/combobox.h +++ b/include/wx/univ/combobox.h @@ -31,7 +31,7 @@ class WXDLLIMPEXP_FWD_CORE wxListBox; // wxComboBox: a combination of text control and a listbox // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxComboBox : public wxComboCtrl, public wxComboBoxBase +class WXDLLIMPEXP_CORE wxComboBox : public wxComboCtrl, public wxComboBoxBase { public: // ctors and such diff --git a/include/wx/univ/control.h b/include/wx/univ/control.h index 4d7d370ab1..22cd4efca6 100644 --- a/include/wx/univ/control.h +++ b/include/wx/univ/control.h @@ -38,7 +38,7 @@ typedef wxString wxControlAction; // wxControl: the base class for all GUI controls // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxControl : public wxControlBase, public wxInputConsumer +class WXDLLIMPEXP_CORE wxControl : public wxControlBase, public wxInputConsumer { public: wxControl() { Init(); } diff --git a/include/wx/univ/dialog.h b/include/wx/univ/dialog.h index 1579a3744e..0f9d7f6758 100644 --- a/include/wx/univ/dialog.h +++ b/include/wx/univ/dialog.h @@ -11,12 +11,12 @@ #ifndef _WX_UNIV_DIALOG_H_ #define _WX_UNIV_DIALOG_H_ -extern WXDLLEXPORT_DATA(const char) wxDialogNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxDialogNameStr[]; class WXDLLIMPEXP_FWD_CORE wxWindowDisabler; class WXDLLIMPEXP_FWD_CORE wxEventLoop; // Dialog boxes -class WXDLLEXPORT wxDialog : public wxDialogBase +class WXDLLIMPEXP_CORE wxDialog : public wxDialogBase { public: wxDialog() { Init(); } diff --git a/include/wx/univ/frame.h b/include/wx/univ/frame.h index d53d940e1b..924ea90a96 100644 --- a/include/wx/univ/frame.h +++ b/include/wx/univ/frame.h @@ -16,7 +16,7 @@ // wxFrame // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFrame : public wxFrameBase +class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase { public: wxFrame() {} diff --git a/include/wx/univ/gauge.h b/include/wx/univ/gauge.h index 80b1bf6c11..180a923f33 100644 --- a/include/wx/univ/gauge.h +++ b/include/wx/univ/gauge.h @@ -16,7 +16,7 @@ // wxGauge: a progress bar // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxGauge : public wxGaugeBase +class WXDLLIMPEXP_CORE wxGauge : public wxGaugeBase { public: wxGauge() { Init(); } diff --git a/include/wx/univ/inpcons.h b/include/wx/univ/inpcons.h index 874d2f9e86..3538acd3a8 100644 --- a/include/wx/univ/inpcons.h +++ b/include/wx/univ/inpcons.h @@ -35,7 +35,7 @@ typedef wxString wxControlAction; // wxControl and wxTopLevelWindow). // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxInputConsumer +class WXDLLIMPEXP_CORE wxInputConsumer { public: wxInputConsumer() { m_inputHandler = NULL; } diff --git a/include/wx/univ/inphand.h b/include/wx/univ/inphand.h index 05c9d0e87b..fd36787fe8 100644 --- a/include/wx/univ/inphand.h +++ b/include/wx/univ/inphand.h @@ -40,7 +40,7 @@ // wxInputHandler: maps the events to the actions // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxInputHandler : public wxObject +class WXDLLIMPEXP_CORE wxInputHandler : public wxObject { public: // map a keyboard event to one or more actions (pressed == true if the key @@ -80,7 +80,7 @@ public: // and also provides the way to chain input handlers together // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxStdInputHandler : public wxInputHandler +class WXDLLIMPEXP_CORE wxStdInputHandler : public wxInputHandler { public: wxStdInputHandler(wxInputHandler *handler) : m_handler(handler) { } diff --git a/include/wx/univ/listbox.h b/include/wx/univ/listbox.h index 41d2b7df56..f70d98abc9 100644 --- a/include/wx/univ/listbox.h +++ b/include/wx/univ/listbox.h @@ -48,7 +48,7 @@ // wxListBox: a list of selectable items // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxListBox : public wxListBoxBase, public wxScrollHelper +class WXDLLIMPEXP_CORE wxListBox : public wxListBoxBase, public wxScrollHelper { public: // ctors and such diff --git a/include/wx/univ/menu.h b/include/wx/univ/menu.h index 6515c41b36..b964b7e869 100644 --- a/include/wx/univ/menu.h +++ b/include/wx/univ/menu.h @@ -30,7 +30,7 @@ class WXDLLIMPEXP_FWD_CORE wxRenderer; // wxMenu // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMenu : public wxMenuBase +class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase { public: // ctors and dtor @@ -138,7 +138,7 @@ private: // wxMenuBar // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMenuBar : public wxMenuBarBase +class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase { public: // ctors and dtor diff --git a/include/wx/univ/menuitem.h b/include/wx/univ/menuitem.h index 3601bd5fc8..d515ce6d7d 100644 --- a/include/wx/univ/menuitem.h +++ b/include/wx/univ/menuitem.h @@ -16,7 +16,7 @@ // wxMenuItem implements wxMenuItemBase // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMenuItem : public wxMenuItemBase +class WXDLLIMPEXP_CORE wxMenuItem : public wxMenuItemBase { public: // ctor & dtor diff --git a/include/wx/univ/notebook.h b/include/wx/univ/notebook.h index d2896f472c..dda002abc9 100644 --- a/include/wx/univ/notebook.h +++ b/include/wx/univ/notebook.h @@ -29,7 +29,7 @@ class WXDLLIMPEXP_FWD_CORE wxSpinButton; // wxNotebook // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxNotebook : public wxNotebookBase +class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase { public: // ctors and such diff --git a/include/wx/univ/radiobox.h b/include/wx/univ/radiobox.h index bc48405493..a66adfa215 100644 --- a/include/wx/univ/radiobox.h +++ b/include/wx/univ/radiobox.h @@ -23,7 +23,7 @@ WX_DEFINE_EXPORTED_ARRAY_PTR(wxRadioButton *, wxArrayRadioButtons); // wxRadioBox: a box full of radio buttons // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxRadioBox : public wxStaticBox, +class WXDLLIMPEXP_CORE wxRadioBox : public wxStaticBox, public wxRadioBoxBase { public: diff --git a/include/wx/univ/radiobut.h b/include/wx/univ/radiobut.h index 37371d4903..2ab0344549 100644 --- a/include/wx/univ/radiobut.h +++ b/include/wx/univ/radiobut.h @@ -18,7 +18,7 @@ // wxRadioButton // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxRadioButton : public wxCheckBox +class WXDLLIMPEXP_CORE wxRadioButton : public wxCheckBox { public: // constructors diff --git a/include/wx/univ/renderer.h b/include/wx/univ/renderer.h index 58bd75f381..167f94e88b 100644 --- a/include/wx/univ/renderer.h +++ b/include/wx/univ/renderer.h @@ -58,7 +58,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar; #include "wx/icon.h" // helper class used by wxMenu-related functions -class WXDLLEXPORT wxMenuGeometryInfo +class WXDLLIMPEXP_CORE wxMenuGeometryInfo { public: // get the total size of the menu @@ -71,7 +71,7 @@ public: // wxRenderer: abstract renderers interface // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxRenderer : public wxDelegateRendererNative +class WXDLLIMPEXP_CORE wxRenderer : public wxDelegateRendererNative { public: // drawing functions @@ -493,7 +493,7 @@ public: // will be left to the original renderer // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxDelegateRenderer : public wxRenderer +class WXDLLIMPEXP_CORE wxDelegateRenderer : public wxRenderer { public: wxDelegateRenderer(wxRenderer *renderer) : m_renderer(renderer) { } @@ -863,7 +863,7 @@ protected: // OnPaint() // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxControlRenderer +class WXDLLIMPEXP_CORE wxControlRenderer { public: // create a renderer for this dc with this "fundamental" renderer diff --git a/include/wx/univ/scrarrow.h b/include/wx/univ/scrarrow.h index 263b8ecf2e..2621c16de5 100644 --- a/include/wx/univ/scrarrow.h +++ b/include/wx/univ/scrarrow.h @@ -33,7 +33,7 @@ class WXDLLIMPEXP_FWD_CORE wxRenderer; // wxScrollArrows: an abstraction of scrollbar arrow // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxScrollArrows +class WXDLLIMPEXP_CORE wxScrollArrows { public: enum Arrow @@ -79,7 +79,7 @@ private: // wxControlWithArrows: interface implemented by controls using wxScrollArrows // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxControlWithArrows +class WXDLLIMPEXP_CORE wxControlWithArrows { public: virtual ~wxControlWithArrows() {} diff --git a/include/wx/univ/scrolbar.h b/include/wx/univ/scrolbar.h index a11cef70fe..dd59432a36 100644 --- a/include/wx/univ/scrolbar.h +++ b/include/wx/univ/scrolbar.h @@ -38,7 +38,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollTimer; // wxScrollBar // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxScrollBar : public wxScrollBarBase, +class WXDLLIMPEXP_CORE wxScrollBar : public wxScrollBarBase, public wxControlWithArrows { public: @@ -192,7 +192,7 @@ private: // the object handling the arrows wxScrollArrows m_arrows; - friend WXDLLEXPORT class wxControlRenderer; // for geometry methods + friend WXDLLIMPEXP_CORE class wxControlRenderer; // for geometry methods friend class wxStdScrollBarInputHandler; // for geometry methods DECLARE_EVENT_TABLE() @@ -203,7 +203,7 @@ private: // Standard scrollbar input handler which can be used as a base class // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxStdScrollBarInputHandler : public wxStdInputHandler +class WXDLLIMPEXP_CORE wxStdScrollBarInputHandler : public wxStdInputHandler { public: // constructor takes a renderer (used for scrollbar hit testing) and the diff --git a/include/wx/univ/scrthumb.h b/include/wx/univ/scrthumb.h index 00ab7aacae..25a6ce98e0 100644 --- a/include/wx/univ/scrthumb.h +++ b/include/wx/univ/scrthumb.h @@ -31,7 +31,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollTimer; // wxScrollThumb: an abstraction of scrollbar thumb // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxScrollThumb +class WXDLLIMPEXP_CORE wxScrollThumb { public: enum Shaft @@ -83,7 +83,7 @@ private: // wxControlWithThumb: interface implemented by controls using wxScrollThumb // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxControlWithThumb +class WXDLLIMPEXP_CORE wxControlWithThumb { public: virtual ~wxControlWithThumb() {} diff --git a/include/wx/univ/scrtimer.h b/include/wx/univ/scrtimer.h index a94c528f7f..d73aada0b6 100644 --- a/include/wx/univ/scrtimer.h +++ b/include/wx/univ/scrtimer.h @@ -25,7 +25,7 @@ // pressed // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxScrollTimer : public wxTimer +class WXDLLIMPEXP_CORE wxScrollTimer : public wxTimer { public: // default ctor diff --git a/include/wx/univ/slider.h b/include/wx/univ/slider.h index acb54538b6..7be8cdde73 100644 --- a/include/wx/univ/slider.h +++ b/include/wx/univ/slider.h @@ -36,7 +36,7 @@ // wxSlider // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxSlider : public wxSliderBase, +class WXDLLIMPEXP_CORE wxSlider : public wxSliderBase, public wxControlWithThumb { public: diff --git a/include/wx/univ/spinbutt.h b/include/wx/univ/spinbutt.h index 61ee7f2bbf..aac61f9644 100644 --- a/include/wx/univ/spinbutt.h +++ b/include/wx/univ/spinbutt.h @@ -22,7 +22,7 @@ #define wxACTION_SPIN_INC _T("inc") #define wxACTION_SPIN_DEC _T("dec") -class WXDLLEXPORT wxSpinButton : public wxSpinButtonBase, +class WXDLLIMPEXP_CORE wxSpinButton : public wxSpinButtonBase, public wxControlWithArrows { public: @@ -104,7 +104,7 @@ private: // wxStdScrollBarInputHandler) and processes keyboard events too // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxStdSpinButtonInputHandler : public wxStdInputHandler +class WXDLLIMPEXP_CORE wxStdSpinButtonInputHandler : public wxStdInputHandler { public: wxStdSpinButtonInputHandler(wxInputHandler *inphand); diff --git a/include/wx/univ/statbmp.h b/include/wx/univ/statbmp.h index a51a0f75a1..2c9e011547 100644 --- a/include/wx/univ/statbmp.h +++ b/include/wx/univ/statbmp.h @@ -18,7 +18,7 @@ // wxStaticBitmap // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase +class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase { public: wxStaticBitmap() diff --git a/include/wx/univ/statbox.h b/include/wx/univ/statbox.h index 333e1985dc..eb1cb116c8 100644 --- a/include/wx/univ/statbox.h +++ b/include/wx/univ/statbox.h @@ -12,7 +12,7 @@ #ifndef _WX_UNIV_STATBOX_H_ #define _WX_UNIV_STATBOX_H_ -class WXDLLEXPORT wxStaticBox : public wxStaticBoxBase +class WXDLLIMPEXP_CORE wxStaticBox : public wxStaticBoxBase { public: wxStaticBox() { } diff --git a/include/wx/univ/statline.h b/include/wx/univ/statline.h index 0711fc5b08..85fb86f3a2 100644 --- a/include/wx/univ/statline.h +++ b/include/wx/univ/statline.h @@ -11,7 +11,7 @@ #ifndef _WX_UNIV_STATLINE_H_ #define _WX_UNIV_STATLINE_H_ -class WXDLLEXPORT wxStaticLine : public wxStaticLineBase +class WXDLLIMPEXP_CORE wxStaticLine : public wxStaticLineBase { public: // constructors and pseudo-constructors diff --git a/include/wx/univ/stattext.h b/include/wx/univ/stattext.h index 401772e791..888ade81f6 100644 --- a/include/wx/univ/stattext.h +++ b/include/wx/univ/stattext.h @@ -12,7 +12,7 @@ #ifndef _WX_UNIV_STATTEXT_H_ #define _WX_UNIV_STATTEXT_H_ -class WXDLLEXPORT wxStaticText : public wxStaticTextBase +class WXDLLIMPEXP_CORE wxStaticText : public wxStaticTextBase { public: wxStaticText() { } diff --git a/include/wx/univ/statusbr.h b/include/wx/univ/statusbr.h index 79116f1919..88528562a3 100644 --- a/include/wx/univ/statusbr.h +++ b/include/wx/univ/statusbr.h @@ -19,7 +19,7 @@ // wxStatusBar: a window near the bottom of the frame used for status info // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxStatusBarUniv : public wxStatusBarBase, +class WXDLLIMPEXP_CORE wxStatusBarUniv : public wxStatusBarBase, public wxInputConsumer { public: diff --git a/include/wx/univ/textctrl.h b/include/wx/univ/textctrl.h index 941a60c21d..127c3f7c34 100644 --- a/include/wx/univ/textctrl.h +++ b/include/wx/univ/textctrl.h @@ -66,7 +66,7 @@ class WXDLLIMPEXP_FWD_CORE wxTextCtrlCommandProcessor; // wxTextCtrl // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase, +class WXDLLIMPEXP_CORE wxTextCtrl : public wxTextCtrlBase, public wxScrollHelper { public: diff --git a/include/wx/univ/tglbtn.h b/include/wx/univ/tglbtn.h index 8f78e3a7b8..7bb99bac8d 100644 --- a/include/wx/univ/tglbtn.h +++ b/include/wx/univ/tglbtn.h @@ -14,7 +14,7 @@ #include "wx/button.h" -extern WXDLLEXPORT_DATA(const char) wxCheckBoxNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxCheckBoxNameStr[]; // ---------------------------------------------------------------------------- // wxToggleButton: a push button diff --git a/include/wx/univ/theme.h b/include/wx/univ/theme.h index 5e761d1617..95544b419b 100644 --- a/include/wx/univ/theme.h +++ b/include/wx/univ/theme.h @@ -27,7 +27,7 @@ class WXDLLIMPEXP_FWD_CORE wxInputHandler; class WXDLLIMPEXP_FWD_CORE wxRenderer; struct WXDLLIMPEXP_FWD_CORE wxThemeInfo; -class WXDLLEXPORT wxTheme +class WXDLLIMPEXP_CORE wxTheme { public: // static methods @@ -108,7 +108,7 @@ protected: // dynamic theme creation helpers // ---------------------------------------------------------------------------- -struct WXDLLEXPORT wxThemeInfo +struct WXDLLIMPEXP_CORE wxThemeInfo { typedef wxTheme *(*Constructor)(); @@ -137,7 +137,7 @@ struct WXDLLEXPORT wxThemeInfo WX_USE_THEME_IMPL(themename) #define WX_USE_THEME_IMPL(themename) \ - extern WXDLLEXPORT_DATA(bool) wxThemeUse##themename; \ + extern WXDLLIMPEXP_DATA_CORE(bool) wxThemeUse##themename; \ static struct wxThemeUserFor##themename \ { \ wxThemeUserFor##themename() { wxThemeUse##themename = true; } \ @@ -153,7 +153,7 @@ struct WXDLLEXPORT wxThemeInfo // and this one must be inserted in the source file #define WX_IMPLEMENT_THEME(classname, themename, themedesc) \ - WXDLLEXPORT_DATA(bool) wxThemeUse##themename = true; \ + WXDLLIMPEXP_DATA_CORE(bool) wxThemeUse##themename = true; \ wxTheme *wxCtorFor##themename() { return new classname; } \ wxThemeInfo classname::ms_info##themename(wxCtorFor##themename, \ wxT( #themename ), themedesc) diff --git a/include/wx/univ/toolbar.h b/include/wx/univ/toolbar.h index 272cef7b38..2c736c1c8c 100644 --- a/include/wx/univ/toolbar.h +++ b/include/wx/univ/toolbar.h @@ -31,7 +31,7 @@ class WXDLLIMPEXP_FWD_CORE wxToolBarTool; // wxToolBar // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxToolBar : public wxToolBarBase +class WXDLLIMPEXP_CORE wxToolBar : public wxToolBarBase { public: // construction/destruction diff --git a/include/wx/univ/toplevel.h b/include/wx/univ/toplevel.h index aace185fbd..a13d5c978b 100644 --- a/include/wx/univ/toplevel.h +++ b/include/wx/univ/toplevel.h @@ -88,7 +88,7 @@ enum // wxTopLevelWindow //----------------------------------------------------------------------------- -class WXDLLEXPORT wxTopLevelWindow : public wxTopLevelWindowNative, +class WXDLLIMPEXP_CORE wxTopLevelWindow : public wxTopLevelWindowNative, public wxInputConsumer { public: diff --git a/include/wx/univ/window.h b/include/wx/univ/window.h index bb8e81d7c6..a6c92da662 100644 --- a/include/wx/univ/window.h +++ b/include/wx/univ/window.h @@ -52,7 +52,7 @@ class WXDLLIMPEXP_FWD_CORE wxRenderer; #define wxWindowNative wxWindowMac #endif -class WXDLLEXPORT wxWindow : public wxWindowNative +class WXDLLIMPEXP_CORE wxWindow : public wxWindowNative { public: // ctors and create functions diff --git a/include/wx/unix/apptrait.h b/include/wx/unix/apptrait.h index 145a746eca..8985a93581 100644 --- a/include/wx/unix/apptrait.h +++ b/include/wx/unix/apptrait.h @@ -29,7 +29,7 @@ public: #if wxUSE_GUI -class WXDLLEXPORT wxGUIAppTraits : public wxGUIAppTraitsBase +class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase { public: virtual wxEventLoopBase *CreateEventLoop(); diff --git a/include/wx/unix/mimetype.h b/include/wx/unix/mimetype.h index fd21e6c352..6659b82be1 100644 --- a/include/wx/unix/mimetype.h +++ b/include/wx/unix/mimetype.h @@ -21,7 +21,7 @@ class wxMimeTypeCommands; WX_DEFINE_ARRAY_PTR(wxMimeTypeCommands *, wxMimeCommandsArray); // this is the real wxMimeTypesManager for Unix -class WXDLLEXPORT wxMimeTypesManagerImpl +class WXDLLIMPEXP_CORE wxMimeTypesManagerImpl { public: // ctor and dtor @@ -145,7 +145,7 @@ protected: -class WXDLLEXPORT wxFileTypeImpl +class WXDLLIMPEXP_CORE wxFileTypeImpl { public: // initialization functions diff --git a/include/wx/utils.h b/include/wx/utils.h index a016ff9468..5f1883fef3 100644 --- a/include/wx/utils.h +++ b/include/wx/utils.h @@ -200,18 +200,18 @@ inline bool wxPlatformIs(int platform) { return wxPlatform::Is(platform); } // Get the state of a key (true if pressed, false if not) // This is generally most useful getting the state of // the modifier or toggle keys. -WXDLLEXPORT bool wxGetKeyState(wxKeyCode key); +WXDLLIMPEXP_CORE bool wxGetKeyState(wxKeyCode key); // Don't synthesize KeyUp events holding down a key and producing // KeyDown events with autorepeat. On by default and always on // in wxMSW. -WXDLLEXPORT bool wxSetDetectableAutoRepeat( bool flag ); +WXDLLIMPEXP_CORE bool wxSetDetectableAutoRepeat( bool flag ); // wxMouseState is used to hold information about button and modifier state // and is what is returned from wxGetMouseState. -class WXDLLEXPORT wxMouseState +class WXDLLIMPEXP_CORE wxMouseState { public: wxMouseState() @@ -276,7 +276,7 @@ private: // Returns the current state of the mouse position, buttons and modifers -WXDLLEXPORT wxMouseState wxGetMouseState(); +WXDLLIMPEXP_CORE wxMouseState wxGetMouseState(); #endif // wxUSE_GUI @@ -595,13 +595,13 @@ enum }; // strip mnemonics and/or accelerators from the label -WXDLLEXPORT wxString +WXDLLIMPEXP_CORE wxString wxStripMenuCodes(const wxString& str, int flags = wxStrip_All); #if WXWIN_COMPATIBILITY_2_6 // obsolete and deprecated version, do not use, use the above overload instead wxDEPRECATED( - WXDLLEXPORT wxChar* wxStripMenuCodes(const wxChar *in, wxChar *out = NULL) + WXDLLIMPEXP_CORE wxChar* wxStripMenuCodes(const wxChar *in, wxChar *out = NULL) ); #if wxUSE_ACCEL @@ -609,7 +609,7 @@ class WXDLLIMPEXP_FWD_CORE wxAcceleratorEntry; // use wxAcceleratorEntry::Create() or FromString() methods instead wxDEPRECATED( - WXDLLEXPORT wxAcceleratorEntry *wxGetAccelFromString(const wxString& label) + WXDLLIMPEXP_CORE wxAcceleratorEntry *wxGetAccelFromString(const wxString& label) ); #endif // wxUSE_ACCEL @@ -620,45 +620,45 @@ wxDEPRECATED( // ---------------------------------------------------------------------------- // Returns menu item id or wxNOT_FOUND if none. -WXDLLEXPORT int wxFindMenuItemId(wxFrame *frame, const wxString& menuString, const wxString& itemString); +WXDLLIMPEXP_CORE int wxFindMenuItemId(wxFrame *frame, const wxString& menuString, const wxString& itemString); // Find the wxWindow at the given point. wxGenericFindWindowAtPoint // is always present but may be less reliable than a native version. -WXDLLEXPORT wxWindow* wxGenericFindWindowAtPoint(const wxPoint& pt); -WXDLLEXPORT wxWindow* wxFindWindowAtPoint(const wxPoint& pt); +WXDLLIMPEXP_CORE wxWindow* wxGenericFindWindowAtPoint(const wxPoint& pt); +WXDLLIMPEXP_CORE wxWindow* wxFindWindowAtPoint(const wxPoint& pt); // NB: this function is obsolete, use wxWindow::FindWindowByLabel() instead // // Find the window/widget with the given title or label. // Pass a parent to begin the search from, or NULL to look through // all windows. -WXDLLEXPORT wxWindow* wxFindWindowByLabel(const wxString& title, wxWindow *parent = (wxWindow *) NULL); +WXDLLIMPEXP_CORE wxWindow* wxFindWindowByLabel(const wxString& title, wxWindow *parent = (wxWindow *) NULL); // NB: this function is obsolete, use wxWindow::FindWindowByName() instead // // Find window by name, and if that fails, by label. -WXDLLEXPORT wxWindow* wxFindWindowByName(const wxString& name, wxWindow *parent = (wxWindow *) NULL); +WXDLLIMPEXP_CORE wxWindow* wxFindWindowByName(const wxString& name, wxWindow *parent = (wxWindow *) NULL); // ---------------------------------------------------------------------------- // Message/event queue helpers // ---------------------------------------------------------------------------- // Yield to other apps/messages and disable user input -WXDLLEXPORT bool wxSafeYield(wxWindow *win = NULL, bool onlyIfNeeded = false); +WXDLLIMPEXP_CORE bool wxSafeYield(wxWindow *win = NULL, bool onlyIfNeeded = false); // Enable or disable input to all top level windows -WXDLLEXPORT void wxEnableTopLevelWindows(bool enable = true); +WXDLLIMPEXP_CORE void wxEnableTopLevelWindows(bool enable = true); // Check whether this window wants to process messages, e.g. Stop button // in long calculations. -WXDLLEXPORT bool wxCheckForInterrupt(wxWindow *wnd); +WXDLLIMPEXP_CORE bool wxCheckForInterrupt(wxWindow *wnd); // Consume all events until no more left -WXDLLEXPORT void wxFlushEvents(); +WXDLLIMPEXP_CORE void wxFlushEvents(); // a class which disables all windows (except, may be, the given one) in its // ctor and enables them back in its dtor -class WXDLLEXPORT wxWindowDisabler +class WXDLLIMPEXP_CORE wxWindowDisabler { public: // this ctor conditionally disables all windows: if the argument is false, @@ -690,13 +690,13 @@ private: WXDLLIMPEXP_CORE void wxBeginBusyCursor(const wxCursor *cursor = wxHOURGLASS_CURSOR); // Restore cursor to normal -WXDLLEXPORT void wxEndBusyCursor(); +WXDLLIMPEXP_CORE void wxEndBusyCursor(); // true if we're between the above two calls -WXDLLEXPORT bool wxIsBusy(); +WXDLLIMPEXP_CORE bool wxIsBusy(); // Convenience class so we can just create a wxBusyCursor object on the stack -class WXDLLEXPORT wxBusyCursor +class WXDLLIMPEXP_CORE wxBusyCursor { public: wxBusyCursor(const wxCursor* cursor = wxHOURGLASS_CURSOR) @@ -713,13 +713,13 @@ public: static const wxCursor GetBusyCursor(); }; -void WXDLLEXPORT wxGetMousePosition( int* x, int* y ); +void WXDLLIMPEXP_CORE wxGetMousePosition( int* x, int* y ); // MSW only: get user-defined resource from the .res file. // Returns NULL or newly-allocated memory, so use delete[] to clean up. #ifdef __WXMSW__ - extern WXDLLEXPORT const wxChar* wxUserResourceStr; - WXDLLEXPORT wxChar* wxLoadUserResource(const wxString& resourceName, const wxString& resourceType = wxUserResourceStr); + extern WXDLLIMPEXP_CORE const wxChar* wxUserResourceStr; + WXDLLIMPEXP_CORE wxChar* wxLoadUserResource(const wxString& resourceName, const wxString& resourceType = wxUserResourceStr); #endif // MSW // ---------------------------------------------------------------------------- diff --git a/include/wx/valgen.h b/include/wx/valgen.h index 51de5129ac..d3bf35d7b3 100644 --- a/include/wx/valgen.h +++ b/include/wx/valgen.h @@ -3,7 +3,7 @@ // Purpose: wxGenericValidator class // Author: Kevin Smith // Created: Jan 22 1999 -// RCS-ID: $Id:$ +// RCS-ID: $Id$ // Copyright: (c) 1999 Julian Smart (assigned from Kevin) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -24,7 +24,7 @@ class WXDLLIMPEXP_FWD_BASE wxDateTime; // It doesn't do any validation so its name is a slight misnomer. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxGenericValidator: public wxValidator +class WXDLLIMPEXP_CORE wxGenericValidator: public wxValidator { public: // Different constructors: each of them creates a validator which can only diff --git a/include/wx/validate.h b/include/wx/validate.h index 83aa586093..1e3f4df94c 100644 --- a/include/wx/validate.h +++ b/include/wx/validate.h @@ -33,7 +33,7 @@ class WXDLLIMPEXP_FWD_CORE wxWindowBase; Note that wxValidator and derived classes use reference counting. */ -class WXDLLEXPORT wxValidator : public wxEvtHandler +class WXDLLIMPEXP_CORE wxValidator : public wxEvtHandler { public: wxValidator(); @@ -77,7 +77,7 @@ private: DECLARE_NO_COPY_CLASS(wxValidator) }; -extern WXDLLEXPORT_DATA(const wxValidator) wxDefaultValidator; +extern WXDLLIMPEXP_DATA_CORE(const wxValidator) wxDefaultValidator; #define wxVALIDATOR_PARAM(val) val diff --git a/include/wx/valtext.h b/include/wx/valtext.h index 5f85d95c27..c2a45e8040 100644 --- a/include/wx/valtext.h +++ b/include/wx/valtext.h @@ -30,7 +30,7 @@ class WXDLLIMPEXP_FWD_CORE wxTextEntry; #define wxFILTER_INCLUDE_CHAR_LIST 0x0040 #define wxFILTER_EXCLUDE_CHAR_LIST 0x0080 -class WXDLLEXPORT wxTextValidator: public wxValidator +class WXDLLIMPEXP_CORE wxTextValidator: public wxValidator { DECLARE_DYNAMIC_CLASS(wxTextValidator) public: diff --git a/include/wx/vidmode.h b/include/wx/vidmode.h index 524cf5c73d..839fae4f1d 100644 --- a/include/wx/vidmode.h +++ b/include/wx/vidmode.h @@ -16,7 +16,7 @@ // wxVideoMode: a simple struct containing video mode parameters for a display // ---------------------------------------------------------------------------- -struct WXDLLEXPORT wxVideoMode +struct WXDLLIMPEXP_CORE wxVideoMode { wxVideoMode(int width = 0, int height = 0, int depth = 0, int freq = 0) { diff --git a/include/wx/vlbox.h b/include/wx/vlbox.h index aa894553e5..c6235d98b5 100644 --- a/include/wx/vlbox.h +++ b/include/wx/vlbox.h @@ -32,7 +32,7 @@ class WXDLLIMPEXP_FWD_CORE wxSelectionStore; It emits the same events as wxListBox and the same event macros may be used with it. */ -class WXDLLEXPORT wxVListBox : public wxVScrolledWindow +class WXDLLIMPEXP_CORE wxVListBox : public wxVScrolledWindow { public: // constructors and such diff --git a/include/wx/vscroll.h b/include/wx/vscroll.h index fdaf961e5f..e80c42cd7b 100644 --- a/include/wx/vscroll.h +++ b/include/wx/vscroll.h @@ -59,7 +59,7 @@ class WXDLLIMPEXP_FWD_CORE wxVarScrollHelperEvtHandler; // required virtual functions that need to be implemented for any orientation // specific work. -class WXDLLEXPORT wxVarScrollHelperBase +class WXDLLIMPEXP_CORE wxVarScrollHelperBase { public: // constructors and such @@ -297,7 +297,7 @@ private: // Provides public API functions targeted for vertical-specific scrolling, // wrapping the functionality of wxVarScrollHelperBase. -class WXDLLEXPORT wxVarVScrollHelper : public wxVarScrollHelperBase +class WXDLLIMPEXP_CORE wxVarVScrollHelper : public wxVarScrollHelperBase { public: // constructors and such @@ -370,7 +370,7 @@ protected: // Provides public API functions targeted for horizontal-specific scrolling, // wrapping the functionality of wxVarScrollHelperBase. -class WXDLLEXPORT wxVarHScrollHelper : public wxVarScrollHelperBase +class WXDLLIMPEXP_CORE wxVarHScrollHelper : public wxVarScrollHelperBase { public: // constructors and such @@ -453,7 +453,7 @@ protected: // functions to make changing values for both orientations at the same time // easier. -class WXDLLEXPORT wxVarHVScrollHelper : public wxVarVScrollHelper, +class WXDLLIMPEXP_CORE wxVarHVScrollHelper : public wxVarVScrollHelper, public wxVarHScrollHelper { public: @@ -561,7 +561,7 @@ public: // in not only those classes, but also in wxHVScrolledWindow where functions // are inherited from both. -class WXDLLEXPORT wxVarVScrollLegacyAdaptor : public wxVarVScrollHelper +class WXDLLIMPEXP_CORE wxVarVScrollLegacyAdaptor : public wxVarVScrollHelper { public: // constructors and such @@ -680,7 +680,7 @@ public: \ // wxScrolledWindow features however, notably it can't scroll only a rectangle // of the window and not its entire client area. -class WXDLLEXPORT wxVScrolledWindow : public wxPanel, +class WXDLLIMPEXP_CORE wxVScrolledWindow : public wxPanel, public wxVarVScrollLegacyAdaptor { public: @@ -756,7 +756,7 @@ private: // wxScrolledWindow features however, notably it can't scroll only a rectangle // of the window and not its entire client area. -class WXDLLEXPORT wxHScrolledWindow : public wxPanel, +class WXDLLIMPEXP_CORE wxHScrolledWindow : public wxPanel, public wxVarHScrollHelper { public: @@ -817,7 +817,7 @@ private: // scrolled windows automatically handling everything needed to scroll both // axis simultaneously. -class WXDLLEXPORT wxHVScrolledWindow : public wxPanel, +class WXDLLIMPEXP_CORE wxHVScrolledWindow : public wxPanel, public wxVarHVScrollHelper { public: diff --git a/include/wx/window.h b/include/wx/window.h index 7987f624ae..d953c23b7e 100644 --- a/include/wx/window.h +++ b/include/wx/window.h @@ -87,7 +87,7 @@ class WXDLLIMPEXP_FWD_CORE wxAccessible; // ---------------------------------------------------------------------------- // struct containing all the visual attributes of a control -struct WXDLLEXPORT wxVisualAttributes +struct WXDLLIMPEXP_CORE wxVisualAttributes { // the font used for control label/text inside it wxFont font; @@ -129,13 +129,13 @@ enum wxShowEffect // (pseudo)template list classes // ---------------------------------------------------------------------------- -WX_DECLARE_LIST_3(wxWindow, wxWindowBase, wxWindowList, wxWindowListNode, class WXDLLEXPORT); +WX_DECLARE_LIST_3(wxWindow, wxWindowBase, wxWindowList, wxWindowListNode, class WXDLLIMPEXP_CORE); // ---------------------------------------------------------------------------- // global variables // ---------------------------------------------------------------------------- -extern WXDLLEXPORT_DATA(wxWindowList) wxTopLevelWindows; +extern WXDLLIMPEXP_DATA_CORE(wxWindowList) wxTopLevelWindows; extern WXDLLIMPEXP_DATA_CORE(wxList) wxPendingDelete; // ---------------------------------------------------------------------------- @@ -149,7 +149,7 @@ extern WXDLLIMPEXP_DATA_CORE(wxList) wxPendingDelete; // temporarily switches event handlers). // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxWindowBase : public wxEvtHandler +class WXDLLIMPEXP_CORE wxWindowBase : public wxEvtHandler { public: // creating the window @@ -517,10 +517,10 @@ public: virtual wxSize GetWindowBorderSize() const; // wxSizer and friends use this to give a chance to a component to recalc - // its min size once one of the final size components is known. Override - // this function when that is useful (such as for wxStaticText which can + // its min size once one of the final size components is known. Override + // this function when that is useful (such as for wxStaticText which can // stretch over several lines). Parameter availableOtherDir - // tells the item how much more space there is available in the opposite + // tells the item how much more space there is available in the opposite // direction (-1 if unknown). virtual bool InformFirstDirection( int WXUNUSED(direction), int WXUNUSED(size), int WXUNUSED(availableOtherDir) ) { return false; } @@ -1758,16 +1758,16 @@ inline wxWindow *wxWindowBase::GetGrandParent() const // Find the wxWindow at the current mouse position, also returning the mouse // position. -extern WXDLLEXPORT wxWindow* wxFindWindowAtPointer(wxPoint& pt); +extern WXDLLIMPEXP_CORE wxWindow* wxFindWindowAtPointer(wxPoint& pt); // Get the current mouse position. -extern WXDLLEXPORT wxPoint wxGetMousePosition(); +extern WXDLLIMPEXP_CORE wxPoint wxGetMousePosition(); // get the currently active window of this application or NULL -extern WXDLLEXPORT wxWindow *wxGetActiveWindow(); +extern WXDLLIMPEXP_CORE wxWindow *wxGetActiveWindow(); // get the (first) top level parent window -WXDLLEXPORT wxWindow* wxGetTopLevelParent(wxWindow *win); +WXDLLIMPEXP_CORE wxWindow* wxGetTopLevelParent(wxWindow *win); #if WXWIN_COMPATIBILITY_2_6 // deprecated (doesn't start with 'wx' prefix), use wxWindow::NewControlId() @@ -1780,7 +1780,7 @@ WXDLLEXPORT wxWindow* wxGetTopLevelParent(wxWindow *win); // accessible object for windows // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxWindowAccessible: public wxAccessible +class WXDLLIMPEXP_CORE wxWindowAccessible: public wxAccessible { public: wxWindowAccessible(wxWindow* win): wxAccessible(win) { if (win) win->SetAccessible(this); } diff --git a/include/wx/x11/app.h b/include/wx/x11/app.h index 0aa5f73d7f..02bea53fff 100644 --- a/include/wx/x11/app.h +++ b/include/wx/x11/app.h @@ -34,7 +34,7 @@ class WXDLLIMPEXP_FWD_CORE wxXVisualInfo; // the wxApp class for wxX11 - see wxAppBase for more details // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxApp : public wxAppBase +class WXDLLIMPEXP_CORE wxApp : public wxAppBase { public: wxApp(); diff --git a/include/wx/x11/colour.h b/include/wx/x11/colour.h index 8fce06d6a0..aad798657d 100644 --- a/include/wx/x11/colour.h +++ b/include/wx/x11/colour.h @@ -33,7 +33,7 @@ class WXDLLIMPEXP_FWD_CORE wxColour; // wxColour //----------------------------------------------------------------------------- -class WXDLLEXPORT wxColour : public wxColourBase +class WXDLLIMPEXP_CORE wxColour : public wxColourBase { public: // constructors diff --git a/include/wx/x11/dc.h b/include/wx/x11/dc.h index af0a97e96c..c8fabd9225 100644 --- a/include/wx/x11/dc.h +++ b/include/wx/x11/dc.h @@ -22,7 +22,7 @@ // wxDC //----------------------------------------------------------------------------- -class WXDLLEXPORT wxX11DCImpl : public wxDCImpl +class WXDLLIMPEXP_CORE wxX11DCImpl : public wxDCImpl { public: wxX11DCImpl( wxDC *owner ); diff --git a/include/wx/x11/dcprint.h b/include/wx/x11/dcprint.h index 1958024e26..cfb2809b07 100644 --- a/include/wx/x11/dcprint.h +++ b/include/wx/x11/dcprint.h @@ -14,7 +14,7 @@ #include "wx/dc.h" -class WXDLLEXPORT wxPrinterDC: public wxDC +class WXDLLIMPEXP_CORE wxPrinterDC: public wxDC { public: DECLARE_CLASS(wxPrinterDC) diff --git a/include/wx/x11/dnd.h b/include/wx/x11/dnd.h index dc0f7da7a1..db9bb5b992 100644 --- a/include/wx/x11/dnd.h +++ b/include/wx/x11/dnd.h @@ -36,7 +36,7 @@ class WXDLLIMPEXP_FWD_CORE wxDropSource; // wxDropTarget //------------------------------------------------------------------------- -class WXDLLEXPORT wxDropTarget: public wxObject +class WXDLLIMPEXP_CORE wxDropTarget: public wxObject { public: @@ -59,7 +59,7 @@ public: // wxTextDropTarget //------------------------------------------------------------------------- -class WXDLLEXPORT wxTextDropTarget: public wxDropTarget +class WXDLLIMPEXP_CORE wxTextDropTarget: public wxDropTarget { public: @@ -77,7 +77,7 @@ protected: // wxPrivateDropTarget //------------------------------------------------------------------------- -class WXDLLEXPORT wxPrivateDropTarget: public wxDropTarget +class WXDLLIMPEXP_CORE wxPrivateDropTarget: public wxDropTarget { public: @@ -107,7 +107,7 @@ private: // A drop target which accepts files (dragged from File Manager or Explorer) // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFileDropTarget: public wxDropTarget +class WXDLLIMPEXP_CORE wxFileDropTarget: public wxDropTarget { public: @@ -136,7 +136,7 @@ enum wxDragResult wxDragCancel // the operation was cancelled by user (not an error) }; -class WXDLLEXPORT wxDropSource: public wxObject +class WXDLLIMPEXP_CORE wxDropSource: public wxObject { public: diff --git a/include/wx/x11/minifram.h b/include/wx/x11/minifram.h index 6d33c4b8b8..551a5813a2 100644 --- a/include/wx/x11/minifram.h +++ b/include/wx/x11/minifram.h @@ -16,7 +16,7 @@ #include "wx/frame.h" -class WXDLLEXPORT wxMiniFrame: public wxFrame { +class WXDLLIMPEXP_CORE wxMiniFrame: public wxFrame { DECLARE_DYNAMIC_CLASS(wxMiniFrame) diff --git a/include/wx/x11/palette.h b/include/wx/x11/palette.h index 60d43c87b7..eac7614b34 100644 --- a/include/wx/x11/palette.h +++ b/include/wx/x11/palette.h @@ -31,7 +31,7 @@ public: bool m_destroyable; }; -class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData +class WXDLLIMPEXP_CORE wxPaletteRefData: public wxGDIRefData { friend class WXDLLIMPEXP_FWD_CORE wxPalette; public: @@ -44,7 +44,7 @@ protected: #define M_PALETTEDATA ((wxPaletteRefData *)m_refData) -class WXDLLEXPORT wxPalette : public wxPaletteBase +class WXDLLIMPEXP_CORE wxPalette : public wxPaletteBase { DECLARE_DYNAMIC_CLASS(wxPalette) diff --git a/include/wx/x11/print.h b/include/wx/x11/print.h index f67284c8b5..044938bbf8 100644 --- a/include/wx/x11/print.h +++ b/include/wx/x11/print.h @@ -18,7 +18,7 @@ * Represents the printer: manages printing a wxPrintout object */ -class WXDLLEXPORT wxPrinter: public wxPrinterBase +class WXDLLIMPEXP_CORE wxPrinter: public wxPrinterBase { DECLARE_DYNAMIC_CLASS(wxPrinter) @@ -36,7 +36,7 @@ public: * Programmer creates an object of this class to preview a wxPrintout. */ -class WXDLLEXPORT wxPrintPreview: public wxPrintPreviewBase +class WXDLLIMPEXP_CORE wxPrintPreview: public wxPrintPreviewBase { DECLARE_CLASS(wxPrintPreview) diff --git a/include/wx/x11/privx.h b/include/wx/x11/privx.h index 3e01dd4fcf..bf8386d641 100644 --- a/include/wx/x11/privx.h +++ b/include/wx/x11/privx.h @@ -148,7 +148,7 @@ bool wxWindowIsVisible(Window win); bool wxDoSetShape( Display* xdisplay, Window xwindow, const wxRegion& region ); -class WXDLLEXPORT wxXVisualInfo +class WXDLLIMPEXP_CORE wxXVisualInfo { public: wxXVisualInfo(); diff --git a/include/wx/x11/textctrl.h b/include/wx/x11/textctrl.h index ed385d7fe5..b076e0ec72 100644 --- a/include/wx/x11/textctrl.h +++ b/include/wx/x11/textctrl.h @@ -359,7 +359,7 @@ private: // wxTextCtrl types // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxStdTextCtrlInputHandler : public wxStdInputHandler +class WXDLLIMPEXP_CORE wxStdTextCtrlInputHandler : public wxStdInputHandler { public: wxStdTextCtrlInputHandler(wxInputHandler *inphand) : wxStdInputHandler(inphand) {} diff --git a/include/wx/x11/toplevel.h b/include/wx/x11/toplevel.h index ae820864c2..7aaffb5243 100644 --- a/include/wx/x11/toplevel.h +++ b/include/wx/x11/toplevel.h @@ -16,7 +16,7 @@ // wxTopLevelWindowX11 // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxTopLevelWindowX11 : public wxTopLevelWindowBase +class WXDLLIMPEXP_CORE wxTopLevelWindowX11 : public wxTopLevelWindowBase { public: // constructors and such @@ -112,6 +112,6 @@ protected: }; // list of all frames and modeless dialogs -//extern WXDLLEXPORT_DATA(wxWindowList) wxModelessWindows; +//extern WXDLLIMPEXP_DATA_CORE(wxWindowList) wxModelessWindows; #endif // _WX_X11_TOPLEVEL_H_ diff --git a/include/wx/x11/window.h b/include/wx/x11/window.h index 6c04d16eac..b28d6706e5 100644 --- a/include/wx/x11/window.h +++ b/include/wx/x11/window.h @@ -205,7 +205,7 @@ private: // optimisation, it will be reenabled as soon as the object goes out from scope. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxNoOptimize +class WXDLLIMPEXP_CORE wxNoOptimize { public: wxNoOptimize() { ms_count++; } diff --git a/include/wx/xpmdecod.h b/include/wx/xpmdecod.h index 5fd3ebe509..82b80fa3d7 100644 --- a/include/wx/xpmdecod.h +++ b/include/wx/xpmdecod.h @@ -21,7 +21,7 @@ class WXDLLIMPEXP_FWD_BASE wxInputStream; // wxXPMDecoder class // -------------------------------------------------------------------------- -class WXDLLEXPORT wxXPMDecoder +class WXDLLIMPEXP_CORE wxXPMDecoder { public: // constructor, destructor, etc. -- 2.45.2