AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/bmpbuttn.h
View File

@ -19,7 +19,7 @@
#include "wx/bitmap.h"
#include "wx/button.h"
extern WXDLLEXPORT_DATA(const wxChar) wxButtonNameStr[];
extern WXDLLEXPORT_DATA(const char) wxButtonNameStr[];
// ----------------------------------------------------------------------------
// wxBitmapButton: a button which shows bitmaps instead of the usual string.

2
include/wx/button.h
View File

@ -47,7 +47,7 @@
class WXDLLIMPEXP_FWD_CORE wxBitmap;
extern WXDLLEXPORT_DATA(const wxChar) wxButtonNameStr[];
extern WXDLLEXPORT_DATA(const char) wxButtonNameStr[];
// ----------------------------------------------------------------------------
// wxButton: a push button

2
include/wx/checkbox.h
View File

@ -49,7 +49,7 @@ enum wxCheckBoxState
};
extern WXDLLEXPORT_DATA(const wxChar) wxCheckBoxNameStr[];
extern WXDLLEXPORT_DATA(const char) wxCheckBoxNameStr[];
// ----------------------------------------------------------------------------
// wxCheckBox: a control which shows a label and a box which may be checked

2
include/wx/choice.h
View File

@ -26,7 +26,7 @@
// global data
// ----------------------------------------------------------------------------
extern WXDLLEXPORT_DATA(const wxChar) wxChoiceNameStr[];
extern WXDLLEXPORT_DATA(const char) wxChoiceNameStr[];
// ----------------------------------------------------------------------------
// wxChoice allows to select one of a non-modifiable list of strings

4
include/wx/clrpicker.h
View File

@ -22,8 +22,8 @@
class WXDLLIMPEXP_FWD_CORE wxColourPickerEvent;
extern WXDLLEXPORT_DATA(const wxChar) wxColourPickerWidgetNameStr[];
extern WXDLLEXPORT_DATA(const wxChar) wxColourPickerCtrlNameStr[];
extern WXDLLEXPORT_DATA(const char) wxColourPickerWidgetNameStr[];
extern WXDLLEXPORT_DATA(const char) wxColourPickerCtrlNameStr[];
// show the colour in HTML form (#AABBCC) as colour button label
#define wxCLRBTN_SHOW_LABEL 100

2
include/wx/combobox.h
View File

@ -16,7 +16,7 @@
#if wxUSE_COMBOBOX
extern WXDLLEXPORT_DATA(const wxChar) wxComboBoxNameStr[];
extern WXDLLEXPORT_DATA(const char) wxComboBoxNameStr[];
// ----------------------------------------------------------------------------
// wxComboBoxBase: this interface defines the methods wxComboBox must implement

2
include/wx/control.h
View File

@ -22,7 +22,7 @@
#include "wx/window.h" // base class
extern WXDLLEXPORT_DATA(const wxChar) wxControlNameStr[];
extern WXDLLEXPORT_DATA(const char) wxControlNameStr[];
// ----------------------------------------------------------------------------
// wxControl is the base class for all controls

2
include/wx/dialog.h
View File

