A refinement of my patch from Neil Hodgson

[wxWidgets.git] / contrib / src / stc / PlatWX.cpp

diff --git a/contrib/src/stc/PlatWX.cpp b/contrib/src/stc/PlatWX.cpp
index 9f948cfb7808bd734e7b17dfd2c0c10c53c047f8..8abff4b97dbfccbb0d3c20cbb4ac135c8cd99127 100644 (file)
--- a/contrib/src/stc/PlatWX.cpp
+++ b/contrib/src/stc/PlatWX.cpp
@@ -289,7 +289,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 +632,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 +650,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)
@@ -902,6 +906,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