From: Paul Cornett <paulcor@bullseye.com>
Date: Mon, 2 Oct 2006 08:12:33 +0000 (+0000)
Subject: put grid string in generic/grid.cpp, not common/datacmn.cpp
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4c44eb66f34f90787524797472d48f35d98a9e23

put grid string in generic/grid.cpp, not common/datacmn.cpp


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

diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
index ead133cc7b..8ab4f4f125 100644
--- a/include/wx/generic/grid.h
+++ b/include/wx/generic/grid.h
@@ -28,7 +28,7 @@
 // constants
 // ----------------------------------------------------------------------------
 
-extern WXDLLEXPORT_DATA(const wxChar) wxGridNameStr[];
+extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxGridNameStr[];
 
 // Default parameters for wxGrid
 //
diff --git a/src/common/datacmn.cpp b/src/common/datacmn.cpp
index 1007ea775f..15667bb34c 100644
--- a/src/common/datacmn.cpp
+++ b/src/common/datacmn.cpp
@@ -60,7 +60,6 @@ extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[] = wxT("status_line")
 extern WXDLLEXPORT_DATA(const wxChar) wxTextCtrlNameStr[] = wxT("text");
 extern WXDLLEXPORT_DATA(const wxChar) wxTreeCtrlNameStr[] = wxT("treeCtrl");
 extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[] = wxT("toolbar");
-extern WXDLLEXPORT_DATA(const wxChar) wxGridNameStr[] = wxT("grid");
 
 // Default messages
 extern WXDLLEXPORT_DATA(const wxChar) wxMessageBoxCaptionStr[] = wxT("Message");
diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index c216e7291b..661470456b 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -18,6 +18,8 @@
 
 #if wxUSE_GRID
 
+#include "wx/grid.h"
+
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dcclient.h"
@@ -37,9 +39,10 @@
 #include "wx/tokenzr.h"
 #include "wx/renderer.h"
 
-#include "wx/grid.h"
 #include "wx/generic/gridsel.h"
 
+const wxChar wxGridNameStr[] = wxT("grid");
+
 #if defined(__WXMOTIF__)
     #define WXUNUSED_MOTIF(identifier)  WXUNUSED(identifier)
 #else