From 4a2e5ee8f9db480a7522a4dec679647829050c94 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Fri, 26 May 2006 19:02:57 +0000
Subject: [PATCH] Fixes for the DLL build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
src/common/choiccmn.cpp | 2 +-
src/common/ctrlcmn.cpp | 2 +-
src/common/datavcmn.cpp | 2 +-
src/common/gaugecmn.cpp | 2 +-
src/generic/textdlgg.cpp | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/common/choiccmn.cpp b/src/common/choiccmn.cpp
index cf053fb611..5a77d70f82 100644
--- 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 a0af638bcb..9f6df5c86f 100644
--- 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 87d0a54f73..106bf563f8 100644
--- 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 453337e805..49d5b59144 100644
--- 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 6c659fd660..aae60f3231 100644
--- 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
--
2.47.2