diff options
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/PlatGTK.cxx | 4 | ||||
| -rw-r--r-- | gtk/ScintillaGTK.cxx | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx index 5276d75f2..d0c298685 100644 --- a/gtk/PlatGTK.cxx +++ b/gtk/PlatGTK.cxx @@ -867,8 +867,10 @@ void Platform::DebugPrintf(const char *, ...) { // Not supported for GTK+ static bool assertionPopUps = true; -void Platform::ShowAssertionPopUps(bool assertionPopUps_) { +bool Platform::ShowAssertionPopUps(bool assertionPopUps_) { + bool ret = assertionPopUps; assertionPopUps = assertionPopUps_; + return ret; } void Platform::Assert(const char *c, const char *file, int line) { diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx index 83ba91798..34d3e2289 100644 --- a/gtk/ScintillaGTK.cxx +++ b/gtk/ScintillaGTK.cxx @@ -473,10 +473,12 @@ void ScintillaGTK::SetTicking(bool on) { } void ScintillaGTK::SetMouseCapture(bool on) { - if (on) { - gtk_grab_add(GTK_WIDGET(wDraw.GetID())); - } else { - gtk_grab_remove(GTK_WIDGET(wDraw.GetID())); + if (mouseDownCaptures) { + if (on) { + gtk_grab_add(GTK_WIDGET(wDraw.GetID())); + } else { + gtk_grab_remove(GTK_WIDGET(wDraw.GetID())); + } } capturedMouse = on; } |