Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unicode compilation fixes for OGL (patch #791967)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23065 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-08-21 09:05:56 +00:00
parent ff7047fde5
commit 1484b5cc70
30 changed files with 707 additions and 680 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
contrib/samples/ogl/studio/cspalette.cpp
View File

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