Fixes for the DLL build

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

diff --git a/src/common/choiccmn.cpp b/src/common/choiccmn.cpp
index cf053fb611cdc72a087f2e5dcf5f40d5da5caf67..5a77d70f826db3a88cba89ab6508ebcfc83c8fd5 100644 (file)
--- a/src/common/choiccmn.cpp
+++ b/src/common/choiccmn.cpp
@@ -30,7 +30,7 @@
     #include "wx/choice.h"
 #endif
 
-WXDLLIMPEXP_DATA_CORE(const wxChar) wxChoiceNameStr[] = wxT("choice");
+const wxChar wxChoiceNameStr[] = wxT("choice");
 
 // ============================================================================
 // implementation

diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp
index a0af638bcb9ef6b34c3f023882f36a6c6d9f286d..9f6df5c86fb20a5dabf1d1cae76102251b467186 100644 (file)
--- a/src/common/ctrlcmn.cpp
+++ b/src/common/ctrlcmn.cpp
@@ -38,7 +38,7 @@
     #include "wx/statbmp.h"
 #endif // wxUSE_STATBMP
 
-WXDLLIMPEXP_DATA_CORE(const wxChar) wxControlNameStr[] = wxT("control");
+const wxChar wxControlNameStr[] = wxT("control");
 
 // ============================================================================
 // implementation

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 87d0a54f73e6d57a7fe92f7c79fe307d7064d95f..106bf563f8b4260f2182674a8ff47b4fe3d067c3 100644 (file)
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -23,7 +23,7 @@
     #include "wx/log.h"
 #endif
 
-WXDLLIMPEXP_DATA_ADV(const wxChar) wxDataViewCtrlNameStr[] = wxT("dataviewCtrl");
+const wxChar wxDataViewCtrlNameStr[] = wxT("dataviewCtrl");
 
 // ---------------------------------------------------------
 // wxDataViewModel

diff --git a/src/common/gaugecmn.cpp b/src/common/gaugecmn.cpp
index 453337e805a16e394ac344dda8dd54d059ede0d2..49d5b5914450339e6042b22ac9961d57b9900254 100644 (file)
--- a/src/common/gaugecmn.cpp
+++ b/src/common/gaugecmn.cpp
@@ -31,7 +31,7 @@
 
 #include "wx/gauge.h"
 
-WXDLLIMPEXP_DATA_CORE(const wxChar) wxGaugeNameStr[] = wxT("gauge");
+const wxChar wxGaugeNameStr[] = wxT("gauge");
 
 // ============================================================================
 // implementation

diff --git a/src/generic/textdlgg.cpp b/src/generic/textdlgg.cpp
index 6c659fd660ec62e6ee5e49f2ec87fc60b853a1f4..aae60f323148cf7c84812971512377f7a62d0caa 100644 (file)
--- a/src/generic/textdlgg.cpp
+++ b/src/generic/textdlgg.cpp
@@ -42,8 +42,8 @@
     #include "wx/statline.h"
 #endif
 
-WXDLLIMPEXP_DATA_CORE(const wxChar) wxGetTextFromUserPromptStr[] = wxT("Input Text");
-WXDLLIMPEXP_DATA_CORE(const wxChar) wxGetPasswordFromUserPromptStr[] = wxT("Enter Password");
+const wxChar wxGetTextFromUserPromptStr[] = wxT("Input Text");
+const wxChar wxGetPasswordFromUserPromptStr[] = wxT("Enter Password");
 
 // ----------------------------------------------------------------------------
 // constants