From 62a9d04c7d9cd359f692f72db2adb781b17b4e69 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Wed, 16 Jun 2004 21:02:29 +0000 Subject: [PATCH] WXDLLEXPORT correction git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/dialup.h | 2 +- include/wx/gdicmn.h | 20 ++++++++++---------- include/wx/generic/dirctrlg.h | 6 +++--- include/wx/iconbndl.h | 4 ++-- include/wx/listbox.h | 4 ++-- include/wx/msw/app.h | 10 +++++----- include/wx/utils.h | 10 +++++----- include/wx/xpmdecod.h | 4 ++-- 8 files changed, 30 insertions(+), 30 deletions(-) diff --git a/include/wx/dialup.h b/include/wx/dialup.h index c7cf256679..63686fe30e 100644 --- a/include/wx/dialup.h +++ b/include/wx/dialup.h @@ -24,7 +24,7 @@ // misc // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxArrayString; +class WXDLLIMPEXP_BASE wxArrayString; #define WXDIALUP_MANAGER_DEFAULT_BEACONHOST wxT("www.yahoo.com") diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h index c3fe25e346..029ce3def3 100644 --- a/include/wx/gdicmn.h +++ b/include/wx/gdicmn.h @@ -30,16 +30,16 @@ // forward declarations // --------------------------------------------------------------------------- -class WXDLLEXPORT wxBitmap; -class WXDLLEXPORT wxBrush; -class WXDLLEXPORT wxColour; -class WXDLLEXPORT wxCursor; -class WXDLLEXPORT wxFont; -class WXDLLEXPORT wxIcon; -class WXDLLEXPORT wxPalette; -class WXDLLEXPORT wxPen; -class WXDLLEXPORT wxRegion; -class WXDLLEXPORT wxString; +class WXDLLIMPEXP_CORE wxBitmap; +class WXDLLIMPEXP_CORE wxBrush; +class WXDLLIMPEXP_CORE wxColour; +class WXDLLIMPEXP_CORE wxCursor; +class WXDLLIMPEXP_CORE wxFont; +class WXDLLIMPEXP_CORE wxIcon; +class WXDLLIMPEXP_CORE wxPalette; +class WXDLLIMPEXP_CORE wxPen; +class WXDLLIMPEXP_CORE wxRegion; +class WXDLLIMPEXP_BASE wxString; // --------------------------------------------------------------------------- // constants diff --git a/include/wx/generic/dirctrlg.h b/include/wx/generic/dirctrlg.h index cc6624c6fc..1ebdf528e1 100644 --- a/include/wx/generic/dirctrlg.h +++ b/include/wx/generic/dirctrlg.h @@ -30,9 +30,9 @@ // classes //----------------------------------------------------------------------------- -class WXDLLEXPORT wxTextCtrl; -class WXDLLEXPORT wxImageList; -class WXDLLEXPORT wxHashTable; +class WXDLLIMPEXP_CORE wxTextCtrl; +class WXDLLIMPEXP_CORE wxImageList; +class WXDLLIMPEXP_BASE wxHashTable; //----------------------------------------------------------------------------- // Extra styles for wxGenericDirCtrl diff --git a/include/wx/iconbndl.h b/include/wx/iconbndl.h index f73684f75d..001530f008 100644 --- a/include/wx/iconbndl.h +++ b/include/wx/iconbndl.h @@ -20,8 +20,8 @@ // for wxSize #include "wx/gdicmn.h" -class WXDLLEXPORT wxIcon; -class WXDLLEXPORT wxString; +class WXDLLIMPEXP_CORE wxIcon; +class WXDLLIMPEXP_BASE wxString; WX_DECLARE_EXPORTED_OBJARRAY( wxIcon, wxIconArray ); diff --git a/include/wx/listbox.h b/include/wx/listbox.h index 4ce3b2ff83..186e616d0b 100644 --- a/include/wx/listbox.h +++ b/include/wx/listbox.h @@ -27,8 +27,8 @@ #include "wx/ctrlsub.h" // base class // forward declarations are enough here -class WXDLLEXPORT wxArrayInt; -class WXDLLEXPORT wxArrayString; +class WXDLLIMPEXP_BASE wxArrayInt; +class WXDLLIMPEXP_BASE wxArrayString; // ---------------------------------------------------------------------------- // global data diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h index 10e1dbd4fb..e29c62f45b 100644 --- a/include/wx/msw/app.h +++ b/include/wx/msw/app.h @@ -19,11 +19,11 @@ #include "wx/event.h" #include "wx/icon.h" -class WXDLLEXPORT wxFrame; -class WXDLLEXPORT wxWindow; -class WXDLLEXPORT wxApp ; -class WXDLLEXPORT wxKeyEvent; -class WXDLLEXPORT wxLog; +class WXDLLIMPEXP_CORE wxFrame; +class WXDLLIMPEXP_CORE wxWindow; +class WXDLLIMPEXP_CORE wxApp; +class WXDLLIMPEXP_CORE wxKeyEvent; +class WXDLLIMPEXP_BASE wxLog; // Represents the application. Derive OnInit and declare // a new App object to start application diff --git a/include/wx/utils.h b/include/wx/utils.h index 15684985fb..439325d635 100644 --- a/include/wx/utils.h +++ b/include/wx/utils.h @@ -48,11 +48,11 @@ class WXDLLIMPEXP_BASE wxArrayString; // Forward declaration // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_BASE wxProcess; -class WXDLLIMPEXP_BASE wxFrame; -class WXDLLIMPEXP_BASE wxWindow; -class WXDLLIMPEXP_BASE wxWindowList; -class WXDLLIMPEXP_BASE wxPoint; +class WXDLLIMPEXP_CORE wxProcess; +class WXDLLIMPEXP_CORE wxFrame; +class WXDLLIMPEXP_CORE wxWindow; +class WXDLLIMPEXP_CORE wxWindowList; +class WXDLLIMPEXP_CORE wxPoint; // ---------------------------------------------------------------------------- // Macros diff --git a/include/wx/xpmdecod.h b/include/wx/xpmdecod.h index 807f2ed2d2..f35b7f47ea 100644 --- a/include/wx/xpmdecod.h +++ b/include/wx/xpmdecod.h @@ -17,8 +17,8 @@ #include "wx/setup.h" -class WXDLLEXPORT wxImage; -class WXDLLEXPORT wxInputStream; +class WXDLLIMPEXP_CORE wxImage; +class WXDLLIMPEXP_BASE wxInputStream; // -------------------------------------------------------------------------- // wxXPMDecoder class -- 2.45.2