Fixed apparent typo in wxGridCellAttr::MergeWith, hopefully fixing

[wxWidgets.git] / src / stc / ScintillaWX.cpp

diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index 10859100d6bd296dd46329734e0a115fa9e7520a..5a256340edffe8d62a9b5b6474e5bb6a445fee7c 100644 (file)
--- a/src/stc/ScintillaWX.cpp
+++ b/src/stc/ScintillaWX.cpp
@@ -63,6 +63,11 @@ void  wxSTCDropTarget::OnLeave() {
 #endif
 
 
 #endif
 
 

+#ifdef __WXGTK__
+#undef wxSTC_USE_POPUP
+#define wxSTC_USE_POPUP 0
+#endif
+

 #if wxUSE_POPUPWIN && wxSTC_USE_POPUP
 #include <wx/popupwin.h>
 #define wxSTCCallTipBase wxPopupWindow
 #if wxUSE_POPUPWIN && wxSTC_USE_POPUP
 #include <wx/popupwin.h>
 #define wxSTCCallTipBase wxPopupWindow


@@ -80,6 +85,10 @@ public:
             m_ct = ct;
         }
 
             m_ct = ct;
         }
 

+    ~wxSTCCallTip() {
+        if (HasCapture()) ReleaseMouse();
+    }
+

     void OnPaint(wxPaintEvent& evt) {
         wxPaintDC dc(this);
         Surface* surfaceWindow = Surface::Allocate();
     void OnPaint(wxPaintEvent& evt) {
         wxPaintDC dc(this);
         Surface* surfaceWindow = Surface::Allocate();


@@ -106,12 +115,10 @@ public:
 
     virtual bool Show( bool show = TRUE ) {
         bool retval = wxSTCCallTipBase::Show(show);
 
     virtual bool Show( bool show = TRUE ) {
         bool retval = wxSTCCallTipBase::Show(show);

-        if (show) {
+        if (show)

             CaptureMouse();
             CaptureMouse();

-        }
-        else {
+        else

             if (HasCapture()) ReleaseMouse();
             if (HasCapture()) ReleaseMouse();

-        }

         return retval;
     }
 
         return retval;
     }
 


@@ -319,11 +326,12 @@ void ScintillaWX::Copy() {
     if (currentPos != anchor) {
         SelectionText st;
         CopySelectionRange(&st);
     if (currentPos != anchor) {
         SelectionText st;
         CopySelectionRange(&st);

-        wxTheClipboard->Open();
-        wxTheClipboard->UsePrimarySelection();
-        wxString text = stc2wx(st.s, st.len);
-        wxTheClipboard->SetData(new wxTextDataObject(text));
-        wxTheClipboard->Close();
+        if (wxTheClipboard->Open()) {
+            wxTheClipboard->UsePrimarySelection();
+            wxString text = stc2wx(st.s, st.len);
+            wxTheClipboard->SetData(new wxTextDataObject(text));
+            wxTheClipboard->Close();
+        }

     }
 }
 
     }
 }
 


@@ -333,12 +341,13 @@ void ScintillaWX::Paste() {
     ClearSelection();
 
     wxTextDataObject data;
     ClearSelection();
 
     wxTextDataObject data;

-    bool gotData;
+    bool gotData = FALSE;

 
 

-    wxTheClipboard->Open();
-    wxTheClipboard->UsePrimarySelection();
-    gotData = wxTheClipboard->GetData(data);
-    wxTheClipboard->Close();
+    if (wxTheClipboard->Open()) {
+        wxTheClipboard->UsePrimarySelection();
+        gotData = wxTheClipboard->GetData(data);
+        wxTheClipboard->Close();
+    }

     if (gotData) {
         wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(data.GetText());
         int        len = strlen(buf);
     if (gotData) {
         wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(data.GetText());
         int        len = strlen(buf);


@@ -353,13 +362,18 @@ void ScintillaWX::Paste() {
 
 
 bool ScintillaWX::CanPaste() {
 
 
 bool ScintillaWX::CanPaste() {

-    bool canPaste;
+    bool canPaste = FALSE;
+    bool didOpen;

 
 

-    wxTheClipboard->Open();
-    wxTheClipboard->UsePrimarySelection();
-    canPaste = wxTheClipboard->IsSupported(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT);
-    wxTheClipboard->Close();
+    if ( (didOpen = !wxTheClipboard->IsOpened()) )
+        wxTheClipboard->Open();

 
 

+    if (wxTheClipboard->IsOpened()) {
+        wxTheClipboard->UsePrimarySelection();
+        canPaste = wxTheClipboard->IsSupported(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT);
+        if (didOpen)
+            wxTheClipboard->Close();
+    }

     return canPaste;
 }
 
     return canPaste;
 }