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

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-11-12 21:37:46 +00:00
parent 5e6f2fe921
commit f36e602b3f
68 changed files with 117 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,7 @@
#endif
extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxComboBoxNameStr[];
extern WXDLLIMPEXP_DATA_CORE(const char) wxComboBoxNameStr[];
class WXDLLEXPORT wxGenericComboCtrl : public wxComboCtrlBase
{

4
include/wx/generic/dirdlgg.h
View File

@@ -20,8 +20,8 @@ class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
class WXDLLIMPEXP_FWD_CORE wxTreeEvent;
// we may be included directly as well as from wx/dirdlg.h (FIXME)
extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogNameStr[];
extern WXDLLEXPORT_DATA(const wxChar) wxDirSelectorPromptStr[];
extern WXDLLEXPORT_DATA(const char) wxDirDialogNameStr[];
extern WXDLLEXPORT_DATA(const char) wxDirSelectorPromptStr[];
#ifndef wxDD_DEFAULT_STYLE
#ifdef __WXWINCE__

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

@@ -24,7 +24,7 @@ class WXDLLIMPEXP_FWD_CORE wxChoice;
class WXDLLIMPEXP_FWD_CORE wxStaticText;
class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorDefaultWildcardStr[];
extern WXDLLEXPORT_DATA(const char) wxFileSelectorDefaultWildcardStr[];
//-----------------------------------------------------------------------------
// wxFileData - a class to hold the file info for the wxFileListCtrl

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

@@ -20,7 +20,7 @@
#include "wx/panel.h"
#include "wx/notebook.h"
extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[];
extern WXDLLEXPORT_DATA(const char) wxStatusLineNameStr[];
//-----------------------------------------------------------------------------

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

@@ -21,7 +21,7 @@
class WXDLLIMPEXP_FWD_CORE wxControlContainer;
extern WXDLLEXPORT_DATA(const wxChar) wxPanelNameStr[];
extern WXDLLEXPORT_DATA(const char) wxPanelNameStr[];
// ----------------------------------------------------------------------------
// wxPanel contains other controls and implements TAB traversal between them

4
include/wx/generic/textdlgg.h
View File

@@ -25,8 +25,8 @@
class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
extern WXDLLEXPORT_DATA(const wxChar) wxGetTextFromUserPromptStr[];
extern WXDLLEXPORT_DATA(const wxChar) wxGetPasswordFromUserPromptStr[];
extern WXDLLEXPORT_DATA(const char) wxGetTextFromUserPromptStr[];
extern WXDLLEXPORT_DATA(const char) wxGetPasswordFromUserPromptStr[];
#define wxTextEntryDialogStyle (wxOK | wxCANCEL | wxCENTRE | wxWS_EX_VALIDATE_RECURSIVELY)