X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/451c5cc7b9e72f6231085056e91bcd53612e54bb..643a0828dac932568e143b16b63a1cac0cd7d588:/src/stc/PlatWX.cpp diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp index 712c3b818f..fbf1faf2a3 100644 --- a/src/stc/PlatWX.cpp +++ b/src/stc/PlatWX.cpp @@ -189,6 +189,9 @@ void Font::Create(const char *faceName, int characterSet, int size, bool bold, b false, stc2wx(faceName), encoding); +#ifdef __WXMAC__ + ((wxFont*)id)->SetNoAntiAliasing( true ) ; +#endif } @@ -289,7 +292,7 @@ void SurfaceImpl::Init() { hdc = new wxMemoryDC(); hdcOwned = true; #else - // On Mac and GTK(?) the DC is not really valid until it has a bitmap + // On Mac and GTK the DC is not really valid until it has a bitmap // selected into it. So instead of just creating the DC with no bitmap, // go ahead and give it one. InitPixMap(1,1,NULL); @@ -632,8 +635,12 @@ void Window::SetCursor(Cursor curs) { cursorId = wxCURSOR_ARROW; break; } - - GETWIN(id)->SetCursor(wxCursor(cursorId)); +#ifdef __WXMOTIF__ + wxCursor wc = wxStockCursor(cursorId) ; +#else + wxCursor wc = wxCursor(cursorId) ; +#endif + GETWIN(id)->SetCursor(wc); } @@ -646,7 +653,7 @@ void Window::SetTitle(const char *s) { // Helper classes for ListBox -#if defined(__WXMAC__) +#if 1 // defined(__WXMAC__) class wxSTCListBoxWin : public wxListBox { public: wxSTCListBoxWin(wxWindow* parent, wxWindowID id) @@ -681,7 +688,7 @@ class wxSTCListBox : public wxListBox { public: wxSTCListBox(wxWindow* parent, wxWindowID id) : wxListBox(parent, id, wxDefaultPosition, wxDefaultSize, - 0, NULL, wxLB_SINGLE | wxSIMPLE_BORDER) + 0, NULL, wxLB_SINGLE | wxSIMPLE_BORDER | wxWANTS_CHARS) {} void OnKeyDown(wxKeyEvent& event) { @@ -701,8 +708,8 @@ END_EVENT_TABLE() -// #undef wxSTC_USE_POPUP -// #define wxSTC_USE_POPUP 0 +#undef wxSTC_USE_POPUP +#define wxSTC_USE_POPUP 0 // wxPopupWindow just doesn't work well in this case... // A window to place the listbox upon. If wxPopupWindow is supported then // that will be used so the listbox can extend beyond the client area of the @@ -800,7 +807,7 @@ void ListBox::Clear() { } void ListBox::Append(char *s) { - GETLB(id)->Append(s); + GETLB(id)->Append(stc2wx(s)); } int ListBox::Length() { @@ -808,12 +815,17 @@ int ListBox::Length() { } void ListBox::Select(int n) { - GETLB(id)->SetSelection(n); + bool select = TRUE; + if (n == -1) { + n = 0; + select = FALSE; + } + GETLB(id)->SetSelection(n, select); #ifdef __WXGTK__ if (n > 4) n = n - 4; else - n = 1; + n = 0; GETLB(id)->SetFirstItem(n); #endif } @@ -902,6 +914,15 @@ long Platform::SendScintilla(WindowID w, return stc->SendMsg(msg, wParam, lParam); } +long Platform::SendScintillaPointer(WindowID w, + unsigned int msg, + unsigned long wParam, + void *lParam) { + + wxStyledTextCtrl* stc = (wxStyledTextCtrl*)w; + return stc->SendMsg(msg, wParam, (long)lParam); +} + // These are utility functions not really tied to a platform