move some definitions out of datacmn.cpp

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

diff --git a/src/common/clrpickercmn.cpp b/src/common/clrpickercmn.cpp
index 03c2f5caaabe4c2da4e1ff719541a9cd1e94b239..7349262a5361905b7002d7c77c0d5664fec9d238 100644 (file)
--- a/src/common/clrpickercmn.cpp
+++ b/src/common/clrpickercmn.cpp
@@ -32,6 +32,8 @@
     #include "wx/textctrl.h"
 #endif
 
+const wxChar wxColourPickerCtrlNameStr[] = wxT("colourpicker");
+const wxChar wxColourPickerWidgetNameStr[] = wxT("colourpickerwidget");
 
 // ============================================================================
 // implementation

diff --git a/src/common/datacmn.cpp b/src/common/datacmn.cpp
index 2b88eae6ccbd24530d0dfb22da127bd2a7b0f109..6adf343f3a06076e8329129447c345c7f4ce88f7 100644 (file)
--- a/src/common/datacmn.cpp
+++ b/src/common/datacmn.cpp
@@ -80,14 +80,3 @@ 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) wxColourPickerCtrlNameStr[] = wxT("colourpicker");
-extern WXDLLEXPORT_DATA(const wxChar) wxColourPickerWidgetNameStr[] = wxT("colourpickerwidget");
-extern WXDLLEXPORT_DATA(const wxChar) wxFontPickerCtrlNameStr[] = wxT("fontpicker");
-extern WXDLLEXPORT_DATA(const wxChar) wxFontPickerWidgetNameStr[] = wxT("fontpickerwidget");
-extern WXDLLEXPORT_DATA(const wxChar) wxFilePickerCtrlNameStr[] = wxT("filepicker");
-extern WXDLLEXPORT_DATA(const wxChar) wxFilePickerWidgetNameStr[] = wxT("filepickerwidget");
-extern WXDLLEXPORT_DATA(const wxChar) wxDirPickerCtrlNameStr[] = wxT("dirpicker");
-extern WXDLLEXPORT_DATA(const wxChar) wxDirPickerWidgetNameStr[] = wxT("dirpickerwidget");
-extern WXDLLEXPORT_DATA(const wxChar) wxFilePickerWidgetLabel[] = wxT("Browse");
-extern WXDLLEXPORT_DATA(const wxChar) wxDirPickerWidgetLabel[] = wxT("Browse");
-

diff --git a/src/common/filepickercmn.cpp b/src/common/filepickercmn.cpp
index 1e85b13f3c7accc4d88627c514b0114d6d436b84..97e1913b3471866df137f5502d187f60a53d60be 100644 (file)
--- a/src/common/filepickercmn.cpp
+++ b/src/common/filepickercmn.cpp
@@ -37,6 +37,13 @@
 // implementation
 // ============================================================================
 
+const wxChar wxFilePickerCtrlNameStr[] = wxT("filepicker");
+const wxChar wxFilePickerWidgetNameStr[] = wxT("filepickerwidget");
+const wxChar wxDirPickerCtrlNameStr[] = wxT("dirpicker");
+const wxChar wxDirPickerWidgetNameStr[] = wxT("dirpickerwidget");
+const wxChar wxFilePickerWidgetLabel[] = wxT("Browse");
+const wxChar wxDirPickerWidgetLabel[] = wxT("Browse");
+
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_FILEPICKER_CHANGED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_DIRPICKER_CHANGED)
 IMPLEMENT_DYNAMIC_CLASS(wxFileDirPickerEvent, wxCommandEvent)

diff --git a/src/common/fontpickercmn.cpp b/src/common/fontpickercmn.cpp
index 92cf9898b69dbeeda5d1d0a16be99932afd88596..00c68a699dfbf82ab2c7591070a3c222bfcaa12c 100644 (file)
--- a/src/common/fontpickercmn.cpp
+++ b/src/common/fontpickercmn.cpp
@@ -39,6 +39,9 @@
 // implementation
 // ============================================================================
 
+const wxChar wxFontPickerCtrlNameStr[] = wxT("fontpicker");
+const wxChar wxFontPickerWidgetNameStr[] = wxT("fontpickerwidget");
+
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_FONTPICKER_CHANGED)
 IMPLEMENT_DYNAMIC_CLASS(wxFontPickerCtrl, wxPickerBase)
 IMPLEMENT_DYNAMIC_CLASS(wxFontPickerEvent, wxCommandEvent)