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 ead133cc7bfba42b9a7f73b1100c00df532a0cd0..8ab4f4f1251dbd1a246ab5bd866f9863616f2f32 100644 (file)
--- a/include/wx/generic/grid.h
+++ b/include/wx/generic/grid.h
@@ -28,7 +28,7 @@
 // constants
 // ----------------------------------------------------------------------------
 
 // constants
 // ----------------------------------------------------------------------------
 

-extern WXDLLEXPORT_DATA(const wxChar) wxGridNameStr[];
+extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxGridNameStr[];

 
 // Default parameters for wxGrid
 //
 
 // Default parameters for wxGrid
 //

diff --git a/src/common/datacmn.cpp b/src/common/datacmn.cpp
index 1007ea775fe1dabcf077b8e63a6f6a1d0c39391e..15667bb34cd2b40eaced4031729f2b068771b81d 100644 (file)
--- 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) 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");
 
 // Default messages
 extern WXDLLEXPORT_DATA(const wxChar) wxMessageBoxCaptionStr[] = wxT("Message");

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index c216e7291bc3858f0d8575445255d68fc4cd5089..661470456b0ae3078dc14e6b5c2df473302b4340 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -18,6 +18,8 @@
 
 #if wxUSE_GRID
 
 
 #if wxUSE_GRID
 

+#include "wx/grid.h"
+

 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dcclient.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/tokenzr.h"
 #include "wx/renderer.h"
 

-#include "wx/grid.h"

 #include "wx/generic/gridsel.h"
 
 #include "wx/generic/gridsel.h"
 

+const wxChar wxGridNameStr[] = wxT("grid");
+

 #if defined(__WXMOTIF__)
     #define WXUNUSED_MOTIF(identifier)  WXUNUSED(identifier)
 #else
 #if defined(__WXMOTIF__)
     #define WXUNUSED_MOTIF(identifier)  WXUNUSED(identifier)
 #else