make various control names constants of type char, not wxChar, as this is more compatible with the old ANSI build and it doesn't make much sense to use wchar_t for ASCII strings anyhow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -13,19 +13,6 @@
|
||||
#include "wx/defs.h"
|
||||
#include "wx/object.h"
|
||||
#include "wx/list.h"
|
||||
#include "wx/control.h"
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// classes
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_FWD_CORE wxButton;
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// global data
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
extern WXDLLIMPEXP_CORE const wxChar wxButtonNameStr[];
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxButton
|
||||
|
@@ -27,7 +27,7 @@ class WXDLLIMPEXP_FWD_CORE wxComboBox;
|
||||
// global data
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
extern WXDLLEXPORT_DATA(const wxChar) wxComboBoxNameStr[];
|
||||
extern WXDLLEXPORT_DATA(const char) wxComboBoxNameStr[];
|
||||
extern WXDLLIMPEXP_BASE const wxChar* wxEmptyString;
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
@@ -11,20 +11,6 @@
|
||||
#ifndef __GTKDIALOGH__
|
||||
#define __GTKDIALOGH__
|
||||
|
||||
#include "wx/defs.h"
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// classes
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_FWD_CORE wxDialog;
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// global data
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
extern WXDLLIMPEXP_CORE const wxChar wxDialogNameStr[];
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxDialog
|
||||
//-----------------------------------------------------------------------------
|
||||
|
@@ -10,26 +10,6 @@
|
||||
#ifndef __GTKGAUGEH__
|
||||
#define __GTKGAUGEH__
|
||||
|
||||
#include "wx/defs.h"
|
||||
|
||||
#if wxUSE_GAUGE
|
||||
|
||||
#include "wx/object.h"
|
||||
#include "wx/list.h"
|
||||
#include "wx/control.h"
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// classes
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_FWD_CORE wxGauge;
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// global data
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
extern WXDLLIMPEXP_CORE const wxChar wxGaugeNameStr[];
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxGaugeBox
|
||||
//-----------------------------------------------------------------------------
|
||||
@@ -97,7 +77,5 @@ private:
|
||||
DECLARE_DYNAMIC_CLASS(wxGauge)
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
// __GTKGAUGEH__
|
||||
|
@@ -30,7 +30,7 @@ class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;
|
||||
// global data
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[];
|
||||
extern WXDLLEXPORT_DATA(const char) wxStatusLineNameStr[];
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxMDIParentFrame
|
||||
|
@@ -26,7 +26,7 @@ class WXDLLIMPEXP_FWD_CORE wxToggleBitmapButton;
|
||||
// global data
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
extern WXDLLIMPEXP_CORE const wxChar wxCheckBoxNameStr[];
|
||||
extern WXDLLIMPEXP_CORE const char wxCheckBoxNameStr[];
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxToggleBitmapButton
|
||||
|
Reference in New Issue
Block a user