From b85db900cdc04cd70dfa940c7d99469f7f4c2b41 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Mon, 9 Oct 2006 16:56:18 +0000
Subject: [PATCH] DLL build fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41813 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/aboutdlg.h          | 4 ++--
 include/wx/generic/aboutdlgg.h | 6 +++---
 src/common/datacmn.cpp         | 1 -
 src/generic/hyperlink.cpp      | 2 ++
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/include/wx/aboutdlg.h b/include/wx/aboutdlg.h
index 3de6e10af8..2c38167c7d 100644
--- a/include/wx/aboutdlg.h
+++ b/include/wx/aboutdlg.h
@@ -22,7 +22,7 @@
 // wxAboutDialogInfo: information shown by the standard "About" dialog
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxAboutDialogInfo
+class WXDLLIMPEXP_ADV wxAboutDialogInfo
 {
 public:
     // all fields are initially uninitialized
@@ -147,7 +147,7 @@ private:
 };
 
 // functions to show the about dialog box
-WXDLLIMPEXP_CORE void wxAboutBox(const wxAboutDialogInfo& info);
+WXDLLIMPEXP_ADV void wxAboutBox(const wxAboutDialogInfo& info);
 
 #endif // wxUSE_ABOUTDLG
 
diff --git a/include/wx/generic/aboutdlgg.h b/include/wx/generic/aboutdlgg.h
index 681cc987df..421fbe452b 100644
--- a/include/wx/generic/aboutdlgg.h
+++ b/include/wx/generic/aboutdlgg.h
@@ -17,7 +17,7 @@
 
 #include "wx/dialog.h"
 
-class WXDLLIMPEXP_CORE wxAboutDialogInfo;
+class WXDLLIMPEXP_ADV  wxAboutDialogInfo;
 class WXDLLIMPEXP_CORE wxSizer;
 class WXDLLIMPEXP_CORE wxSizerFlags;
 
@@ -25,7 +25,7 @@ class WXDLLIMPEXP_CORE wxSizerFlags;
 // wxGenericAboutDialog: generic "About" dialog implementation
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxGenericAboutDialog : public wxDialog
+class WXDLLIMPEXP_ADV wxGenericAboutDialog : public wxDialog
 {
 public:
     // constructors and Create() method
@@ -74,7 +74,7 @@ private:
 
 // unlike wxAboutBox which can show either the native or generic about dialog,
 // this function always shows the generic one
-WXDLLIMPEXP_CORE void wxGenericAboutBox(const wxAboutDialogInfo& info);
+WXDLLIMPEXP_ADV void wxGenericAboutBox(const wxAboutDialogInfo& info);
 
 #endif // wxUSE_ABOUTDLG
 
diff --git a/src/common/datacmn.cpp b/src/common/datacmn.cpp
index 0529ce3836..2b88eae6cc 100644
--- a/src/common/datacmn.cpp
+++ b/src/common/datacmn.cpp
@@ -80,7 +80,6 @@ extern WXDLLEXPORT_DATA(const wxChar) wxFileDialogNameStr[] = wxT("filedlg");
 #if defined(__WXMSW__) || defined(__OS2__)
 WXDLLEXPORT_DATA(const wxChar *) wxUserResourceStr = wxT("TEXT");
 #endif
-extern WXDLLEXPORT_DATA(const wxChar) wxHyperlinkCtrlNameStr[] = wxT("hyperlink");
 extern WXDLLEXPORT_DATA(const wxChar) wxColourPickerCtrlNameStr[] = wxT("colourpicker");
 extern WXDLLEXPORT_DATA(const wxChar) wxColourPickerWidgetNameStr[] = wxT("colourpickerwidget");
 extern WXDLLEXPORT_DATA(const wxChar) wxFontPickerCtrlNameStr[] = wxT("fontpicker");
diff --git a/src/generic/hyperlink.cpp b/src/generic/hyperlink.cpp
index 864ff142b1..ffb3608554 100644
--- a/src/generic/hyperlink.cpp
+++ b/src/generic/hyperlink.cpp
@@ -53,6 +53,8 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_HYPERLINK)
 // reserved for internal use only
 #define wxHYPERLINKCTRL_POPUP_COPY_ID           16384
 
+const wxChar wxHyperlinkCtrlNameStr[] = wxT("hyperlink");
+
 // ----------------------------------------------------------------------------
 // wxHyperlinkCtrl
 // ----------------------------------------------------------------------------
-- 
2.45.2