From 683730003ba8f36fa07496b8f298d40733534aea Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 13 Jun 1999 23:59:16 +0000 Subject: [PATCH] WXDLLEXPORTLOCAL removed, WXDLLEXPORT seems to be enough git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/dynarray.h | 11 +++-------- include/wx/msw/dcclient.h | 4 ---- include/wx/msw/listbox.h | 4 ---- include/wx/msw/notebook.h | 6 ------ 4 files changed, 3 insertions(+), 22 deletions(-) diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h index 4d87b0bed1..e1ee899f16 100644 --- a/include/wx/dynarray.h +++ b/include/wx/dynarray.h @@ -168,7 +168,7 @@ private: // ---------------------------------------------------------------------------- #define _WX_DEFINE_ARRAY(T, name) \ typedef int (CMPFUNC_CONV *CMPFUNC##T)(T *pItem1, T *pItem2); \ -class WXDLLEXPORTLOCAL name : public wxBaseArray \ +class WXDLLEXPORT name : public wxBaseArray \ { \ public: \ name() \ @@ -226,7 +226,7 @@ public: \ // ---------------------------------------------------------------------------- #define _WX_DEFINE_SORTED_ARRAY(T, name) \ typedef int (CMPFUNC_CONV *SCMPFUNC##T)(T pItem1, T pItem2); \ -class WXDLLEXPORTLOCAL name : public wxBaseArray \ +class WXDLLEXPORT name : public wxBaseArray \ { \ public: \ name(SCMPFUNC##T fn) \ @@ -267,7 +267,7 @@ private: \ // ---------------------------------------------------------------------------- #define _WX_DECLARE_OBJARRAY(T, name) \ typedef int (CMPFUNC_CONV *CMPFUNC##T)(T** pItem1, T** pItem2); \ -class WXDLLEXPORTLOCAL name : public wxBaseArray \ +class WXDLLEXPORT name : public wxBaseArray \ { \ public: \ name() { } \ @@ -403,8 +403,6 @@ private: \ // # overhead if not used? // ---------------------------------------------------------------------------- -#define WXDLLEXPORTLOCAL WXDLLEXPORT - //@{ /** @name ArrayInt */ WX_DEFINE_ARRAY(int, wxArrayInt); @@ -416,9 +414,6 @@ WX_DEFINE_ARRAY(void *, wxArrayPtrVoid); //@} -#undef WXDLLEXPORTLOCAL -#define WXDLLEXPORTLOCAL - // ----------------------------------------------------------------------------- // convinience macros // ----------------------------------------------------------------------------- diff --git a/include/wx/msw/dcclient.h b/include/wx/msw/dcclient.h index 16949da89b..21d1a42e53 100644 --- a/include/wx/msw/dcclient.h +++ b/include/wx/msw/dcclient.h @@ -30,11 +30,7 @@ // this one if used by wxPaintDC only struct WXDLLEXPORT wxPaintDCInfo; -#undef WXDLLEXPORTLOCAL -#define WXDLLEXPORTLOCAL WXDLLEXPORT WX_DECLARE_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo); -#undef WXDLLEXPORTLOCAL -#define WXDLLEXPORTLOCAL // ---------------------------------------------------------------------------- // DC classes diff --git a/include/wx/msw/listbox.h b/include/wx/msw/listbox.h index 12cd4d1b03..0272e7e047 100644 --- a/include/wx/msw/listbox.h +++ b/include/wx/msw/listbox.h @@ -26,11 +26,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxListBoxNameStr; // define the array of list box items #include - #undef WXDLLEXPORTLOCAL - #define WXDLLEXPORTLOCAL WXDLLEXPORT WX_DEFINE_ARRAY(wxOwnerDrawn *, wxListBoxItemsArray); - #undef WXDLLEXPORTLOCAL - #define WXDLLEXPORTLOCAL #endif diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h index 586144ed87..95a794e6b8 100644 --- a/include/wx/msw/notebook.h +++ b/include/wx/msw/notebook.h @@ -33,14 +33,8 @@ class WXDLLEXPORT wxWindow; // array of notebook pages typedef wxWindow WXDLLEXPORT wxNotebookPage; // so far, any window can be a page -#undef WXDLLEXPORTLOCAL -#define WXDLLEXPORTLOCAL WXDLLEXPORT - WX_DEFINE_ARRAY(wxNotebookPage *, wxArrayPages); -#undef WXDLLEXPORTLOCAL -#define WXDLLEXPORTLOCAL - // ---------------------------------------------------------------------------- // wxNotebook // ---------------------------------------------------------------------------- -- 2.45.2