mention the key code changes

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

diff --git a/contrib/src/stc/PlatWX.cpp b/contrib/src/stc/PlatWX.cpp
index 712c3b818fdba7dfbfd5cfd311ed86e3f5e89abe..8edc3bf5e762385dc47ec701af4e0c0f7a7e51e2 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)
@@ -681,7 +685,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 +705,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