This commit was manufactured by cvs2svn to create tag 'WX_2_5_1'.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_5_1@25927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
wxWidgets · Feb 23, 2004 · 39fab28 · 39fab28
1 parent 4c7848f
commit 39fab28
Show file tree

Hide file tree

Showing 29 changed files with 8 additions and 7,781 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -17878,10 +17878,10 @@ MOTIF_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/src/x11
 	mkdir $(DISTDIR)/include/wx/x11
 	cp $(X11DIR)/pen.cpp $(X11DIR)/brush.cpp $(X11DIR)/utilsx.cpp \
-		$(X11DIR)/bitmap.cpp $(X11DIR)/region.cpp \
+		$(X11DIR)/glcanvas.cpp $(X11DIR)/bitmap.cpp $(X11DIR)/region.cpp \
 		$(DISTDIR)/src/x11
 	cp $(X11INC)/pen.h $(X11INC)/brush.h $(X11INC)/privx.h \
-		$(X11INC)/bitmap.h $(X11INC)/private.h $(X11INC)/region.h \
+		$(X11INC)/bitmap.h $(X11INC)/glcanvas.h $(X11INC)/private.h $(X11INC)/region.h \
 		$(DISTDIR)/include/wx/x11
 	mkdir $(DISTDIR)/contrib
 	cp -R $(WXDIR)/contrib $(DISTDIR)
@@ -18318,7 +18318,6 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/minimal/Makefile.in $(DISTDIR)/samples/minimal
 	cp $(SAMPDIR)/minimal/makefile.unx $(DISTDIR)/samples/minimal
 	cp $(SAMPDIR)/minimal/*.cpp $(DISTDIR)/samples/minimal
-	cp $(SAMPDIR)/minimal/*.xpm $(DISTDIR)/samples/minimal
 	cp $(SAMPDIR)/minimal/*.mms $(DISTDIR)/samples/minimal
 
 	mkdir $(DISTDIR)/samples/mobile

diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk
@@ -252,10 +252,10 @@ MOTIF_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/src/x11
 	mkdir $(DISTDIR)/include/wx/x11
 	cp $(X11DIR)/pen.cpp $(X11DIR)/brush.cpp $(X11DIR)/utilsx.cpp \
-		$(X11DIR)/bitmap.cpp $(X11DIR)/region.cpp \
+		$(X11DIR)/bitmap.cpp $(X11DIR)/glcanvas.cpp $(X11DIR)/region.cpp \
 		$(DISTDIR)/src/x11
 	cp $(X11INC)/pen.h $(X11INC)/brush.h $(X11INC)/privx.h \
-		$(X11INC)/bitmap.h $(X11INC)/private.h $(X11INC)/region.h \
+		$(X11INC)/bitmap.h $(X11INC)/glcanvas.h $(X11INC)/private.h $(X11INC)/region.h \
 		$(DISTDIR)/include/wx/x11
 	mkdir $(DISTDIR)/contrib
 	cp -R $(WXDIR)/contrib $(DISTDIR)
@@ -692,7 +692,6 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/minimal/Makefile.in $(DISTDIR)/samples/minimal
 	cp $(SAMPDIR)/minimal/makefile.unx $(DISTDIR)/samples/minimal
 	cp $(SAMPDIR)/minimal/*.cpp $(DISTDIR)/samples/minimal
-	cp $(SAMPDIR)/minimal/*.xpm $(DISTDIR)/samples/minimal
 	cp $(SAMPDIR)/minimal/*.mms $(DISTDIR)/samples/minimal
 
 	mkdir $(DISTDIR)/samples/mobile

diff --git a/contrib/build/animate/animate_animatedll.dsp b/contrib/build/animate/animate_animatedll.dsp
diff --git a/contrib/build/animate/animate_animatelib.dsp b/contrib/build/animate/animate_animatelib.dsp
diff --git a/contrib/build/fl/fl_fldll.dsp b/contrib/build/fl/fl_fldll.dsp
diff --git a/contrib/build/fl/fl_fllib.dsp b/contrib/build/fl/fl_fllib.dsp
diff --git a/contrib/build/net/netutils.dsp b/contrib/build/net/netutils.dsp
diff --git a/contrib/build/ogl/ogl_ogldll.dsp b/contrib/build/ogl/ogl_ogldll.dsp
diff --git a/contrib/build/ogl/ogl_ogllib.dsp b/contrib/build/ogl/ogl_ogllib.dsp
diff --git a/contrib/build/stc/stc_stcdll.dsp b/contrib/build/stc/stc_stcdll.dsp
diff --git a/contrib/build/stc/stc_stclib.dsp b/contrib/build/stc/stc_stclib.dsp
diff --git a/contrib/build/svg/svg_svgdll.dsp b/contrib/build/svg/svg_svgdll.dsp
diff --git a/contrib/build/svg/svg_svglib.dsp b/contrib/build/svg/svg_svglib.dsp
diff --git a/demos/dbbrowse/makefile.gtk b/demos/dbbrowse/makefile.gtk
diff --git a/samples/resource/makefile.wat b/samples/resource/makefile.wat
diff --git a/samples/treectrl/treetest.dsp b/samples/treectrl/treetest.dsp
diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
@@ -1537,7 +1537,8 @@ static gint gtk_window_button_press_callback( GtkWidget *widget,
 
     wxEventType event_type = wxEVT_NULL;
 
-#ifdef __WXGTK20__
+    // GdkDisplay is a GTK+ 2.1.0 thing
+#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2, 1, 0)
     if ( gdk_event->type == GDK_2BUTTON_PRESS &&
             gdk_event->button >= 1 && gdk_event->button <= 3 )
     {

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
@@ -1537,7 +1537,8 @@ static gint gtk_window_button_press_callback( GtkWidget *widget,
 
     wxEventType event_type = wxEVT_NULL;
 
-#ifdef __WXGTK20__
+    // GdkDisplay is a GTK+ 2.1.0 thing
+#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2, 1, 0)
     if ( gdk_event->type == GDK_2BUTTON_PRESS &&
             gdk_event->button >= 1 && gdk_event->button <= 3 )
     {