@ -26,7 +26,7 @@ class WXDLLIMPEXP_FWD_CORE wxStdDialogButtonSizer;
#define wxDEFAULT_DIALOG_STYLE (wxCAPTION | wxSYSTEM_MENU | wxCLOSE_BOX)
#endif
extern WXDLLEXPORT_DATA(const wxChar) wxDialogNameStr[];
extern WXDLLEXPORT_DATA(const char) wxDialogNameStr[];
class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow
{

6
include/wx/dirdlg.h
View File

@ -20,9 +20,9 @@
// constants
// ----------------------------------------------------------------------------
extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogNameStr[];
extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogDefaultFolderStr[];
extern WXDLLEXPORT_DATA(const wxChar) wxDirSelectorPromptStr[];
extern WXDLLEXPORT_DATA(const char) wxDirDialogNameStr[];
extern WXDLLEXPORT_DATA(const char) wxDirDialogDefaultFolderStr[];
extern WXDLLEXPORT_DATA(const char) wxDirSelectorPromptStr[];
#define wxDD_CHANGE_DIR 0x0100
#define wxDD_DIR_MUST_EXIST 0x0200

6
include/wx/filedlg.h
View File

@ -58,9 +58,9 @@ enum
#define wxFD_DEFAULT_STYLE wxFD_OPEN
extern WXDLLEXPORT_DATA(const wxChar) wxFileDialogNameStr[];
extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorPromptStr[];
extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorDefaultWildcardStr[];
extern WXDLLEXPORT_DATA(const char) wxFileDialogNameStr[];
extern WXDLLEXPORT_DATA(const char) wxFileSelectorPromptStr[];
extern WXDLLEXPORT_DATA(const char) wxFileSelectorDefaultWildcardStr[];
//----------------------------------------------------------------------------
// wxFileDialogBase

16
include/wx/filepicker.h
View File

@ -22,15 +22,15 @@
class WXDLLIMPEXP_FWD_CORE wxDialog;
class WXDLLIMPEXP_FWD_CORE wxFileDirPickerEvent;
extern WXDLLEXPORT_DATA(const wxChar) wxFilePickerWidgetLabel[];
extern WXDLLEXPORT_DATA(const wxChar) wxFilePickerWidgetNameStr[];
extern WXDLLEXPORT_DATA(const wxChar) wxFilePickerCtrlNameStr[];
extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorPromptStr[];
extern WXDLLEXPORT_DATA(const char) wxFilePickerWidgetLabel[];
extern WXDLLEXPORT_DATA(const char) wxFilePickerWidgetNameStr[];
extern WXDLLEXPORT_DATA(const char) wxFilePickerCtrlNameStr[];
extern WXDLLEXPORT_DATA(const char) wxFileSelectorPromptStr[];
extern WXDLLEXPORT_DATA(const wxChar) wxDirPickerWidgetLabel[];
extern WXDLLEXPORT_DATA(const wxChar) wxDirPickerWidgetNameStr[];
extern WXDLLEXPORT_DATA(const wxChar) wxDirPickerCtrlNameStr[];
extern WXDLLEXPORT_DATA(const wxChar) wxDirSelectorPromptStr[];
extern WXDLLEXPORT_DATA(const char) wxDirPickerWidgetLabel[];
extern WXDLLEXPORT_DATA(const char) wxDirPickerWidgetNameStr[];
extern WXDLLEXPORT_DATA(const char) wxDirPickerCtrlNameStr[];
extern WXDLLEXPORT_DATA(const char) wxDirSelectorPromptStr[];
// ----------------------------------------------------------------------------

4
include/wx/fontpicker.h
View File

@ -22,8 +22,8 @@
class WXDLLIMPEXP_FWD_CORE wxFontPickerEvent;
extern WXDLLEXPORT_DATA(const wxChar) wxFontPickerWidgetNameStr[];
extern WXDLLEXPORT_DATA(const wxChar) wxFontPickerCtrlNameStr[];
extern WXDLLEXPORT_DATA(const char) wxFontPickerWidgetNameStr[];
extern WXDLLEXPORT_DATA(const char) wxFontPickerCtrlNameStr[];
// ----------------------------------------------------------------------------

4
include/wx/frame.h
View File

@ -19,8 +19,8 @@
#include "wx/toplevel.h" // the base class
// the default names for various classs
extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[];
extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[];
extern WXDLLEXPORT_DATA(const char) wxStatusLineNameStr[];
extern WXDLLEXPORT_DATA(const char) wxToolBarNameStr[];
class WXDLLIMPEXP_FWD_CORE wxFrame;
class WXDLLIMPEXP_FWD_CORE wxMenuBar;

2
include/wx/gauge.h
View File

@ -41,7 +41,7 @@
#define wxGAUGE_EMULATE_INDETERMINATE_MODE 0
#endif
extern WXDLLEXPORT_DATA(const wxChar) wxGaugeNameStr[];
extern WXDLLEXPORT_DATA(const char) wxGaugeNameStr[];
// ----------------------------------------------------------------------------
// wxGauge: a progress bar

2
include/wx/gdicmn.h
View File

@ -829,7 +829,7 @@ extern WXDLLEXPORT_DATA(wxIconBundle) wxNullIconBundle;
extern WXDLLEXPORT_DATA(wxColourDatabase*) wxTheColourDatabase;
extern WXDLLEXPORT_DATA(const wxChar) wxPanelNameStr[];
extern WXDLLEXPORT_DATA(const char) wxPanelNameStr[];
extern WXDLLEXPORT_DATA(const wxSize) wxDefaultSize;
extern WXDLLEXPORT_DATA(const wxPoint) wxDefaultPosition;

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)

14
include/wx/gtk/dialog.h
View File

@ -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
//-----------------------------------------------------------------------------

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

@ -16,7 +16,7 @@
#include "wx/control.h"
#include "wx/filectrl.h"
extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorDefaultWildcardStr[];
extern WXDLLEXPORT_DATA(const char) wxFileSelectorDefaultWildcardStr[];
typedef struct _GtkFileChooser GtkFileChooser;

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

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

13
include/wx/gtk1/button.h
View File

@ -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

2
include/wx/gtk1/combobox.h
View File

@ -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;
//-----------------------------------------------------------------------------

14
include/wx/gtk1/dialog.h
View File

@ -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
//-----------------------------------------------------------------------------

