X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6612393c0080efbe5b12457434b794dc1a2cc1d8..e736b21a8c9295b42a528d76863559a4265dab02:/src/stc/PlatWX.cpp diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp index ceb50296a6..46d478e701 100644 --- a/src/stc/PlatWX.cpp +++ b/src/stc/PlatWX.cpp @@ -28,9 +28,9 @@ Point Point::FromLong(long lpoint) { } wxRect wxRectFromPRectangle(PRectangle prc) { - wxRect rc(prc.left, prc.top, - prc.right-prc.left, prc.bottom-prc.top); - return rc; + wxRect r(prc.left, prc.top, + prc.Width(), prc.Height()); + return r; } PRectangle PRectangleFromwxRect(wxRect rc) { @@ -100,7 +100,7 @@ Font::Font() { Font::~Font() { } -void Font::Create(const char *faceName, int characterSet, int size, bool bold, bool italic) { +void Font::Create(const char *faceName, int characterSet, int size, bool bold, bool italic, bool extraFontFlag) { wxFontEncoding encoding; Release(); @@ -185,13 +185,15 @@ void Font::Create(const char *faceName, int characterSet, int size, bool bold, b if (ea.GetCount()) encoding = ea[0]; - id = new wxFont(size, + wxFont* font = new wxFont(size, wxDEFAULT, italic ? wxITALIC : wxNORMAL, bold ? wxBOLD : wxNORMAL, false, stc2wx(faceName), encoding); + font->SetNoAntiAliasing(!extraFontFlag); + id = font; } @@ -445,42 +447,18 @@ void SurfaceImpl::DrawTextTransparent(PRectangle rc, Font &font, int ybase, void SurfaceImpl::MeasureWidths(Font &font, const char *s, int len, int *positions) { - wxString str = stc2wx(s, len); - SetFont(font); + wxString str = stc2wx(s, len); + wxArrayInt tpos; -#ifndef __WXMAC__ - // Calculate the position of each character based on the widths of - // the previous characters - int* tpos = new int[len+1]; - int totalWidth = 0; - size_t i; - for (i=0; iGetTextExtent(str[i], &w, &h); - totalWidth += w; - tpos[i] = totalWidth; - } -#else - // Instead of a running total, remeasure from the begining of the - // text for each character's position. This is because with AA fonts - // on OS X widths can be fractions of pixels wide when more than one - // are drawn together, so the sum of all character widths is not necessarily - // (and probably not) the same as the whole string width. - int* tpos = new int[len+1]; - size_t i; - for (i=0; iGetTextExtent(str.Left(i+1), &w, &h); - tpos[i] = w; - } -#endif + SetFont(font); + hdc->GetPartialTextExtents(str, tpos); #if wxUSE_UNICODE // Map the widths for UCS-2 characters back to the UTF-8 input string // NOTE: I don't think this is right for when sizeof(wxChar) > 2, ie wxGTK2 // so figure it out and fix it! - i = 0; + size_t i = 0; size_t ui = 0; while ((int)i < len) { unsigned char uch = (unsigned char)s[i]; @@ -498,10 +476,8 @@ void SurfaceImpl::MeasureWidths(Font &font, const char *s, int len, int *positio #else // If not unicode then just use the widths we have - memcpy(positions, tpos, len * sizeof(*tpos)); + memcpy(positions, tpos.begin(), len * sizeof(int)); #endif - - delete [] tpos; } @@ -555,7 +531,7 @@ int SurfaceImpl::ExternalLeading(Font &font) { int SurfaceImpl::Height(Font &font) { SetFont(font); - return hdc->GetCharHeight(); + return hdc->GetCharHeight() + 1; } int SurfaceImpl::AverageCharWidth(Font &font) { @@ -713,7 +689,7 @@ public: event.Skip(); } - void OnKillFocus(wxFocusEvent& event) { + void OnKillFocus(wxFocusEvent& WXUNUSED(event)) { // Do nothing. Prevents base class from resetting the colors... } @@ -737,10 +713,9 @@ private: void* doubleClickActionData; public: wxSTCListBoxWin(wxWindow* parent, wxWindowID id) : - wxWindow(parent, id, wxDefaultPosition, wxSize(0,0), wxNO_BORDER ) + wxWindow(parent, id, wxDefaultPosition, wxSize(0,0), wxSIMPLE_BORDER ) { - SetBackgroundColour(*wxBLACK); lv = new wxSTCListBox(this, id, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_SINGLE_SEL | wxLC_NO_HEADER | wxNO_BORDER); lv->SetCursor(wxCursor(wxCURSOR_ARROW)); @@ -754,12 +729,20 @@ public: Hide(); } - + // On OSX and (possibly others) there can still be pending // messages/events for the list control when Scintilla wants to // close it, so do a pending delete of it instead of destroying // immediately. bool Destroy() { +#ifdef __WXMAC__ + // There bottom edge of this window is not getting properly + // refreshed upon deletion, so help it out... + wxWindow* p = GetParent(); + wxRect r(GetPosition(), GetSize()); + r.SetHeight(r.GetHeight()+1); + p->Refresh(false, &r); +#endif if ( !wxPendingDelete.Member(this) ) wxPendingDelete.Append(this); return TRUE; @@ -789,9 +772,9 @@ public: } void OnSize(wxSizeEvent& event) { - // resize the child, leaving a 1 pixel border + // resize the child wxSize sz = GetClientSize(); - lv->SetSize(1, 1, sz.x-2, sz.y-2); + lv->SetSize(sz); // reset the column widths lv->SetColumnWidth(0, IconWidth()+4); lv->SetColumnWidth(1, sz.x - 2 - lv->GetColumnWidth(0) - @@ -799,7 +782,7 @@ public: event.Skip(); } - void OnActivate(wxListEvent& event) { + void OnActivate(wxListEvent& WXUNUSED(event)) { doubleClickAction(doubleClickActionData); } @@ -855,7 +838,6 @@ public: virtual int GetSelection(); virtual int Find(const char *prefix); virtual void GetValue(int n, char *value, int len); - virtual void Sort(); virtual void RegisterImage(int type, const char *xpm_data); virtual void ClearRegisteredImages(); virtual void SetDoubleClickAction(CallBackAction, void *); @@ -1008,9 +990,6 @@ void ListBoxImpl::GetValue(int n, char *value, int len) { value[len-1] = '\0'; } -void ListBoxImpl::Sort() { -} - void ListBoxImpl::RegisterImage(int type, const char *xpm_data) { wxMemoryInputStream stream(xpm_data, strlen(xpm_data)+1); @@ -1254,7 +1233,7 @@ wxString stc2wx(const char* str, size_t len) strncpy(buffer, str, len); buffer[len]=0; - wxString cstr(buffer, wxConvUTF8); + wxString cstr(buffer, wxConvUTF8, len); delete[] buffer; return cstr;