Applied patch [ 658174 ] Adds wxT() and char->wxChar conversion

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-12-27 15:15:29 +00:00
parent 22f2279860
commit 16990160f6

View File

@@ -86,47 +86,45 @@ wxFont wxNullFont;
wxColour wxNullColour; wxColour wxNullColour;
// Default window names // Default window names
const char *wxButtonNameStr = "button"; const wxChar *wxButtonNameStr = wxT("button");
const char *wxCanvasNameStr = "canvas"; const wxChar *wxCanvasNameStr = wxT("canvas");
const char *wxCheckBoxNameStr = "check"; const wxChar *wxCheckBoxNameStr = wxT("check");
const char *wxChoiceNameStr = "choice"; const wxChar *wxChoiceNameStr = wxT("choice");
const char *wxComboBoxNameStr = "comboBox"; const wxChar *wxComboBoxNameStr = wxT("comboBox");
const char *wxDialogNameStr = "dialog"; const wxChar *wxDialogNameStr = wxT("dialog");
const char *wxFrameNameStr = "frame"; const wxChar *wxFrameNameStr = wxT("frame");
const char *wxGaugeNameStr = "gauge"; const wxChar *wxGaugeNameStr = wxT("gauge");
const char *wxStaticBoxNameStr = "groupBox"; const wxChar *wxStaticBoxNameStr = wxT("groupBox");
const char *wxListBoxNameStr = "listBox"; const wxChar *wxListBoxNameStr = wxT("listBox");
const char *wxStaticTextNameStr = "message"; const wxChar *wxStaticTextNameStr = wxT("message");
const char *wxStaticBitmapNameStr = "message"; const wxChar *wxStaticBitmapNameStr = wxT("message");
const char *wxMultiTextNameStr = "multitext"; const wxChar *wxMultiTextNameStr = wxT("multitext");
const char *wxPanelNameStr = "panel"; const wxChar *wxPanelNameStr = wxT("panel");
const char *wxRadioBoxNameStr = "radioBox"; const wxChar *wxRadioBoxNameStr = wxT("radioBox");
const char *wxRadioButtonNameStr = "radioButton"; const wxChar *wxRadioButtonNameStr = wxT("radioButton");
const char *wxBitmapRadioButtonNameStr = "radioButton"; const wxChar *wxBitmapRadioButtonNameStr = wxT("radioButton");
const char *wxScrollBarNameStr = "scrollBar"; const wxChar *wxScrollBarNameStr = wxT("scrollBar");
const char *wxSliderNameStr = "slider"; const wxChar *wxSliderNameStr = wxT("slider");
const char *wxStaticNameStr = "static"; const wxChar *wxStaticNameStr = wxT("static");
const char *wxTextCtrlWindowNameStr = "textWindow"; const wxChar *wxTextCtrlWindowNameStr = wxT("textWindow");
const char *wxTextCtrlNameStr = "text"; const wxChar *wxTextCtrlNameStr = wxT("text");
const char *wxVirtListBoxNameStr = "virtListBox"; const wxChar *wxVirtListBoxNameStr = wxT("virtListBox");
const char *wxButtonBarNameStr = "buttonbar"; const wxChar *wxButtonBarNameStr = wxT("buttonbar");
const char *wxEnhDialogNameStr = "Shell"; const wxChar *wxEnhDialogNameStr = wxT("Shell");
const char *wxToolBarNameStr = "toolbar"; const wxChar *wxToolBarNameStr = wxT("toolbar");
const char *wxStatusLineNameStr = "status_line"; const wxChar *wxStatusLineNameStr = wxT("status_line");
#if 0 // this is defined in string.cpp
const char *wxEmptyString = ""; const wxChar *wxGetTextFromUserPromptStr = wxT("Input Text");
#endif const wxChar *wxMessageBoxCaptionStr = wxT("Message");
const char *wxGetTextFromUserPromptStr = "Input Text"; const wxChar *wxFileSelectorPromptStr = wxT("Select a file");
const char *wxMessageBoxCaptionStr = "Message"; const wxChar *wxFileSelectorDefaultWildcardStr = wxT("*.*");
const char *wxFileSelectorPromptStr = "Select a file";
const char *wxFileSelectorDefaultWildcardStr = "*.*";
const char *wxDirDialogNameStr = "wxDirCtrl";
const char *wxDirDialogDefaultFolderStr = "/";
const wxChar *wxTreeCtrlNameStr = wxT("wxTreeCtrl"); const wxChar *wxTreeCtrlNameStr = wxT("wxTreeCtrl");
const wxChar *wxDirDialogNameStr = wxT("wxDirCtrl");
const wxChar *wxDirDialogDefaultFolderStr = wxT("/");
// See wx/utils.h // See wx/utils.h
const char *wxFloatToStringStr = "%.2f"; const wxChar *wxFloatToStringStr = wxT("%.2f");
const char *wxDoubleToStringStr = "%.2f"; const wxChar *wxDoubleToStringStr = wxT("%.2f");
const wxSize wxDefaultSize(-1, -1); const wxSize wxDefaultSize(-1, -1);