Amebis/wxWidgets
0
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
src/common/choiccmn.cpp
View File

@@ -31,7 +31,7 @@
#ifndef WX_PRECOMP
#endif
const wxChar wxChoiceNameStr[] = wxT("choice");
const char wxChoiceNameStr[] = "choice";
// ============================================================================
// implementation

4
src/common/clrpickercmn.cpp
View File

@@ -32,8 +32,8 @@
#include "wx/textctrl.h"
#endif
const wxChar wxColourPickerCtrlNameStr[] = wxT("colourpicker");
const wxChar wxColourPickerWidgetNameStr[] = wxT("colourpickerwidget");
const char wxColourPickerCtrlNameStr[] = "colourpicker";
const char wxColourPickerWidgetNameStr[] = "colourpickerwidget";
// ============================================================================
// implementation

2
src/common/ctrlcmn.cpp
View File

@@ -36,7 +36,7 @@
#include "wx/utils.h" // for wxStripMenuCodes()
#endif
const wxChar wxControlNameStr[] = wxT("control");
const char wxControlNameStr[] = "control";
// ============================================================================
// implementation

60
src/common/datacmn.cpp
View File

@@ -39,45 +39,45 @@ wxAcceleratorTable wxNullAcceleratorTable;
#endif // wxUSE_ACCEL
// Default window names
extern WXDLLEXPORT_DATA(const wxChar) wxButtonNameStr[] = wxT("button");
extern WXDLLEXPORT_DATA(const wxChar) wxCheckBoxNameStr[] = wxT("check");
extern WXDLLEXPORT_DATA(const wxChar) wxComboBoxNameStr[] = wxT("comboBox");
extern WXDLLEXPORT_DATA(const wxChar) wxDialogNameStr[] = wxT("dialog");
extern WXDLLEXPORT_DATA(const wxChar) wxFrameNameStr[] = wxT("frame");
extern WXDLLEXPORT_DATA(const wxChar) wxStaticBoxNameStr[] = wxT("groupBox");
extern WXDLLEXPORT_DATA(const wxChar) wxListBoxNameStr[] = wxT("listBox");
extern WXDLLEXPORT_DATA(const wxChar) wxStaticLineNameStr[] = wxT("staticLine");
extern WXDLLEXPORT_DATA(const wxChar) wxStaticTextNameStr[] = wxT("staticText");
extern WXDLLEXPORT_DATA(const wxChar) wxStaticBitmapNameStr[] = wxT("staticBitmap");
extern WXDLLEXPORT_DATA(const wxChar) wxNotebookNameStr[] = wxT("notebook");
extern WXDLLEXPORT_DATA(const wxChar) wxPanelNameStr[] = wxT("panel");
extern WXDLLEXPORT_DATA(const wxChar) wxRadioBoxNameStr[] = wxT("radioBox");
extern WXDLLEXPORT_DATA(const wxChar) wxRadioButtonNameStr[] = wxT("radioButton");
extern WXDLLEXPORT_DATA(const wxChar) wxBitmapRadioButtonNameStr[] = wxT("radioButton");
extern WXDLLEXPORT_DATA(const wxChar) wxScrollBarNameStr[] = wxT("scrollBar");
extern WXDLLEXPORT_DATA(const wxChar) wxSliderNameStr[] = wxT("slider");
extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[] = wxT("status_line");
extern WXDLLEXPORT_DATA(const wxChar) wxTextCtrlNameStr[] = wxT("text");
extern WXDLLEXPORT_DATA(const wxChar) wxTreeCtrlNameStr[] = wxT("treeCtrl");
extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[] = wxT("toolbar");
extern WXDLLEXPORT_DATA(const char) wxButtonNameStr[] = "button";
extern WXDLLEXPORT_DATA(const char) wxCheckBoxNameStr[] = "check";
extern WXDLLEXPORT_DATA(const char) wxComboBoxNameStr[] = "comboBox";
extern WXDLLEXPORT_DATA(const char) wxDialogNameStr[] = "dialog";
extern WXDLLEXPORT_DATA(const char) wxFrameNameStr[] = "frame";
extern WXDLLEXPORT_DATA(const char) wxStaticBoxNameStr[] = "groupBox";
extern WXDLLEXPORT_DATA(const char) wxListBoxNameStr[] = "listBox";
extern WXDLLEXPORT_DATA(const char) wxStaticLineNameStr[] = "staticLine";
extern WXDLLEXPORT_DATA(const char) wxStaticTextNameStr[] = "staticText";
extern WXDLLEXPORT_DATA(const char) wxStaticBitmapNameStr[] = "staticBitmap";
extern WXDLLEXPORT_DATA(const char) wxNotebookNameStr[] = "notebook";
extern WXDLLEXPORT_DATA(const char) wxPanelNameStr[] = "panel";
extern WXDLLEXPORT_DATA(const char) wxRadioBoxNameStr[] = "radioBox";
extern WXDLLEXPORT_DATA(const char) wxRadioButtonNameStr[] = "radioButton";
extern WXDLLEXPORT_DATA(const char) wxBitmapRadioButtonNameStr[] = "radioButton";
extern WXDLLEXPORT_DATA(const char) wxScrollBarNameStr[] = "scrollBar";
extern WXDLLEXPORT_DATA(const char) wxSliderNameStr[] = "slider";
extern WXDLLEXPORT_DATA(const char) wxStatusLineNameStr[] = "status_line";
extern WXDLLEXPORT_DATA(const char) wxTextCtrlNameStr[] = "text";
extern WXDLLEXPORT_DATA(const char) wxTreeCtrlNameStr[] = "treeCtrl";
extern WXDLLEXPORT_DATA(const char) wxToolBarNameStr[] = "toolbar";
// Default messages
extern WXDLLEXPORT_DATA(const wxChar) wxMessageBoxCaptionStr[] = wxT("Message");
extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorPromptStr[] = wxT("Select a file");
extern WXDLLEXPORT_DATA(const wxChar) wxDirSelectorPromptStr[] = wxT("Select a directory");
extern WXDLLEXPORT_DATA(const char) wxMessageBoxCaptionStr[] = "Message";
extern WXDLLEXPORT_DATA(const char) wxFileSelectorPromptStr[] = "Select a file";
extern WXDLLEXPORT_DATA(const char) wxDirSelectorPromptStr[] = "Select a directory";
// Other default strings
extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorDefaultWildcardStr[] =
extern WXDLLEXPORT_DATA(const char) wxFileSelectorDefaultWildcardStr[] =
#if defined(__WXMSW__) || defined(__OS2__)
wxT("*.*")
"*.*"
#else // Unix/Mac
wxT("*")
"*"
#endif
;
extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogNameStr[] = wxT("wxDirCtrl");
extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogDefaultFolderStr[] = wxT("/");
extern WXDLLEXPORT_DATA(const char) wxDirDialogNameStr[] = "wxDirCtrl";
extern WXDLLEXPORT_DATA(const char) wxDirDialogDefaultFolderStr[] = "/";
extern WXDLLEXPORT_DATA(const wxChar) wxFileDialogNameStr[] = wxT("filedlg");
extern WXDLLEXPORT_DATA(const char) wxFileDialogNameStr[] = "filedlg";
#if defined(__WXMSW__) || defined(__OS2__)
WXDLLEXPORT_DATA(const wxChar *) wxUserResourceStr = wxT("TEXT");
#endif

