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:
@@ -14,13 +14,13 @@
|
||||
|
||||
#include "wx/panel.h"
|
||||
|
||||
extern WXDLLEXPORT_DATA(const wxChar) wxDialogNameStr[];
|
||||
extern WXDLLEXPORT_DATA(const char) wxDialogNameStr[];
|
||||
|
||||
class WXDLLIMPEXP_FWD_CORE wxDialogModalData;
|
||||
|
||||
#if wxUSE_TOOLBAR && (defined(__SMARTPHONE__) || defined(__POCKETPC__))
|
||||
class WXDLLIMPEXP_FWD_CORE wxToolBar;
|
||||
extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[];
|
||||
extern WXDLLEXPORT_DATA(const char) wxToolBarNameStr[];
|
||||
#endif
|
||||
|
||||
// Dialog boxes
|
||||
|
@@ -14,7 +14,7 @@
|
||||
|
||||
#if wxUSE_GAUGE
|
||||
|
||||
extern WXDLLEXPORT_DATA(const wxChar) wxGaugeNameStr[];
|
||||
extern WXDLLEXPORT_DATA(const char) wxGaugeNameStr[];
|
||||
|
||||
// Group box
|
||||
class WXDLLEXPORT wxGauge95 : public wxGaugeBase
|
||||
|
@@ -14,7 +14,7 @@
|
||||
|
||||
#include "wx/frame.h"
|
||||
|
||||
extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[];
|
||||
extern WXDLLEXPORT_DATA(const char) wxStatusLineNameStr[];
|
||||
|
||||
class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow;
|
||||
class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;
|
||||
|
@@ -16,7 +16,7 @@
|
||||
#include "wx/icon.h"
|
||||
#include "wx/bitmap.h"
|
||||
|
||||
extern WXDLLEXPORT_DATA(const wxChar) wxStaticBitmapNameStr[];
|
||||
extern WXDLLEXPORT_DATA(const char) wxStaticBitmapNameStr[];
|
||||
|
||||
// a control showing an icon or a bitmap
|
||||
class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase
|
||||
|
@@ -14,8 +14,6 @@
|
||||
|
||||
class WXDLLIMPEXP_FWD_CORE wxImageList;
|
||||
|
||||
// extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[];
|
||||
|
||||
/*
|
||||
* Flags returned by HitTest
|
||||
*/
|
||||
|
@@ -13,7 +13,7 @@
|
||||
#ifndef _WX_TOGGLEBUTTON_H_
|
||||
#define _WX_TOGGLEBUTTON_H_
|
||||
|
||||
extern WXDLLEXPORT_DATA(const wxChar) wxCheckBoxNameStr[];
|
||||
extern WXDLLEXPORT_DATA(const char) wxCheckBoxNameStr[];
|
||||
|
||||
// Checkbox item (single checkbox)
|
||||
class WXDLLEXPORT wxToggleButton : public wxControl
|
||||
|
Reference in New Issue
Block a user