aboutsummaryrefslogtreecommitdiffhomepage
path: root/gtk/PlatGTK.cxx
diff options
context:
space:
mode:
authorUnknown <nyamatongwe@gmail.com>2010-08-18 13:06:08 +1000
committerUnknown <nyamatongwe@gmail.com>2010-08-18 13:06:08 +1000
commita61cb74d88eb0c6c20b2ac11dfd5ecd910e70032 (patch)
tree60741c5aa508f88e08db38ab661fa0642e36400f /gtk/PlatGTK.cxx
parentb08b6b7917a1924b190c530b7ab846c7755712a4 (diff)
downloadscintilla-mirror-a61cb74d88eb0c6c20b2ac11dfd5ecd910e70032.tar.gz
GTK+ version-sensitive definitions for widget query functions/macros
to avoid deprecation warnings on GTK+ 2.20.
Diffstat (limited to 'gtk/PlatGTK.cxx')
-rw-r--r--gtk/PlatGTK.cxx8
1 files changed, 7 insertions, 1 deletions
diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx
index 4751d4c7e..7b8d42b4a 100644
--- a/gtk/PlatGTK.cxx
+++ b/gtk/PlatGTK.cxx
@@ -33,6 +33,12 @@
#include "Converter.h"
+#if GTK_CHECK_VERSION(2,20,0)
+#define IS_WIDGET_FOCUSSED(w) (gtk_widget_has_focus(GTK_WIDGET(w)))
+#else
+#define IS_WIDGET_FOCUSSED(w) (GTK_WIDGET_HAS_FOCUS(w))
+#endif
+
#ifdef _MSC_VER
// Ignore unreferenced local functions in GTK+ headers
#pragma warning(disable: 4505)
@@ -1741,7 +1747,7 @@ void Window::Destroy() {
}
bool Window::HasFocus() {
- return GTK_WIDGET_HAS_FOCUS(wid);
+ return IS_WIDGET_FOCUSSED(wid);
}
PRectangle Window::GetPosition() {