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

declare all NameStr[] strings as const char using the correct WXDLLIMPEXP_DATA_ macros; in the process, change wxPropGrid window classes to take 'const wxString& name' arguments instead of 'const wxChar *name'

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2008-11-02 22:16:14 +00:00
parent 74cc3ec18e
commit 23318a5358
31 changed files with 80 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/animate.h
View File

@@ -24,7 +24,7 @@
class WXDLLIMPEXP_FWD_ADV wxAnimation;
extern WXDLLIMPEXP_DATA_ADV(wxAnimation) wxNullAnimation;
extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxAnimationCtrlNameStr[];
extern WXDLLIMPEXP_DATA_ADV(const char) wxAnimationCtrlNameStr[];
// ----------------------------------------------------------------------------

2
include/wx/bmpcbox.h
View File

@@ -29,7 +29,7 @@ class WXDLLIMPEXP_FWD_CORE wxItemContainer;
#define wxBITMAPCOMBOBOX_OWNERDRAWN_BASED
#endif
extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxBitmapComboBoxNameStr[];
extern WXDLLIMPEXP_DATA_ADV(const char) wxBitmapComboBoxNameStr[];
class WXDLLIMPEXP_ADV wxBitmapComboBoxBase

2
include/wx/collpane.h
View File

@@ -20,7 +20,7 @@
#include "wx/control.h"
// class name
extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxCollapsiblePaneNameStr[];
extern WXDLLIMPEXP_DATA_CORE(const char) wxCollapsiblePaneNameStr[];
// ----------------------------------------------------------------------------
// wxCollapsiblePaneBase: interface for wxCollapsiblePane

2
include/wx/dataview.h
View File

@@ -42,7 +42,7 @@ class WXDLLIMPEXP_FWD_ADV wxDataViewColumn;
class WXDLLIMPEXP_FWD_ADV wxDataViewRenderer;
class WXDLLIMPEXP_FWD_ADV wxDataViewModelNotifier;
extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxDataViewCtrlNameStr[];
extern WXDLLIMPEXP_DATA_ADV(const char) wxDataViewCtrlNameStr[];
// the default width of new (text) columns:
#define wxDVC_DEFAULT_WIDTH 80

6
include/wx/dlimpexp.h
View File

