AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

WXDLLEXPORTLOCAL removed, WXDLLEXPORT seems to be enough

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 1999-06-13 23:59:16 +00:00
parent d427503c36
commit 683730003b
4 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/dynarray.h
View File

@ -168,7 +168,7 @@ private:
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#define _WX_DEFINE_ARRAY(T, name) \ #define _WX_DEFINE_ARRAY(T, name) \
typedef int (CMPFUNC_CONV *CMPFUNC##T)(T *pItem1, T *pItem2); \ typedef int (CMPFUNC_CONV *CMPFUNC##T)(T *pItem1, T *pItem2); \
class WXDLLEXPORTLOCAL name : public wxBaseArray \ class WXDLLEXPORT name : public wxBaseArray \
{ \ { \
public: \ public: \
name() \ name() \
@ -226,7 +226,7 @@ public: \
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#define _WX_DEFINE_SORTED_ARRAY(T, name) \ #define _WX_DEFINE_SORTED_ARRAY(T, name) \
typedef int (CMPFUNC_CONV *SCMPFUNC##T)(T pItem1, T pItem2); \ typedef int (CMPFUNC_CONV *SCMPFUNC##T)(T pItem1, T pItem2); \
class WXDLLEXPORTLOCAL name : public wxBaseArray \ class WXDLLEXPORT name : public wxBaseArray \
{ \ { \
public: \ public: \
name(SCMPFUNC##T fn) \ name(SCMPFUNC##T fn) \
@ -267,7 +267,7 @@ private: \
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#define _WX_DECLARE_OBJARRAY(T, name) \ #define _WX_DECLARE_OBJARRAY(T, name) \
typedef int (CMPFUNC_CONV *CMPFUNC##T)(T** pItem1, T** pItem2); \ typedef int (CMPFUNC_CONV *CMPFUNC##T)(T** pItem1, T** pItem2); \
class WXDLLEXPORTLOCAL name : public wxBaseArray \ class WXDLLEXPORT name : public wxBaseArray \
{ \ { \
public: \ public: \
name() { } \ name() { } \
@ -403,8 +403,6 @@ private: \
// # overhead if not used? // # overhead if not used?
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#define WXDLLEXPORTLOCAL WXDLLEXPORT
//@{ //@{
/** @name ArrayInt */ /** @name ArrayInt */
WX_DEFINE_ARRAY(int, wxArrayInt); WX_DEFINE_ARRAY(int, wxArrayInt);
@ -416,9 +414,6 @@ WX_DEFINE_ARRAY(void *, wxArrayPtrVoid);
//@} //@}
#undef WXDLLEXPORTLOCAL
#define WXDLLEXPORTLOCAL
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// convinience macros // convinience macros
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------

4
include/wx/msw/dcclient.h
View File

@ -30,11 +30,7 @@
// this one if used by wxPaintDC only // this one if used by wxPaintDC only
struct WXDLLEXPORT wxPaintDCInfo; 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

4
include/wx/msw/listbox.h
View File

@ -26,11 +26,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxListBoxNameStr;
// define the array of list box items // define the array of list box items
#include <wx/dynarray.h> #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

6
include/wx/msw/notebook.h
View File

@ -33,14 +33,8 @@ class WXDLLEXPORT wxWindow;
// array of notebook pages // array of notebook pages
typedef wxWindow WXDLLEXPORT wxNotebookPage; // so far, any window can be a page 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
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------