From 93add80831b56a8a580e76a837b34b88ceb7d196 Mon Sep 17 00:00:00 2001 From: Mattia Barbon Date: Sat, 21 Sep 2002 16:16:57 +0000 Subject: [PATCH] GCC 3.2 is really picky about friends & dllexport. Now wxWindows compiles (again) as DLL with MinGW GCC 3.2 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17320 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/list.h | 2 +- include/wx/msw/dialog.h | 4 +++- include/wx/object.h | 2 +- src/msw/checklst.cpp | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/wx/list.h b/include/wx/list.h index 886c744618..03260003d7 100644 --- a/include/wx/list.h +++ b/include/wx/list.h @@ -193,7 +193,7 @@ private: class WXDLLEXPORT wxListBase : public wxObject { -friend class wxNodeBase; // should be able to call DetachNode() +friend class WXDLLEXPORT wxNodeBase; // should be able to call DetachNode() friend class wxHashTableBase; // should be able to call untyped Find() private: // common part of all ctors diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h index 3a779079b4..2c3b5b2088 100644 --- a/include/wx/msw/dialog.h +++ b/include/wx/msw/dialog.h @@ -20,6 +20,8 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr; +class WXDLLEXPORT wxWindowDisabler; + // Dialog boxes class WXDLLEXPORT wxDialog : public wxDialogBase { @@ -115,7 +117,7 @@ private: // while we are showing a modal dialog we disable the other windows using // this object - class wxWindowDisabler *m_windowDisabler; + wxWindowDisabler *m_windowDisabler; DECLARE_DYNAMIC_CLASS(wxDialog) DECLARE_EVENT_TABLE() diff --git a/include/wx/object.h b/include/wx/object.h index 4fcb3c178c..be4a7bbc3f 100644 --- a/include/wx/object.h +++ b/include/wx/object.h @@ -501,7 +501,7 @@ protected: class WXDLLEXPORT wxObjectRefData { - friend class wxObject; + friend class WXDLLEXPORT wxObject; public: wxObjectRefData() : m_count(1) { } diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp index d72f1c609e..8f1f3707a2 100644 --- a/src/msw/checklst.cpp +++ b/src/msw/checklst.cpp @@ -73,7 +73,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox) class wxCheckListBoxItem : public wxOwnerDrawn { -friend class wxCheckListBox; +friend class WXDLLEXPORT wxCheckListBox; public: // ctor wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex);