Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41554 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2006-10-02 08:12:33 +00:00
parent f491be1060
commit 4c44eb66f3
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/generic/grid.h
View File

@@ -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
// //

1
src/common/datacmn.cpp
View File

@@ -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) wxTextCtrlNameStr[] = wxT("text");
extern WXDLLEXPORT_DATA(const wxChar) wxTreeCtrlNameStr[] = wxT("treeCtrl"); extern WXDLLEXPORT_DATA(const wxChar) wxTreeCtrlNameStr[] = wxT("treeCtrl");
extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[] = wxT("toolbar"); extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[] = wxT("toolbar");
extern WXDLLEXPORT_DATA(const wxChar) wxGridNameStr[] = wxT("grid");
// Default messages // Default messages
extern WXDLLEXPORT_DATA(const wxChar) wxMessageBoxCaptionStr[] = wxT("Message"); extern WXDLLEXPORT_DATA(const wxChar) wxMessageBoxCaptionStr[] = wxT("Message");

5
src/generic/grid.cpp
View File

@@ -18,6 +18,8 @@
#if wxUSE_GRID #if wxUSE_GRID
#include "wx/grid.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/dcclient.h" #include "wx/dcclient.h"
@@ -37,9 +39,10 @@
#include "wx/tokenzr.h" #include "wx/tokenzr.h"
#include "wx/renderer.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__) #if defined(__WXMOTIF__)
#define WXUNUSED_MOTIF(identifier) WXUNUSED(identifier) #define WXUNUSED_MOTIF(identifier) WXUNUSED(identifier)
#else #else