Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mostly cosmetical preprocessor check modifications to last commit

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35048 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mart Raudsepp
2005-08-01 15:39:46 +00:00
parent fee7a683ed
commit b3f4c57077
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gtk/glcanvas.cpp
View File

@@ -401,7 +401,7 @@ bool wxGLCanvas::Create( wxWindow *parent,
GdkColormap *colormap; GdkColormap *colormap;
// MR: This needs a fix for lower gtk+ versions too. Might need to rethink logic (FIXME) // 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)) if (!gtk_check_version(2,2,0))
{ {
wxWindow::Create( parent, id, pos, size, style, name ); 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_connect( GTK_OBJECT(m_widget), "size_allocate",
GTK_SIGNAL_FUNC(gtk_glcanvas_size_callback), (gpointer)this ); GTK_SIGNAL_FUNC(gtk_glcanvas_size_callback), (gpointer)this );
#ifdef __WXGTK20__
if (gtk_check_version(2,2,0) != NULL) if (gtk_check_version(2,2,0) != NULL)
#endif
{ {
gtk_widget_pop_visual(); gtk_widget_pop_visual();
gtk_widget_pop_colormap(); gtk_widget_pop_colormap();

4
src/gtk1/glcanvas.cpp
View File

@@ -401,7 +401,7 @@ bool wxGLCanvas::Create( wxWindow *parent,
GdkColormap *colormap; GdkColormap *colormap;
// MR: This needs a fix for lower gtk+ versions too. Might need to rethink logic (FIXME) // 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)) if (!gtk_check_version(2,2,0))
{ {
wxWindow::Create( parent, id, pos, size, style, name ); 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_connect( GTK_OBJECT(m_widget), "size_allocate",
GTK_SIGNAL_FUNC(gtk_glcanvas_size_callback), (gpointer)this ); GTK_SIGNAL_FUNC(gtk_glcanvas_size_callback), (gpointer)this );
#ifdef __WXGTK20__
if (gtk_check_version(2,2,0) != NULL) if (gtk_check_version(2,2,0) != NULL)
#endif
{ {
gtk_widget_pop_visual(); gtk_widget_pop_visual();
gtk_widget_pop_colormap(); gtk_widget_pop_colormap();