22
include/wx/gtk1/gauge.h
View File

@ -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__

2
include/wx/gtk1/mdi.h
View File

@ -30,7 +30,7 @@ class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;
// global data
//-----------------------------------------------------------------------------
extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[];
extern WXDLLEXPORT_DATA(const char) wxStatusLineNameStr[];
//-----------------------------------------------------------------------------
// wxMDIParentFrame

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

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

2
include/wx/listbox.h
View File

@ -30,7 +30,7 @@ class WXDLLIMPEXP_FWD_BASE wxArrayString;
// global data
// ----------------------------------------------------------------------------
extern WXDLLEXPORT_DATA(const wxChar) wxListBoxNameStr[];
extern WXDLLEXPORT_DATA(const char) wxListBoxNameStr[];
// ----------------------------------------------------------------------------
// wxListBox interface is defined by the class wxListBoxBase

2
include/wx/listctrl.h
View File

@ -22,7 +22,7 @@
// constants
// ----------------------------------------------------------------------------
extern WXDLLEXPORT_DATA(const wxChar) wxListCtrlNameStr[];
extern WXDLLEXPORT_DATA(const char) wxListCtrlNameStr[];
// ----------------------------------------------------------------------------
// include the wxListCtrl class declaration

2
include/wx/msgdlg.h
View File

