X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/15dadf3155f879f8c5031e452566a7b1859e01e3..cd5e9298159e58f57e05f3b76c9d4a45e1eefe12:/src/stc/PlatWX.cpp?ds=sidebyside diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp index 52a351218a..c4fcfb5123 100644 --- a/src/stc/PlatWX.cpp +++ b/src/stc/PlatWX.cpp @@ -6,7 +6,12 @@ #include +#include +#include + + #include "Platform.h" +#include "PlatWX.h" #include "wx/stc/stc.h" @@ -14,6 +19,7 @@ #include #endif + Point Point::FromLong(long lpoint) { return Point(lpoint & 0xFFFF, lpoint >> 16); } @@ -29,35 +35,12 @@ PRectangle PRectangleFromwxRect(wxRect rc) { rc.GetRight()+1, rc.GetBottom()+1); } -Colour::Colour(long lcol) { - co.Set(lcol & 0xff, (lcol >> 8) & 0xff, (lcol >> 16) & 0xff); -} - -Colour::Colour(unsigned int red, unsigned int green, unsigned int blue) { - co.Set(red, green, blue); -} - -bool Colour::operator==(const Colour &other) const { - return co == other.co; -} - -long Colour::AsLong() const { - return (((long)co.Blue() << 16) | - ((long)co.Green() << 8) | - ((long)co.Red())); +wxColour wxColourFromCA(const ColourAllocated& ca) { + ColourDesired cd(ca.AsLong()); + return wxColour(cd.GetRed(), cd.GetGreen(), cd.GetBlue()); } -unsigned int Colour::GetRed() { - return co.Red(); -} - -unsigned int Colour::GetGreen() { - return co.Green(); -} - -unsigned int Colour::GetBlue() { - return co.Blue(); -} +//---------------------------------------------------------------------- Palette::Palette() { used = 0; @@ -84,7 +67,7 @@ void Palette::WantFind(ColourPair &cp, bool want) { if (used < numEntries) { entries[used].desired = cp.desired; - entries[used].allocated = cp.desired; + entries[used].allocated.Set(cp.desired.AsLong()); used++; } } else { @@ -94,7 +77,7 @@ void Palette::WantFind(ColourPair &cp, bool want) { return; } } - cp.allocated = cp.desired; + cp.allocated.Set(cp.desired.AsLong()); } } @@ -104,6 +87,8 @@ void Palette::Allocate(Window &) { } +//---------------------------------------------------------------------- + Font::Font() { id = 0; ascent = 0; @@ -113,36 +98,174 @@ Font::~Font() { } void Font::Create(const char *faceName, int characterSet, int size, bool bold, bool italic) { - // TODO: what to do about the characterSet? + wxFontEncoding encoding; Release(); + + switch (characterSet) { + default: + case wxSTC_CHARSET_ANSI: + case wxSTC_CHARSET_DEFAULT: + encoding = wxFONTENCODING_DEFAULT; + break; + + case wxSTC_CHARSET_BALTIC: + encoding = wxFONTENCODING_ISO8859_13; + break; + + case wxSTC_CHARSET_CHINESEBIG5: + encoding = wxFONTENCODING_CP950; + break; + + case wxSTC_CHARSET_EASTEUROPE: + encoding = wxFONTENCODING_ISO8859_2; + break; + + case wxSTC_CHARSET_GB2312: + encoding = wxFONTENCODING_CP936; + break; + + case wxSTC_CHARSET_GREEK: + encoding = wxFONTENCODING_ISO8859_7; + break; + + case wxSTC_CHARSET_HANGUL: + encoding = wxFONTENCODING_CP949; + break; + + case wxSTC_CHARSET_MAC: + encoding = wxFONTENCODING_DEFAULT; + break; + + case wxSTC_CHARSET_OEM: + encoding = wxFONTENCODING_DEFAULT; + break; + + case wxSTC_CHARSET_RUSSIAN: + encoding = wxFONTENCODING_KOI8; + break; + + case wxSTC_CHARSET_SHIFTJIS: + encoding = wxFONTENCODING_CP932; + break; + + case wxSTC_CHARSET_SYMBOL: + encoding = wxFONTENCODING_DEFAULT; + break; + + case wxSTC_CHARSET_TURKISH: + encoding = wxFONTENCODING_ISO8859_9; + break; + + case wxSTC_CHARSET_JOHAB: + encoding = wxFONTENCODING_DEFAULT; + break; + + case wxSTC_CHARSET_HEBREW: + encoding = wxFONTENCODING_ISO8859_8; + break; + + case wxSTC_CHARSET_ARABIC: + encoding = wxFONTENCODING_ISO8859_6; + break; + + case wxSTC_CHARSET_VIETNAMESE: + encoding = wxFONTENCODING_DEFAULT; + break; + + case wxSTC_CHARSET_THAI: + encoding = wxFONTENCODING_ISO8859_11; + break; + } + + wxFontEncodingArray ea = wxEncodingConverter::GetPlatformEquivalents(encoding); + if (ea.GetCount()) + encoding = ea[0]; + id = new wxFont(size, wxDEFAULT, italic ? wxITALIC : wxNORMAL, bold ? wxBOLD : wxNORMAL, false, - faceName, - wxFONTENCODING_DEFAULT); + wxString(faceName, wxConvUTF8), + encoding); } void Font::Release() { if (id) - delete id; + delete (wxFont*)id; id = 0; } +//---------------------------------------------------------------------- + +class SurfaceImpl : public Surface { +private: + wxDC* hdc; + bool hdcOwned; + wxBitmap* bitmap; + int x; + int y; + bool unicodeMode; + +public: + SurfaceImpl(); + ~SurfaceImpl(); + + void Init(); + void Init(SurfaceID sid); + void InitPixMap(int width, int height, Surface *surface_); + + void Release(); + bool Initialised(); + void PenColour(ColourAllocated fore); + int LogPixelsY(); + int DeviceHeightFont(int points); + void MoveTo(int x_, int y_); + void LineTo(int x_, int y_); + void Polygon(Point *pts, int npts, ColourAllocated fore, ColourAllocated back); + void RectangleDraw(PRectangle rc, ColourAllocated fore, ColourAllocated back); + void FillRectangle(PRectangle rc, ColourAllocated back); + void FillRectangle(PRectangle rc, Surface &surfacePattern); + void RoundedRectangle(PRectangle rc, ColourAllocated fore, ColourAllocated back); + void Ellipse(PRectangle rc, ColourAllocated fore, ColourAllocated back); + void Copy(PRectangle rc, Point from, Surface &surfaceSource); + + void DrawTextNoClip(PRectangle rc, Font &font_, int ybase, const char *s, int len, ColourAllocated fore, ColourAllocated back); + void DrawTextClipped(PRectangle rc, Font &font_, int ybase, const char *s, int len, ColourAllocated fore, ColourAllocated back); + void MeasureWidths(Font &font_, const char *s, int len, int *positions); + int WidthText(Font &font_, const char *s, int len); + int WidthChar(Font &font_, char ch); + int Ascent(Font &font_); + int Descent(Font &font_); + int InternalLeading(Font &font_); + int ExternalLeading(Font &font_); + int Height(Font &font_); + int AverageCharWidth(Font &font_); + + int SetPalette(Palette *pal, bool inBackGround); + void SetClip(PRectangle rc); + void FlushCachedState(); + + void SetUnicodeMode(bool unicodeMode_); + + void BrushColour(ColourAllocated back); + void SetFont(Font &font_); +}; + + -Surface::Surface() : +SurfaceImpl::SurfaceImpl() : hdc(0), hdcOwned(0), bitmap(0), - x(0), y(0) { -} + x(0), y(0), unicodeMode(0) +{} -Surface::~Surface() { +SurfaceImpl::~SurfaceImpl() { Release(); } -void Surface::Release() { +void SurfaceImpl::Release() { if (bitmap) { ((wxMemoryDC*)hdc)->SelectObject(wxNullBitmap); delete bitmap; @@ -156,24 +279,24 @@ void Surface::Release() { } -bool Surface::Initialised() { +bool SurfaceImpl::Initialised() { return hdc != 0; } -void Surface::Init() { +void SurfaceImpl::Init() { Release(); hdc = new wxMemoryDC(); hdcOwned = true; } -void Surface::Init(SurfaceID hdc_) { +void SurfaceImpl::Init(SurfaceID hdc_) { Release(); - hdc = hdc_; + hdc = (wxDC*)hdc_; } -void Surface::InitPixMap(int width, int height, Surface *surface_) { +void SurfaceImpl::InitPixMap(int width, int height, Surface *surface_) { Release(); - hdc = new wxMemoryDC(surface_->hdc); + hdc = new wxMemoryDC(); hdcOwned = true; if (width < 1) width = 1; if (height < 1) height = 1; @@ -181,64 +304,61 @@ void Surface::InitPixMap(int width, int height, Surface *surface_) { ((wxMemoryDC*)hdc)->SelectObject(*bitmap); } -void Surface::PenColour(Colour fore) { - hdc->SetPen(wxPen(fore.co, 1, wxSOLID)); +void SurfaceImpl::PenColour(ColourAllocated fore) { + hdc->SetPen(wxPen(wxColourFromCA(fore), 1, wxSOLID)); } -void Surface::BrushColor(Colour back) { - hdc->SetBrush(wxBrush(back.co, wxSOLID)); +void SurfaceImpl::BrushColour(ColourAllocated back) { + hdc->SetBrush(wxBrush(wxColourFromCA(back), wxSOLID)); } -void Surface::SetFont(Font &font_) { +void SurfaceImpl::SetFont(Font &font_) { if (font_.GetID()) { - hdc->SetFont(*font_.GetID()); + hdc->SetFont(*((wxFont*)font_.GetID())); } } -int Surface::LogPixelsY() { +int SurfaceImpl::LogPixelsY() { return hdc->GetPPI().y; } - -int Surface::DeviceHeightFont(int points) { +int SurfaceImpl::DeviceHeightFont(int points) { return points; } - -void Surface::MoveTo(int x_, int y_) { +void SurfaceImpl::MoveTo(int x_, int y_) { x = x_; y = y_; } -void Surface::LineTo(int x_, int y_) { +void SurfaceImpl::LineTo(int x_, int y_) { hdc->DrawLine(x,y, x_,y_); x = x_; y = y_; } -void Surface::Polygon(Point *pts, int npts, Colour fore, - Colour back) { +void SurfaceImpl::Polygon(Point *pts, int npts, ColourAllocated fore, ColourAllocated back) { PenColour(fore); - BrushColor(back); + BrushColour(back); hdc->DrawPolygon(npts, (wxPoint*)pts); } -void Surface::RectangleDraw(PRectangle rc, Colour fore, Colour back) { +void SurfaceImpl::RectangleDraw(PRectangle rc, ColourAllocated fore, ColourAllocated back) { PenColour(fore); - BrushColor(back); + BrushColour(back); hdc->DrawRectangle(wxRectFromPRectangle(rc)); } -void Surface::FillRectangle(PRectangle rc, Colour back) { - BrushColor(back); +void SurfaceImpl::FillRectangle(PRectangle rc, ColourAllocated back) { + BrushColour(back); hdc->SetPen(*wxTRANSPARENT_PEN); hdc->DrawRectangle(wxRectFromPRectangle(rc)); } -void Surface::FillRectangle(PRectangle rc, Surface &surfacePattern) { +void SurfaceImpl::FillRectangle(PRectangle rc, Surface &surfacePattern) { wxBrush br; - if (surfacePattern.bitmap) - br = wxBrush(*surfacePattern.bitmap); + if (((SurfaceImpl&)surfacePattern).bitmap) + br = wxBrush(*((SurfaceImpl&)surfacePattern).bitmap); else // Something is wrong so display in red br = wxBrush(*wxRED, wxSOLID); hdc->SetPen(*wxTRANSPARENT_PEN); @@ -246,79 +366,130 @@ void Surface::FillRectangle(PRectangle rc, Surface &surfacePattern) { hdc->DrawRectangle(wxRectFromPRectangle(rc)); } -void Surface::RoundedRectangle(PRectangle rc, Colour fore, Colour back) { +void SurfaceImpl::RoundedRectangle(PRectangle rc, ColourAllocated fore, ColourAllocated back) { PenColour(fore); - BrushColor(back); + BrushColour(back); hdc->DrawRoundedRectangle(wxRectFromPRectangle(rc), 4); } -void Surface::Ellipse(PRectangle rc, Colour fore, Colour back) { +void SurfaceImpl::Ellipse(PRectangle rc, ColourAllocated fore, ColourAllocated back) { PenColour(fore); - BrushColor(back); + BrushColour(back); hdc->DrawEllipse(wxRectFromPRectangle(rc)); } -void Surface::Copy(PRectangle rc, Point from, Surface &surfaceSource) { +void SurfaceImpl::Copy(PRectangle rc, Point from, Surface &surfaceSource) { wxRect r = wxRectFromPRectangle(rc); hdc->Blit(r.x, r.y, r.width, r.height, - surfaceSource.hdc, from.x, from.y, wxCOPY); + ((SurfaceImpl&)surfaceSource).hdc, + from.x, from.y, wxCOPY); } -void Surface::DrawText(PRectangle rc, Font &font, int ybase, - const char *s, int len, Colour fore, Colour back) { +void SurfaceImpl::DrawTextNoClip(PRectangle rc, Font &font, int ybase, + const char *s, int len, + ColourAllocated fore, ColourAllocated back) { SetFont(font); - hdc->SetTextForeground(fore.co); - hdc->SetTextBackground(back.co); + hdc->SetTextForeground(wxColourFromCA(fore)); + hdc->SetTextBackground(wxColourFromCA(back)); FillRectangle(rc, back); + // will convert from UTF-8 in unicode mode + wxString str(s, wxConvUTF8, len); + // ybase is where the baseline should be, but wxWin uses the upper left // corner, so I need to calculate the real position for the text... - hdc->DrawText(wxString(s, len), rc.left, ybase - font.ascent); + hdc->DrawText(str, rc.left, ybase - font.ascent); } -void Surface::DrawTextClipped(PRectangle rc, Font &font, int ybase, const char *s, int len, Colour fore, Colour back) { +void SurfaceImpl::DrawTextClipped(PRectangle rc, Font &font, int ybase, + const char *s, int len, + ColourAllocated fore, ColourAllocated back) { SetFont(font); - hdc->SetTextForeground(fore.co); - hdc->SetTextBackground(back.co); + hdc->SetTextForeground(wxColourFromCA(fore)); + hdc->SetTextBackground(wxColourFromCA(back)); FillRectangle(rc, back); hdc->SetClippingRegion(wxRectFromPRectangle(rc)); + // will convert from UTF-8 in unicode mode + wxString str(s, wxConvUTF8, len); + // see comments above - hdc->DrawText(wxString(s, len), rc.left, ybase - font.ascent); + hdc->DrawText(str, rc.left, ybase - font.ascent); hdc->DestroyClippingRegion(); } -int Surface::WidthText(Font &font, const char *s, int len) { +int SurfaceImpl::WidthText(Font &font, const char *s, int len) { SetFont(font); int w; int h; - hdc->GetTextExtent(wxString(s, len), &w, &h); + + // will convert from UTF-8 in unicode mode + wxString str(s, wxConvUTF8, len); + + hdc->GetTextExtent(str, &w, &h); return w; } -void Surface::MeasureWidths(Font &font, const char *s, int len, int *positions) { + +void SurfaceImpl::MeasureWidths(Font &font, const char *s, int len, int *positions) { + // will convert from UTF-8 in unicode mode + wxString str(s, wxConvUTF8, len); SetFont(font); + + // Calculate the position of each character based on the widths of + // the previous characters + int* tpos = new int[len]; int totalWidth = 0; - for (int i=0; iGetTextExtent(s[i], &w, &h); + size_t i; + for (i=0; iGetTextExtent(str[i], &w, &h); totalWidth += w; - positions[i] = totalWidth; + tpos[i] = totalWidth; } + +#if wxUSE_UNICODE + // Map the widths for UCS-2 characters back to the UTF-8 input string + i = 0; + size_t ui = 0; + while (i < len) { + unsigned char uch = (unsigned char)s[i]; + positions[i++] = tpos[ui]; + if (uch >= 0x80) { + if (uch < (0x80 + 0x40 + 0x20)) { + positions[i++] = tpos[ui]; + } else { + positions[i++] = tpos[ui]; + positions[i++] = tpos[ui]; + } + } + ui++; + } +#else + + // If not unicode then just use the widths we have + memcpy(positions, tpos, len * sizeof(*tpos)); +#endif + + delete [] tpos; } -int Surface::WidthChar(Font &font, char ch) { + +int SurfaceImpl::WidthChar(Font &font, char ch) { SetFont(font); int w; int h; - hdc->GetTextExtent(ch, &w, &h); + char s[2] = { ch, 0 }; + + // will convert from UTF-8 in unicode mode + wxString str(s, wxConvUTF8, 1); + hdc->GetTextExtent(str, &w, &h); return w; } -#define EXTENT_TEST " `~!@#$%^&*()-_=+\\|[]{};:\"\'<,>.?/1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" +#define EXTENT_TEST wxT(" `~!@#$%^&*()-_=+\\|[]{};:\"\'<,>.?/1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ") -int Surface::Ascent(Font &font) { +int SurfaceImpl::Ascent(Font &font) { SetFont(font); int w, h, d, e; hdc->GetTextExtent(EXTENT_TEST, &w, &h, &d, &e); @@ -326,66 +497,87 @@ int Surface::Ascent(Font &font) { return font.ascent; } -int Surface::Descent(Font &font) { +int SurfaceImpl::Descent(Font &font) { SetFont(font); int w, h, d, e; hdc->GetTextExtent(EXTENT_TEST, &w, &h, &d, &e); return d; } -int Surface::InternalLeading(Font &font) { +int SurfaceImpl::InternalLeading(Font &font) { return 0; } -int Surface::ExternalLeading(Font &font) { +int SurfaceImpl::ExternalLeading(Font &font) { SetFont(font); int w, h, d, e; hdc->GetTextExtent(EXTENT_TEST, &w, &h, &d, &e); return e; } -int Surface::Height(Font &font) { +int SurfaceImpl::Height(Font &font) { SetFont(font); return hdc->GetCharHeight(); } -int Surface::AverageCharWidth(Font &font) { +int SurfaceImpl::AverageCharWidth(Font &font) { SetFont(font); return hdc->GetCharWidth(); } -int Surface::SetPalette(Palette *pal, bool inBackGround) { +int SurfaceImpl::SetPalette(Palette *pal, bool inBackGround) { return 0; } -void Surface::SetClip(PRectangle rc) { +void SurfaceImpl::SetClip(PRectangle rc) { hdc->SetClippingRegion(wxRectFromPRectangle(rc)); } -void Surface::FlushCachedState() { +void SurfaceImpl::FlushCachedState() { +} + +void SurfaceImpl::SetUnicodeMode(bool unicodeMode_) { + unicodeMode=unicodeMode_; +#if wxUSE_UNICODE + wxASSERT_MSG(unicodeMode == wxUSE_UNICODE, + wxT("Only unicode may be used when wxUSE_UNICODE is on.")); +#else + wxASSERT_MSG(unicodeMode == wxUSE_UNICODE, + wxT("Only non-unicode may be used when wxUSE_UNICODE is off.")); +#endif +} + +Surface *Surface::Allocate() { + return new SurfaceImpl; } + +//---------------------------------------------------------------------- + + +inline wxWindow* GETWIN(WindowID id) { return (wxWindow*)id; } + Window::~Window() { } void Window::Destroy() { if (id) - id->Destroy(); + GETWIN(id)->Destroy(); id = 0; } bool Window::HasFocus() { - return wxWindow::FindFocus() == id; + return wxWindow::FindFocus() == GETWIN(id); } PRectangle Window::GetPosition() { - wxRect rc(id->GetPosition(), id->GetSize()); + wxRect rc(GETWIN(id)->GetPosition(), GETWIN(id)->GetSize()); return PRectangleFromwxRect(rc); } void Window::SetPosition(PRectangle rc) { wxRect r = wxRectFromPRectangle(rc); - id->SetSize(r); + GETWIN(id)->SetSize(r); } void Window::SetPositionRelative(PRectangle rc, Window) { @@ -393,25 +585,27 @@ void Window::SetPositionRelative(PRectangle rc, Window) { } PRectangle Window::GetClientPosition() { - wxSize sz = id->GetClientSize(); + wxSize sz = GETWIN(id)->GetClientSize(); return PRectangle(0, 0, sz.x, sz.y); } void Window::Show(bool show) { - id->Show(show); + GETWIN(id)->Show(show); } void Window::InvalidateAll() { - id->Refresh(false); + GETWIN(id)->Refresh(false); + wxWakeUpIdle(); } void Window::InvalidateRectangle(PRectangle rc) { wxRect r = wxRectFromPRectangle(rc); - id->Refresh(false, &r); + GETWIN(id)->Refresh(false, &r); + wxWakeUpIdle(); } void Window::SetFont(Font &font) { - id->SetFont(*font.GetID()); + GETWIN(id)->SetFont(*((wxFont*)font.GetID())); } void Window::SetCursor(Cursor curs) { @@ -444,19 +638,21 @@ void Window::SetCursor(Cursor curs) { break; } - id->SetCursor(wxCursor(cursorId)); + GETWIN(id)->SetCursor(wxCursor(cursorId)); } void Window::SetTitle(const char *s) { - id->SetTitle(s); + // will convert from UTF-8 in unicode mode + wxString str(s, wxConvUTF8); + GETWIN(id)->SetTitle(str); } //---------------------------------------------------------------------- // Helper classes for ListBox -// A wxListBox that gives focus to its parent if it gets it. +// A wxListBox that gives focus back to its parent if it gets it. class wxSTCListBox : public wxListBox { public: wxSTCListBox(wxWindow* parent, wxWindowID id) @@ -532,7 +728,9 @@ BEGIN_EVENT_TABLE(wxSTCListBoxWin, wxSTCListBoxWinBase) END_EVENT_TABLE() -#define GETLB(win) (((wxSTCListBoxWin*)win)->GetLB()) +inline wxListBox* GETLB(WindowID win) { + return (((wxSTCListBoxWin*)win)->GetLB()); +} //---------------------------------------------------------------------- @@ -543,7 +741,7 @@ ListBox::~ListBox() { } void ListBox::Create(Window &parent, int ctrlID) { - id = new wxSTCListBoxWin(parent.id, ctrlID); + id = new wxSTCListBoxWin(GETWIN(parent.GetID()), ctrlID); } void ListBox::SetVisibleRows(int rows) { @@ -569,7 +767,7 @@ void ListBox::SetAverageCharWidth(int width) { } void ListBox::SetFont(Font &font) { - GETLB(id)->SetFont(*font.GetID()); + GETLB(id)->SetFont(*((wxFont*)font.GetID())); } void ListBox::Clear() { @@ -606,13 +804,14 @@ int ListBox::Find(const char *prefix) { void ListBox::GetValue(int n, char *value, int len) { wxString text = GETLB(id)->GetString(n); - strncpy(value, text.c_str(), len); + strncpy(value, text.mb_str(wxConvUTF8), len); value[len-1] = '\0'; } void ListBox::Sort() { } +//---------------------------------------------------------------------- Menu::Menu() : id(0) { } @@ -624,30 +823,33 @@ void Menu::CreatePopUp() { void Menu::Destroy() { if (id) - delete id; + delete (wxMenu*)id; id = 0; } void Menu::Show(Point pt, Window &w) { - w.GetID()->PopupMenu(id, pt.x - 4, pt.y); + GETWIN(w.GetID())->PopupMenu((wxMenu*)id, pt.x - 4, pt.y); Destroy(); } +//---------------------------------------------------------------------- -Colour Platform::Chrome() { +ColourDesired Platform::Chrome() { wxColour c; c = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); - return Colour(c.Red(), c.Green(), c.Blue()); + return ColourDesired(c.Red(), c.Green(), c.Blue()); } -Colour Platform::ChromeHighlight() { +ColourDesired Platform::ChromeHighlight() { wxColour c; c = wxSystemSettings::GetColour(wxSYS_COLOUR_3DHIGHLIGHT); - return Colour(c.Red(), c.Green(), c.Blue()); + return ColourDesired(c.Red(), c.Green(), c.Blue()); } const char *Platform::DefaultFont() { - return wxNORMAL_FONT->GetFaceName(); + static char buf[128]; + strcpy(buf, wxNORMAL_FONT->GetFaceName().mbc_str()); + return buf; } int Platform::DefaultFontSize() { @@ -659,7 +861,7 @@ unsigned int Platform::DoubleClickTime() { } void Platform::DebugDisplay(const char *s) { - wxLogDebug(s); + wxLogDebug(wxString(s, *wxConvCurrent)); } bool Platform::IsKeyDown(int key) { @@ -718,7 +920,8 @@ void Platform::Assert(const char *c, const char *file, int line) { char buffer[2000]; sprintf(buffer, "Assertion [%s] failed at %s %d", c, file, line); if (assertionPopUps) { - int idButton = wxMessageBox(buffer, "Assertion failure", + int idButton = wxMessageBox(wxString(buffer, *wxConvCurrent), + wxT("Assertion failure"), wxICON_HAND | wxOK); // if (idButton == IDRETRY) { // ::DebugBreak(); @@ -744,6 +947,26 @@ int Platform::Clamp(int val, int minVal, int maxVal) { } +bool Platform::IsDBCSLeadByte(int codePage, char ch) { + return false; +} + + + +//---------------------------------------------------------------------- + +ElapsedTime::ElapsedTime() { + wxStartTimer(); +} + +double ElapsedTime::Duration(bool reset) { + double result = wxGetElapsedTime(reset); + result /= 1000.0; + return result; +} + + +//----------------------------------------------------------------------