DLL build fixes

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

diff --git a/include/wx/aboutdlg.h b/include/wx/aboutdlg.h
index 3de6e10af896d2ff9f720ca99438b46f6c9f2fd6..2c38167c7ddc86d849bc6fd1a2dd1df5fd446a16 100644 (file)
--- 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 681cc987df62a1862bc191fd68da6b9f8901ae18..421fbe452bfbd87efed25c09612ea13628cbe5b4 100644 (file)
--- 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 0529ce38367967fdb9b070937c03a0d038e8d297..2b88eae6ccbd24530d0dfb22da127bd2a7b0f109 100644 (file)
--- 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 864ff142b16f8c2ccbe8f376199d3e3f2ef036a1..ffb360855461eb3c1c1b56034e080d1ab9636aae 100644 (file)
--- 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
 // ----------------------------------------------------------------------------