12
src/common/filepickercmn.cpp
View File

@@ -37,12 +37,12 @@
// implementation
// ============================================================================
const wxChar wxFilePickerCtrlNameStr[] = wxT("filepicker");
const wxChar wxFilePickerWidgetNameStr[] = wxT("filepickerwidget");
const wxChar wxDirPickerCtrlNameStr[] = wxT("dirpicker");
const wxChar wxDirPickerWidgetNameStr[] = wxT("dirpickerwidget");
const wxChar wxFilePickerWidgetLabel[] = wxT("Browse");
const wxChar wxDirPickerWidgetLabel[] = wxT("Browse");
const char wxFilePickerCtrlNameStr[] = "filepicker";
const char wxFilePickerWidgetNameStr[] = "filepickerwidget";
const char wxDirPickerCtrlNameStr[] = "dirpicker";
const char wxDirPickerWidgetNameStr[] = "dirpickerwidget";
const char wxFilePickerWidgetLabel[] = "Browse";
const char wxDirPickerWidgetLabel[] = "Browse";
DEFINE_EVENT_TYPE(wxEVT_COMMAND_FILEPICKER_CHANGED)
DEFINE_EVENT_TYPE(wxEVT_COMMAND_DIRPICKER_CHANGED)

4
src/common/fontpickercmn.cpp
View File

@@ -39,8 +39,8 @@
// implementation
// ============================================================================
const wxChar wxFontPickerCtrlNameStr[] = wxT("fontpicker");
const wxChar wxFontPickerWidgetNameStr[] = wxT("fontpickerwidget");
const char wxFontPickerCtrlNameStr[] = "fontpicker";
const char wxFontPickerWidgetNameStr[] = "fontpickerwidget";
DEFINE_EVENT_TYPE(wxEVT_COMMAND_FONTPICKER_CHANGED)
IMPLEMENT_DYNAMIC_CLASS(wxFontPickerCtrl, wxPickerBase)

2
src/common/gaugecmn.cpp
View File

@@ -31,7 +31,7 @@
#include "wx/gauge.h"
const wxChar wxGaugeNameStr[] = wxT("gauge");
const char wxGaugeNameStr[] = "gauge";
// ============================================================================
// implementation

2
src/common/listctrlcmn.cpp
View File

@@ -23,7 +23,7 @@
#include "wx/listctrl.h"
const wxChar wxListCtrlNameStr[] = wxT("listCtrl");
const char wxListCtrlNameStr[] = "listCtrl";
// ListCtrl events
DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_BEGIN_DRAG)

2
src/common/srchcmn.cpp
View File

@@ -33,7 +33,7 @@
// ----------------------------------------------------------------------------
const wxChar wxSearchCtrlNameStr[] = wxT("searchCtrl");
const char wxSearchCtrlNameStr[] = "searchCtrl";
DEFINE_EVENT_TYPE(wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN)
DEFINE_EVENT_TYPE(wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN)

2
src/generic/dirctrlg.cpp
View File

@@ -93,7 +93,7 @@
#include "dos.h"
#endif
extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorDefaultWildcardStr[];
extern WXDLLEXPORT_DATA(const char) wxFileSelectorDefaultWildcardStr[];
// If compiled under Windows, this macro can cause problems
#ifdef GetFirstChild

4
src/generic/textdlgg.cpp
View File

@@ -42,8 +42,8 @@
#include "wx/statline.h"
#endif
const wxChar wxGetTextFromUserPromptStr[] = wxT("Input Text");
const wxChar wxGetPasswordFromUserPromptStr[] = wxT("Enter Password");
const char wxGetTextFromUserPromptStr[] = "Input Text";
const char wxGetPasswordFromUserPromptStr[] = "Enter Password";
// ----------------------------------------------------------------------------
// constants