@@ -218,10 +218,13 @@
#ifdef WXMAKINGDLL_PROPGRID
# define WXDLLIMPEXP_PROPGRID WXEXPORT
# define WXDLLIMPEXP_DATA_PROPGRID(type) WXEXPORT type
#elif defined(WXUSINGDLL)
# define WXDLLIMPEXP_PROPGRID WXIMPORT
# define WXDLLIMPEXP_DATA_PROPGRID(type) WXIMPORT type
#else /* not making nor using DLL */
# define WXDLLIMPEXP_PROPGRID
# define WXDLLIMPEXP_DATA_PROPGRID(type) type
#endif
#ifdef WXMAKINGDLL_RICHTEXT
@@ -242,10 +245,13 @@
#ifdef WXMAKINGDLL_STC
# define WXDLLIMPEXP_STC WXEXPORT
# define WXDLLIMPEXP_DATA_STC(type) WXEXPORT type
#elif defined(WXUSINGDLL)
# define WXDLLIMPEXP_STC WXIMPORT
# define WXDLLIMPEXP_DATA_STC(type) WXIMPORT type
#else /* not making nor using DLL */
# define WXDLLIMPEXP_STC
# define WXDLLIMPEXP_DATA_STC(type) type
#endif
/*

2
include/wx/editlbox.h
View File

@@ -27,7 +27,7 @@ class WXDLLIMPEXP_FWD_CORE wxListEvent;
#define wxEL_NO_REORDER 0x0800
#define wxEL_DEFAULT_STYLE (wxEL_ALLOW_NEW | wxEL_ALLOW_EDIT | wxEL_ALLOW_DELETE)
extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxEditableListBoxNameStr[];
extern WXDLLIMPEXP_DATA_ADV(const char) wxEditableListBoxNameStr[];
// This class provides a composite control that lets the
// user easily enter list of strings

2
include/wx/filectrl.h
View File

@@ -29,7 +29,7 @@ enum
};
#define wxFC_DEFAULT_STYLE wxFC_OPEN
extern WXDLLIMPEXP_DATA_CORE( const wxChar ) wxFileCtrlNameStr[]; // in filectrlcmn.cpp
extern WXDLLIMPEXP_DATA_CORE(const char) wxFileCtrlNameStr[]; // in filectrlcmn.cpp
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_FILECTRL_SELECTIONCHANGED;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_FILECTRL_FILEACTIVATED;

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

@@ -22,7 +22,7 @@
// constants
// ----------------------------------------------------------------------------
extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxGridNameStr[];
extern WXDLLIMPEXP_DATA_ADV(const char) wxGridNameStr[];
// Default parameters for wxGrid
//

2
include/wx/gtk/tglbtn.h
View File

@@ -26,7 +26,7 @@ class WXDLLIMPEXP_FWD_CORE wxToggleBitmapButton;
// global data
//-----------------------------------------------------------------------------
extern WXDLLIMPEXP_CORE const char wxCheckBoxNameStr[];
extern WXDLLIMPEXP_DATA_CORE(const char) wxCheckBoxNameStr[];
//-----------------------------------------------------------------------------
// wxBitmapToggleButton

4
include/wx/htmllbox.h
View File

@@ -25,8 +25,8 @@ class WXDLLIMPEXP_FWD_HTML wxHtmlWinParser;
class WXDLLIMPEXP_FWD_HTML wxHtmlListBoxCache;
class WXDLLIMPEXP_FWD_HTML wxHtmlListBoxStyle;
extern WXDLLIMPEXP_DATA_HTML(const wxChar) wxHtmlListBoxNameStr[];
extern WXDLLIMPEXP_DATA_HTML(const wxChar) wxSimpleHtmlListBoxNameStr[];
extern WXDLLIMPEXP_DATA_HTML(const char) wxHtmlListBoxNameStr[];
extern WXDLLIMPEXP_DATA_HTML(const char) wxSimpleHtmlListBoxNameStr[];
// ----------------------------------------------------------------------------
// wxHtmlListBox

2
include/wx/hyperlink.h
View File

@@ -28,7 +28,7 @@
#define wxHL_ALIGN_CENTRE 0x0008
#define wxHL_DEFAULT_STYLE (wxHL_CONTEXTMENU|wxNO_BORDER|wxHL_ALIGN_CENTRE)
extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxHyperlinkCtrlNameStr[];
extern WXDLLIMPEXP_DATA_ADV(const char) wxHyperlinkCtrlNameStr[];
// ----------------------------------------------------------------------------

6
include/wx/propgrid/manager.h
View File

@@ -27,7 +27,7 @@
// -----------------------------------------------------------------------
#ifndef SWIG
extern WXDLLIMPEXP_PROPGRID const wxChar *wxPropertyGridManagerNameStr;
extern WXDLLIMPEXP_DATA_PROPGRID(const char) wxPropertyGridManagerNameStr[];
#endif
/** @class wxPropertyGridPage
@@ -260,7 +260,7 @@ public:
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxPGMAN_DEFAULT_STYLE,
const wxChar* name = wxPropertyGridManagerNameStr );
const wxString& name = wxPropertyGridManagerNameStr );
/** Destructor */
virtual ~wxPropertyGridManager();
@@ -320,7 +320,7 @@ public:
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxPGMAN_DEFAULT_STYLE,
const wxChar* name = wxPropertyGridManagerNameStr );
const wxString& name = wxPropertyGridManagerNameStr );
/**
Enables or disables (shows/hides) categories according to parameter

8
include/wx/propgrid/propgrid.h
View File

@@ -24,7 +24,7 @@
#ifndef SWIG
extern WXDLLIMPEXP_PROPGRID const wxChar *wxPropertyGridNameStr;
extern WXDLLIMPEXP_DATA_PROPGRID(const char) wxPropertyGridNameStr[];
#endif
@@ -614,19 +614,21 @@ public:
/** The default constructor. The styles to be used are styles valid for
the wxWindow and wxScrolledWindow.
@see @link wndflags Additional Window Styles @endlink
*/
wxPropertyGrid( wxWindow *parent, wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxPG_DEFAULT_STYLE,
const wxChar* name = wxPropertyGridNameStr );
const wxString& name = wxPropertyGridNameStr );
/** Destructor */
virtual ~wxPropertyGrid();
#endif
/** Adds given key combination to trigger given action.
@param action
Which action to trigger. See @link pgactions List of list of
wxPropertyGrid actions@endlink.
@@ -693,7 +695,7 @@ public:
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxPG_DEFAULT_STYLE,
const wxChar* name = wxPropertyGridNameStr );
const wxString& name = wxPropertyGridNameStr );
/**
Call when editor widget's contents is modified.

2
include/wx/statusbr.h
View File

@@ -20,7 +20,7 @@
#include "wx/list.h"
#include "wx/dynarray.h"
extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxStatusBarNameStr[];
extern WXDLLIMPEXP_DATA_CORE(const char) wxStatusBarNameStr[];
WX_DECLARE_LIST(wxString, wxListString);

2
include/wx/stc/stc.h
View File

@@ -1978,7 +1978,7 @@ class WordList;
struct SCNotification;
#ifndef SWIG
extern WXDLLIMPEXP_STC const wxChar* wxSTCNameStr;
extern WXDLLIMPEXP_DATA_STC(const char) wxSTCNameStr[];
class WXDLLIMPEXP_FWD_STC wxStyledTextCtrl;
class WXDLLIMPEXP_FWD_STC wxStyledTextEvent;
#endif

2
src/common/animatecmn.cpp
View File

@@ -26,7 +26,7 @@
#include "wx/image.h"
#include "wx/dcmemory.h"
const wxChar wxAnimationCtrlNameStr[] = wxT("animationctrl");
const char wxAnimationCtrlNameStr[] = "animationctrl";
// global object
wxAnimation wxNullAnimation;

2
src/common/bmpcboxcmn.cpp
View File

@@ -38,7 +38,7 @@
#include "wx/odcombo.h"
const wxChar wxBitmapComboBoxNameStr[] = wxT("bitmapComboBox");
const char wxBitmapComboBoxNameStr[] = "bitmapComboBox";
#if defined(wxBITMAPCOMBOBOX_OWNERDRAWN_BASED)

2
src/common/datavcmn.cpp
View File

@@ -30,7 +30,7 @@
#include "wx/crt.h"
#endif
const wxChar wxDataViewCtrlNameStr[] = wxT("dataviewCtrl");
const char wxDataViewCtrlNameStr[] = "dataviewCtrl";
bool operator == (const wxDataViewItem &left, const wxDataViewItem &right)

2
src/common/filectrlcmn.cpp
View File

@@ -23,7 +23,7 @@
# include "wx/debug.h"
#endif
const wxChar wxFileCtrlNameStr[] = wxT( "wxfilectrl" );
const char wxFileCtrlNameStr[] = "wxfilectrl";
DEFINE_EVENT_TYPE( wxEVT_FILECTRL_SELECTIONCHANGED )
DEFINE_EVENT_TYPE( wxEVT_FILECTRL_FILEACTIVATED )

2
src/common/hyperlnkcmn.cpp
View File

@@ -45,7 +45,7 @@
IMPLEMENT_DYNAMIC_CLASS(wxHyperlinkEvent, wxCommandEvent)
DEFINE_EVENT_TYPE(wxEVT_COMMAND_HYPERLINK)
const wxChar wxHyperlinkCtrlNameStr[] = wxT("hyperlink");
const char wxHyperlinkCtrlNameStr[] = "hyperlink";
// ----------------------------------------------------------------------------
// wxHyperlinkCtrlBase

2
src/common/statbar.cpp
View File

@@ -35,7 +35,7 @@
#include "wx/listimpl.cpp"
WX_DEFINE_LIST(wxListString)
const wxChar wxStatusBarNameStr[] = wxT("statusBar");
const char wxStatusBarNameStr[] = "statusBar";
// ============================================================================
// wxStatusBarBase implementation

2
src/generic/collpaneg.cpp
View File

@@ -39,7 +39,7 @@
// implementation
// ============================================================================
const wxChar wxCollapsiblePaneNameStr[] = wxT("collapsiblePane");
const char wxCollapsiblePaneNameStr[] = "collapsiblePane";
//-----------------------------------------------------------------------------
// wxGenericCollapsiblePane

2
src/generic/editlbox.cpp
View File

@@ -30,7 +30,7 @@
// implementation
// ============================================================================
const wxChar wxEditableListBoxNameStr[] = wxT("editableListBox");
const char wxEditableListBoxNameStr[] = "editableListBox";
static const char * eledit_xpm[] = {
"16 16 3 1",

2
src/generic/grid.cpp
View File

@@ -50,7 +50,7 @@
#include "wx/generic/gridsel.h"
const wxChar wxGridNameStr[] = wxT("grid");
const char wxGridNameStr[] = "grid";
#if defined(__WXMOTIF__)
#define WXUNUSED_MOTIF(identifier) WXUNUSED(identifier)

4
src/generic/htmllbox.cpp
View File

@@ -46,8 +46,8 @@ FORCE_WXHTML_MODULES()
// small border always added to the cells:
static const wxCoord CELL_BORDER = 2;
const wxChar wxHtmlListBoxNameStr[] = wxT("htmlListBox");
const wxChar wxSimpleHtmlListBoxNameStr[] = wxT("simpleHtmlListBox");
const char wxHtmlListBoxNameStr[] = "htmlListBox";
const char wxSimpleHtmlListBoxNameStr[] = "simpleHtmlListBox";
// ============================================================================
// private classes

2
src/gtk/collpane.cpp
View File

@@ -29,7 +29,7 @@
// the lines below duplicate the same definitions in collpaneg.cpp, if we have
// another implementation of this class we should extract them to a common file
const wxChar wxCollapsiblePaneNameStr[] = wxT("collapsiblePane");
const char wxCollapsiblePaneNameStr[] = "collapsiblePane";
DEFINE_EVENT_TYPE(wxEVT_COMMAND_COLLPANE_CHANGED)

6
src/propgrid/manager.cpp
View File

@@ -72,7 +72,7 @@
// wxPropertyGridManager
// -----------------------------------------------------------------------
const wxChar *wxPropertyGridManagerNameStr = wxT("wxPropertyGridManager");
const char wxPropertyGridManagerNameStr[] = "wxPropertyGridManager";
// Categoric Mode Icon
@@ -259,7 +259,7 @@ wxPropertyGridManager::wxPropertyGridManager( wxWindow *parent,
const wxPoint& pos,
const wxSize& size,
long style,
const wxChar* name )
const wxString& name )
: wxPanel()
{
Init1();
@@ -273,7 +273,7 @@ bool wxPropertyGridManager::Create( wxWindow *parent,
const wxPoint& pos,
const wxSize& size,
long style,
const wxChar* name )
const wxString& name )
{
bool res = wxPanel::Create( parent, id, pos, size,

6
src/propgrid/propgrid.cpp
View File

@@ -134,7 +134,7 @@ void wxPropertyGrid::AutoGetTranslation ( bool ) { }
// -----------------------------------------------------------------------
const wxChar *wxPropertyGridNameStr = wxT("wxPropertyGrid");
const char wxPropertyGridNameStr[] = "wxPropertyGrid";
// -----------------------------------------------------------------------
// Statics in one class for easy destruction.
@@ -409,7 +409,7 @@ wxPropertyGrid::wxPropertyGrid( wxWindow *parent,
const wxPoint& pos,
const wxSize& size,
long style,
const wxChar* name )
const wxString& name )
: wxScrolledWindow()
{
Init1();
@@ -423,7 +423,7 @@ bool wxPropertyGrid::Create( wxWindow *parent,
const wxPoint& pos,
const wxSize& size,
long style,
const wxChar* name )
const wxString& name )
{
if ( !(style&wxBORDER_MASK) )

2
src/stc/stc.cpp
View File

@@ -53,7 +53,7 @@
//----------------------------------------------------------------------
const wxChar* wxSTCNameStr = wxT("stcwindow");
const char wxSTCNameStr[] = "stcwindow";
#ifdef MAKELONG
#undef MAKELONG

2
src/stc/stc.cpp.in
View File

@@ -53,7 +53,7 @@
//----------------------------------------------------------------------
const wxChar* wxSTCNameStr = wxT("stcwindow");
const char wxSTCNameStr[] = "stcwindow";
#ifdef MAKELONG
#undef MAKELONG

2
src/stc/stc.h.in
View File

@@ -77,7 +77,7 @@ class WordList;
struct SCNotification;
#ifndef SWIG
extern WXDLLIMPEXP_STC const wxChar* wxSTCNameStr;
extern WXDLLIMPEXP_DATA_STC(const char) wxSTCNameStr[];
class WXDLLIMPEXP_FWD_STC wxStyledTextCtrl;
class WXDLLIMPEXP_FWD_STC wxStyledTextEvent;
#endif