From 5ac8ce9e055c56bb0b939905fa682a324ec3d300 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Fri, 11 Mar 2005 20:47:45 +0000 Subject: [PATCH] GTK+ 2.0 compilation. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/settings.cpp | 28 +++++++++++++++++++++------- src/gtk1/settings.cpp | 28 +++++++++++++++++++++------- 2 files changed, 42 insertions(+), 14 deletions(-) diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp index 600f0310a9..bf2d3b2f20 100644 --- a/src/gtk/settings.cpp +++ b/src/gtk/settings.cpp @@ -371,6 +371,8 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index ) int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win ) { #ifdef __WXGTK20__ + bool success = false; + guchar *data = NULL; GdkWindow *window = NULL; if(win && GTK_WIDGET_REALIZED(win->GetHandle())) @@ -419,9 +421,12 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win ) Atom type; gint format; gulong nitems; - gulong bytes_after; - - if (XGetWindowProperty (GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(window)), + +#if GTK_CHECK_VERSION(2,2,0) + if (!gtk_check_version(2,2,0)) + { + gulong bytes_after; + success = (XGetWindowProperty (GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(window)), GDK_WINDOW_XWINDOW(window), gdk_x11_get_xatom_by_name_for_display ( gdk_drawable_get_display(window), @@ -431,7 +436,10 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win ) false, // do not delete property XA_CARDINAL, // 32 bit &type, &format, &nitems, &bytes_after, &data - ) == Success) + ) == Success); + } +#endif + if (success) { int border_return = -1; @@ -573,9 +581,12 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win ) Atom type; gint format; gulong nitems; - gulong bytes_after; - if (XGetWindowProperty (GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(window)), +#if GTK_CHECK_VERSION(2,2,0) + if (!gtk_check_version(2,2,0)) + { + gulong bytes_after; + success = (XGetWindowProperty (GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(window)), GDK_WINDOW_XWINDOW(window), gdk_x11_get_xatom_by_name_for_display ( gdk_drawable_get_display(window), @@ -585,7 +596,10 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win ) false, // do not delete property XA_CARDINAL, // 32 bit &type, &format, &nitems, &bytes_after, &data - ) == Success) + ) == Success); + } +#endif + if (success) { int caption_height = -1; diff --git a/src/gtk1/settings.cpp b/src/gtk1/settings.cpp index 600f0310a9..bf2d3b2f20 100644 --- a/src/gtk1/settings.cpp +++ b/src/gtk1/settings.cpp @@ -371,6 +371,8 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index ) int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win ) { #ifdef __WXGTK20__ + bool success = false; + guchar *data = NULL; GdkWindow *window = NULL; if(win && GTK_WIDGET_REALIZED(win->GetHandle())) @@ -419,9 +421,12 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win ) Atom type; gint format; gulong nitems; - gulong bytes_after; - - if (XGetWindowProperty (GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(window)), + +#if GTK_CHECK_VERSION(2,2,0) + if (!gtk_check_version(2,2,0)) + { + gulong bytes_after; + success = (XGetWindowProperty (GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(window)), GDK_WINDOW_XWINDOW(window), gdk_x11_get_xatom_by_name_for_display ( gdk_drawable_get_display(window), @@ -431,7 +436,10 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win ) false, // do not delete property XA_CARDINAL, // 32 bit &type, &format, &nitems, &bytes_after, &data - ) == Success) + ) == Success); + } +#endif + if (success) { int border_return = -1; @@ -573,9 +581,12 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win ) Atom type; gint format; gulong nitems; - gulong bytes_after; - if (XGetWindowProperty (GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(window)), +#if GTK_CHECK_VERSION(2,2,0) + if (!gtk_check_version(2,2,0)) + { + gulong bytes_after; + success = (XGetWindowProperty (GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(window)), GDK_WINDOW_XWINDOW(window), gdk_x11_get_xatom_by_name_for_display ( gdk_drawable_get_display(window), @@ -585,7 +596,10 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win ) false, // do not delete property XA_CARDINAL, // 32 bit &type, &format, &nitems, &bytes_after, &data - ) == Success) + ) == Success); + } +#endif + if (success) { int caption_height = -1; -- 2.45.2