From b3f4c57077a27574185a4f55655f84853d296608 Mon Sep 17 00:00:00 2001 From: Mart Raudsepp Date: Mon, 1 Aug 2005 15:39:46 +0000 Subject: [PATCH] Mostly cosmetical preprocessor check modifications to last commit git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35048 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/glcanvas.cpp | 4 +++- src/gtk1/glcanvas.cpp | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/gtk/glcanvas.cpp b/src/gtk/glcanvas.cpp index d81c4cbe57..8d568a8924 100644 --- a/src/gtk/glcanvas.cpp +++ b/src/gtk/glcanvas.cpp @@ -401,7 +401,7 @@ bool wxGLCanvas::Create( wxWindow *parent, GdkColormap *colormap; // MR: This needs a fix for lower gtk+ versions too. Might need to rethink logic (FIXME) -#if GTK_CHECK_VERSION(2,2,0) +#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2,2,0) if (!gtk_check_version(2,2,0)) { wxWindow::Create( parent, id, pos, size, style, name ); @@ -456,7 +456,9 @@ bool wxGLCanvas::Create( wxWindow *parent, gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate", GTK_SIGNAL_FUNC(gtk_glcanvas_size_callback), (gpointer)this ); +#ifdef __WXGTK20__ if (gtk_check_version(2,2,0) != NULL) +#endif { gtk_widget_pop_visual(); gtk_widget_pop_colormap(); diff --git a/src/gtk1/glcanvas.cpp b/src/gtk1/glcanvas.cpp index d81c4cbe57..8d568a8924 100644 --- a/src/gtk1/glcanvas.cpp +++ b/src/gtk1/glcanvas.cpp @@ -401,7 +401,7 @@ bool wxGLCanvas::Create( wxWindow *parent, GdkColormap *colormap; // MR: This needs a fix for lower gtk+ versions too. Might need to rethink logic (FIXME) -#if GTK_CHECK_VERSION(2,2,0) +#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2,2,0) if (!gtk_check_version(2,2,0)) { wxWindow::Create( parent, id, pos, size, style, name ); @@ -456,7 +456,9 @@ bool wxGLCanvas::Create( wxWindow *parent, gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate", GTK_SIGNAL_FUNC(gtk_glcanvas_size_callback), (gpointer)this ); +#ifdef __WXGTK20__ if (gtk_check_version(2,2,0) != NULL) +#endif { gtk_widget_pop_visual(); gtk_widget_pop_colormap(); -- 2.45.2