@ -18,7 +18,7 @@
#include "wx/dialog.h"
WXDLLEXPORT_DATA(extern const wxChar) wxMessageBoxCaptionStr[];
WXDLLEXPORT_DATA(extern const char) wxMessageBoxCaptionStr[];
class WXDLLEXPORT wxMessageDialogBase : public wxDialog
{

4
include/wx/msw/dialog.h
View File

@ -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

2
include/wx/msw/gauge95.h
View File

@ -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

2
include/wx/msw/mdi.h
View File

@ -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;

2
include/wx/msw/statbmp.h
View File

@ -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

2
include/wx/msw/tabctrl.h
View File

@ -14,8 +14,6 @@
class WXDLLIMPEXP_FWD_CORE wxImageList;
// extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[];
/*
* Flags returned by HitTest
*/

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

@ -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

2
include/wx/notebook.h
View File

@ -54,7 +54,7 @@ enum
typedef wxWindow wxNotebookPage; // so far, any window can be a page
extern WXDLLEXPORT_DATA(const wxChar) wxNotebookNameStr[];
extern WXDLLEXPORT_DATA(const char) wxNotebookNameStr[];
// ----------------------------------------------------------------------------
// wxNotebookBase: define wxNotebook interface

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

@ -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

2
include/wx/pickerbase.h
View File

@ -19,7 +19,7 @@
class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
class WXDLLIMPEXP_FWD_CORE wxToolTip;
extern WXDLLEXPORT_DATA(const wxChar) wxButtonNameStr[];
extern WXDLLEXPORT_DATA(const char) wxButtonNameStr[];
// ----------------------------------------------------------------------------
// wxPickerBase is the base class for the picker controls which support

2
include/wx/radiobox.h
View File

@ -26,7 +26,7 @@ WX_DEFINE_EXPORTED_ARRAY_PTR(wxToolTip *, wxToolTipArray);
#endif // wxUSE_TOOLTIPS
extern WXDLLEXPORT_DATA(const wxChar) wxRadioBoxNameStr[];
extern WXDLLEXPORT_DATA(const char) wxRadioBoxNameStr[];
// ----------------------------------------------------------------------------
// wxRadioBoxBase is not a normal base class, but rather a mix-in because the

2
include/wx/radiobut.h
View File

@ -33,7 +33,7 @@
#include "wx/control.h"
extern WXDLLEXPORT_DATA(const wxChar) wxRadioButtonNameStr[];
extern WXDLLEXPORT_DATA(const char) wxRadioButtonNameStr[];
#if defined(__WXUNIVERSAL__)
#include "wx/univ/radiobut.h"

2
include/wx/scrolbar.h
View File

@ -18,7 +18,7 @@
#include "wx/control.h"
extern WXDLLEXPORT_DATA(const wxChar) wxScrollBarNameStr[];
extern WXDLLEXPORT_DATA(const char) wxScrollBarNameStr[];
// ----------------------------------------------------------------------------
// wxScrollBar: a scroll bar control

2
include/wx/slider.h
View File

@ -45,7 +45,7 @@
#define wxSL_NOTIFY_DRAG 0x0000
#endif // WXWIN_COMPATIBILITY_2_6
extern WXDLLEXPORT_DATA(const wxChar) wxSliderNameStr[];
extern WXDLLEXPORT_DATA(const char) wxSliderNameStr[];
// ----------------------------------------------------------------------------
// wxSliderBase: define wxSlider interface

2
include/wx/srchctrl.h
View File

@ -37,7 +37,7 @@
// constants
// ----------------------------------------------------------------------------
extern WXDLLEXPORT_DATA(const wxChar) wxSearchCtrlNameStr[];
extern WXDLLEXPORT_DATA(const char) wxSearchCtrlNameStr[];
BEGIN_DECLARE_EVENT_TYPES()
DECLARE_EVENT_TYPE(wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN, 1119)

2
include/wx/statbmp.h
View File

@ -20,7 +20,7 @@
#include "wx/bitmap.h"
#include "wx/icon.h"
extern WXDLLEXPORT_DATA(const wxChar) wxStaticBitmapNameStr[];
extern WXDLLEXPORT_DATA(const char) wxStaticBitmapNameStr[];
// a control showing an icon or a bitmap
class WXDLLEXPORT wxStaticBitmapBase : public wxControl

2
include/wx/statbox.h
View File

@ -18,7 +18,7 @@
#include "wx/control.h"
extern WXDLLEXPORT_DATA(const wxChar) wxStaticBoxNameStr[];
extern WXDLLEXPORT_DATA(const char) wxStaticBoxNameStr[];
// ----------------------------------------------------------------------------
// wxStaticBox: a grouping box with a label

2
include/wx/statline.h
View File

@ -28,7 +28,7 @@
// ----------------------------------------------------------------------------
// the default name for objects of class wxStaticLine
extern WXDLLEXPORT_DATA(const wxChar) wxStaticLineNameStr[];
extern WXDLLEXPORT_DATA(const char) wxStaticLineNameStr[];
// ----------------------------------------------------------------------------
// wxStaticLine - a line in a dialog

2
include/wx/stattext.h
View File

@ -29,7 +29,7 @@
#define wxST_ELLIPSIZE_END 0x0010
extern WXDLLEXPORT_DATA(const wxChar) wxStaticTextNameStr[];
extern WXDLLEXPORT_DATA(const char) wxStaticTextNameStr[];
class WXDLLEXPORT wxStaticTextBase : public wxControl
{

2
include/wx/tbarbase.h
View File

@ -32,7 +32,7 @@ class WXDLLIMPEXP_FWD_CORE wxImage;
// constants
// ----------------------------------------------------------------------------
extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[];
extern WXDLLEXPORT_DATA(const char) wxToolBarNameStr[];
extern WXDLLEXPORT_DATA(const wxSize) wxDefaultSize;
extern WXDLLEXPORT_DATA(const wxPoint) wxDefaultPosition;

2
include/wx/textctrl.h
View File

@ -55,7 +55,7 @@ typedef long wxTextCoord;
// constants
// ----------------------------------------------------------------------------
extern WXDLLEXPORT_DATA(const wxChar) wxTextCtrlNameStr[];
extern WXDLLEXPORT_DATA(const char) wxTextCtrlNameStr[];
// this is intentionally not enum to avoid warning fixes with
// typecasting from enum type to wxTextCoord

2
include/wx/toplevel.h
View File

@ -23,7 +23,7 @@
#include "wx/containr.h"
// the default names for various classes
extern WXDLLEXPORT_DATA(const wxChar) wxFrameNameStr[];
extern WXDLLEXPORT_DATA(const char) wxFrameNameStr[];
class WXDLLIMPEXP_FWD_CORE wxTopLevelWindowBase;

2
include/wx/treebase.h
View File

@ -220,7 +220,7 @@ static const int wxTREE_HITTEST_ONITEM = wxTREE_HITTEST_ONITEMICON |
wxTREE_HITTEST_ONITEMLABEL;
// tree ctrl default name
extern WXDLLEXPORT_DATA(const wxChar) wxTreeCtrlNameStr[];
extern WXDLLEXPORT_DATA(const char) wxTreeCtrlNameStr[];
// ----------------------------------------------------------------------------
// wxTreeItemAttr: a structure containing the visual attributes of an item

2
include/wx/univ/dialog.h
View File

@ -11,7 +11,7 @@
#ifndef _WX_UNIV_DIALOG_H_
#define _WX_UNIV_DIALOG_H_
extern WXDLLEXPORT_DATA(const wxChar) wxDialogNameStr[];
extern WXDLLEXPORT_DATA(const char) wxDialogNameStr[];
class WXDLLIMPEXP_FWD_CORE wxWindowDisabler;
class WXDLLIMPEXP_FWD_CORE wxEventLoop;

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

@ -14,7 +14,7 @@
#include "wx/button.h"
extern WXDLLEXPORT_DATA(const wxChar) wxCheckBoxNameStr[];
extern WXDLLEXPORT_DATA(const char) wxCheckBoxNameStr[];
// ----------------------------------------------------------------------------
// wxToggleButton: a push button

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