X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/618f2efa413947456c7efb17d143a44a76787619..a333f34d91ae845d39ca8a833290e9a1c3d04749:/contrib/samples/ogl/studio/cspalette.cpp diff --git a/contrib/samples/ogl/studio/cspalette.cpp b/contrib/samples/ogl/studio/cspalette.cpp index 36ac64e236..23a238dc2a 100644 --- a/contrib/samples/ogl/studio/cspalette.cpp +++ b/contrib/samples/ogl/studio/cspalette.cpp @@ -72,9 +72,9 @@ bool csEditorToolPalette::OnLeftClick(int toolIndex, bool toggled) void csEditorToolPalette::OnMouseEnter(int toolIndex) { - wxString msg(""); + wxString msg = wxEmptyString; if (toolIndex == PALETTE_ARROW) - msg = "Pointer"; + msg = _T("Pointer"); else if (toolIndex != -1) { csSymbol* symbol = wxGetApp().GetSymbolDatabase()->FindSymbol(toolIndex); @@ -115,8 +115,8 @@ bool csApp::CreatePalette(wxFrame *parent) // Load palette bitmaps #ifdef __WXMSW__ - wxBitmap PaletteArrow("arrowtool"); - wxBitmap TextTool("texttool"); + wxBitmap PaletteArrow(_T("arrowtool")); + wxBitmap TextTool(_T("texttool")); wxSize toolBitmapSize(32, 32); #elif defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) wxBitmap PaletteArrow(arrow_xpm); @@ -130,37 +130,37 @@ bool csApp::CreatePalette(wxFrame *parent) palette->SetToolBitmapSize(toolBitmapSize); - palette->AddTool(PALETTE_ARROW, PaletteArrow, wxNullBitmap, TRUE, 0, -1, NULL, "Pointer"); - palette->AddTool(PALETTE_TEXT_TOOL, TextTool, wxNullBitmap, TRUE, 0, -1, NULL, "Text"); + palette->AddTool(PALETTE_ARROW, PaletteArrow, wxNullBitmap, TRUE, 0, -1, NULL, _T("Pointer")); + palette->AddTool(PALETTE_TEXT_TOOL, TextTool, wxNullBitmap, TRUE, 0, -1, NULL, _T("Text")); - char** symbols = new char*[20]; + wxChar** symbols = new wxChar*[20]; int noSymbols = 0; - symbols[noSymbols] = "Wide Rectangle"; + symbols[noSymbols] = _T("Wide Rectangle"); noSymbols ++; - symbols[noSymbols] = "Thin Rectangle"; + symbols[noSymbols] = _T("Thin Rectangle"); noSymbols ++; - symbols[noSymbols] = "Triangle"; + symbols[noSymbols] = _T("Triangle"); noSymbols ++; - symbols[noSymbols] = "Octagon"; + symbols[noSymbols] = _T("Octagon"); noSymbols ++; // For some reason, we're getting Gdk errors with // some shapes, such as ones that use DrawEllipse. #ifndef __WXGTK__ - symbols[noSymbols] = "Group"; + symbols[noSymbols] = _T("Group"); noSymbols ++; - symbols[noSymbols] = "Circle"; + symbols[noSymbols] = _T("Circle"); noSymbols ++; - symbols[noSymbols] = "Circle shadow"; + symbols[noSymbols] = _T("Circle shadow"); noSymbols ++; - symbols[noSymbols] = "SemiCircle"; + symbols[noSymbols] = _T("SemiCircle"); noSymbols ++; #endif