X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0a0352f2f83927fc4ece85e1c76666f7f14fde1c..16aa9c84bca0619ff0a89267772ca30d80324951:/contrib/samples/ogl/studio/cspalette.cpp?ds=sidebyside diff --git a/contrib/samples/ogl/studio/cspalette.cpp b/contrib/samples/ogl/studio/cspalette.cpp index 6d18c070ab..23a238dc2a 100644 --- a/contrib/samples/ogl/studio/cspalette.cpp +++ b/contrib/samples/ogl/studio/cspalette.cpp @@ -14,7 +14,7 @@ #endif // For compilers that support precompilation, includes "wx.h". -#include +#include "wx/wxprec.h" #ifdef __BORLANDC__ #pragma hdrstop @@ -36,7 +36,7 @@ #include "cspalette.h" #include "symbols.h" -#if defined(__WXGTK__) || defined(__WXMOTIF__) +#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) #include "bitmaps/arrow.xpm" #include "bitmaps/texttool.xpm" #endif @@ -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); @@ -106,7 +106,7 @@ bool csApp::CreatePalette(wxFrame *parent) win->SetDefaultSize(wxSize(10000, 40)); win->SetOrientation(wxLAYOUT_HORIZONTAL); win->SetAlignment(wxLAYOUT_TOP); - win->SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); + win->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); win->SetSashVisible(wxSASH_BOTTOM, TRUE); m_diagramPaletteSashWindow = win; @@ -115,10 +115,10 @@ 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(__WXMOTIF__) +#elif defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) wxBitmap PaletteArrow(arrow_xpm); wxBitmap TextTool(texttool_xpm); wxSize toolBitmapSize(22, 22); @@ -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