wxSTC begins to work on wxMac...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15549 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/src/stc/PlatWX.cpp b/contrib/src/stc/PlatWX.cpp
index d23d0a981ba6252c015b41ff95ddfb25afe82f43..dad221dbd2d18ade1a929c99b68d4f1e5120d60c 100644 (file)
--- a/contrib/src/stc/PlatWX.cpp
+++ b/contrib/src/stc/PlatWX.cpp
@@ -284,9 +284,15 @@ bool SurfaceImpl::Initialised() {
 }
 
 void SurfaceImpl::Init() {
+#if 0
     Release();
     hdc = new wxMemoryDC();
     hdcOwned = true;
+#else
+    // 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);
 }
 
 void SurfaceImpl::Init(SurfaceID hdc_) {

diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index d23d0a981ba6252c015b41ff95ddfb25afe82f43..dad221dbd2d18ade1a929c99b68d4f1e5120d60c 100644 (file)
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -284,9 +284,15 @@ bool SurfaceImpl::Initialised() {
 }
 
 void SurfaceImpl::Init() {
+#if 0
     Release();
     hdc = new wxMemoryDC();
     hdcOwned = true;
+#else
+    // 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);
 }
 
 void SurfaceImpl::Init(SurfaceID hdc_) {