WXDLLEXPORTLOCAL removed, WXDLLEXPORT seems to be enough

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h
index 4d87b0bed17d014090e78993b21367664224e4b7..e1ee899f16f05c39ad56babbe44872fea9250526 100644 (file)
--- 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);       \
 // ----------------------------------------------------------------------------
 #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()                                                            \
 {                                                                   \
 public:                                                             \
   name()                                                            \


@@ -226,7 +226,7 @@ public:                                                             \
 // ----------------------------------------------------------------------------
 #define  _WX_DEFINE_SORTED_ARRAY(T, name)                           \
 typedef int (CMPFUNC_CONV *SCMPFUNC##T)(T pItem1, T pItem2);        \
 // ----------------------------------------------------------------------------
 #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)                                              \
 {                                                                   \
 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);     \
 // ----------------------------------------------------------------------------
 #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() { }                                                        \
 {                                                                   \
 public:                                                             \
   name() { }                                                        \


@@ -403,8 +403,6 @@ private:                                                            \
 // # overhead if not used?
 // ----------------------------------------------------------------------------
 
 // # overhead if not used?
 // ----------------------------------------------------------------------------
 

-#define WXDLLEXPORTLOCAL WXDLLEXPORT
-

 //@{
   /** @name ArrayInt */
 WX_DEFINE_ARRAY(int,    wxArrayInt);
 //@{
   /** @name ArrayInt */
 WX_DEFINE_ARRAY(int,    wxArrayInt);


@@ -416,9 +414,6 @@ WX_DEFINE_ARRAY(void *, wxArrayPtrVoid);
 
 //@}
 
 
 //@}
 

-#undef  WXDLLEXPORTLOCAL
-#define WXDLLEXPORTLOCAL
-

 // -----------------------------------------------------------------------------
 // convinience macros
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 // convinience macros
 // -----------------------------------------------------------------------------

diff --git a/include/wx/msw/dcclient.h b/include/wx/msw/dcclient.h
index 16949da89b9f4d1cb5970ee624cd1e58403c6160..21d1a42e53304c5d702b3d5052e8350b1081f245 100644 (file)
--- 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;
 
 // this one if used by wxPaintDC only
 struct WXDLLEXPORT wxPaintDCInfo;
 

-#undef  WXDLLEXPORTLOCAL
-#define WXDLLEXPORTLOCAL WXDLLEXPORT

 WX_DECLARE_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo);
 WX_DECLARE_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo);

-#undef  WXDLLEXPORTLOCAL
-#define WXDLLEXPORTLOCAL

 
 // ----------------------------------------------------------------------------
 // DC classes
 
 // ----------------------------------------------------------------------------
 // DC classes

diff --git a/include/wx/msw/listbox.h b/include/wx/msw/listbox.h
index 12cd4d1b0365abd0779c3b880a65801def774e6f..0272e7e047ab927aa52039552db13a5a07c0d48d 100644 (file)
--- 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  <wx/dynarray.h>
 
   // define the array of list box items
   #include  <wx/dynarray.h>
 

-  #undef WXDLLEXPORTLOCAL
-  #define WXDLLEXPORTLOCAL WXDLLEXPORT

   WX_DEFINE_ARRAY(wxOwnerDrawn *, wxListBoxItemsArray);
   WX_DEFINE_ARRAY(wxOwnerDrawn *, wxListBoxItemsArray);

-  #undef  WXDLLEXPORTLOCAL
-  #define WXDLLEXPORTLOCAL

 
 #endif
 
 
 #endif
 

diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h
index 586144ed879506c79c19a3daa360440fc4ea7ede..95a794e6b8c1cd91f0a1dc84bb1d23f0c99ef417 100644 (file)
--- 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
 
 // 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);
 
 WX_DEFINE_ARRAY(wxNotebookPage *, wxArrayPages);
 

-#undef  WXDLLEXPORTLOCAL
-#define WXDLLEXPORTLOCAL
-

 // ----------------------------------------------------------------------------
 // wxNotebook
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxNotebook
 // ----------------------------------------------------------------------------