X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/42e69d6b435a4dd5415caf3750db62cf45b6f373..b4a2ab728bf4627ab2b41385b69e31f10c1fd3b1:/src/msw/data.cpp diff --git a/src/msw/data.cpp b/src/msw/data.cpp index dc3a9aa018..0878e4bb34 100644 --- a/src/msw/data.cpp +++ b/src/msw/data.cpp @@ -29,7 +29,7 @@ #define _MAXPATHLEN 500 // Useful buffer, initialized in wxCommonInit -char *wxBuffer = NULL; +wxChar *wxBuffer = NULL; // Windows List wxWindowList wxTopLevelWindows; @@ -118,48 +118,49 @@ wxFont wxNullFont; wxColour wxNullColour; // Default window names -const char *wxButtonNameStr = "button"; -const char *wxCanvasNameStr = "canvas"; -const char *wxCheckBoxNameStr = "check"; -const char *wxChoiceNameStr = "choice"; -const char *wxComboBoxNameStr = "comboBox"; -const char *wxDialogNameStr = "dialog"; -const char *wxFrameNameStr = "frame"; -const char *wxGaugeNameStr = "gauge"; -const char *wxStaticBoxNameStr = "groupBox"; -const char *wxListBoxNameStr = "listBox"; -const char *wxStaticTextNameStr = "message"; -const char *wxStaticBitmapNameStr = "message"; -const char *wxMultiTextNameStr = "multitext"; -const char *wxPanelNameStr = "panel"; -const char *wxRadioBoxNameStr = "radioBox"; -const char *wxRadioButtonNameStr = "radioButton"; -const char *wxBitmapRadioButtonNameStr = "radioButton"; -const char *wxScrollBarNameStr = "scrollBar"; -const char *wxSliderNameStr = "slider"; -const char *wxStaticNameStr = "static"; -const char *wxTextCtrlWindowNameStr = "textWindow"; -const char *wxTextCtrlNameStr = "text"; -const char *wxVirtListBoxNameStr = "virtListBox"; -const char *wxButtonBarNameStr = "buttonbar"; -const char *wxEnhDialogNameStr = "Shell"; -const char *wxToolBarNameStr = "toolbar"; -const char *wxStatusLineNameStr = "status_line"; -const char *wxEmptyString = ""; -const char *wxGetTextFromUserPromptStr = "Input Text"; -const char *wxMessageBoxCaptionStr = "Message"; -const char *wxFileSelectorPromptStr = "Select a file"; -const char *wxFileSelectorDefaultWildcardStr = "*.*"; -const char *wxInternalErrorStr = "wxWindows Internal Error"; -const char *wxFatalErrorStr = "wxWindows Fatal Error"; -const char *wxTreeCtrlNameStr = "treeCtrl"; +const wxChar *wxButtonNameStr = T("button"); +const wxChar *wxCanvasNameStr = T("canvas"); +const wxChar *wxCheckBoxNameStr = T("check"); +const wxChar *wxChoiceNameStr = T("choice"); +const wxChar *wxComboBoxNameStr = T("comboBox"); +const wxChar *wxDialogNameStr = T("dialog"); +const wxChar *wxFrameNameStr = T("frame"); +const wxChar *wxGaugeNameStr = T("gauge"); +const wxChar *wxStaticBoxNameStr = T("groupBox"); +const wxChar *wxListBoxNameStr = T("listBox"); +const wxChar *wxStaticTextNameStr = T("message"); +const wxChar *wxStaticBitmapNameStr = T("message"); +const wxChar *wxMultiTextNameStr = T("multitext"); +const wxChar *wxPanelNameStr = T("panel"); +const wxChar *wxRadioBoxNameStr = T("radioBox"); +const wxChar *wxRadioButtonNameStr = T("radioButton"); +const wxChar *wxBitmapRadioButtonNameStr = T("radioButton"); +const wxChar *wxScrollBarNameStr = T("scrollBar"); +const wxChar *wxSliderNameStr = T("slider"); +const wxChar *wxStaticNameStr = T("static"); +const wxChar *wxTextCtrlWindowNameStr = T("textWindow"); +const wxChar *wxTextCtrlNameStr = T("text"); +const wxChar *wxVirtListBoxNameStr = T("virtListBox"); +const wxChar *wxButtonBarNameStr = T("buttonbar"); +const wxChar *wxEnhDialogNameStr = T("Shell"); +const wxChar *wxToolBarNameStr = T("toolbar"); +const wxChar *wxStatusLineNameStr = T("status_line"); +const wxChar *wxGetTextFromUserPromptStr = T("Input Text"); +const wxChar *wxMessageBoxCaptionStr = T("Message"); +const wxChar *wxFileSelectorPromptStr = T("Select a file"); +const wxChar *wxFileSelectorDefaultWildcardStr = T("*.*"); +const wxChar *wxInternalErrorStr = T("wxWindows Internal Error"); +const wxChar *wxFatalErrorStr = T("wxWindows Fatal Error"); +const wxChar *wxTreeCtrlNameStr = T("treeCtrl"); +const wxChar *wxDirDialogNameStr = T("wxDirCtrl"); +const wxChar *wxDirDialogDefaultFolderStr = T("/"); // See wx/utils.h -const char *wxFloatToStringStr = "%.2f"; -const char *wxDoubleToStringStr = "%.2f"; +const wxChar *wxFloatToStringStr = T("%.2f"); +const wxChar *wxDoubleToStringStr = T("%.2f"); #ifdef __WXMSW__ -const char *wxUserResourceStr = "TEXT"; +const wxChar *wxUserResourceStr = T("TEXT"); #endif #if wxUSE_SHARED_LIBRARY