[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 757
Date       : Sat Apr  1 17:04:46 BST 2006

Changed paths:
   M /Trunk/XaraLX/Makefile.am
   M /Trunk/XaraLX/wxXtra/Makefile.am
   M /Trunk/XaraLX/wxXtra/doublebuffer.cpp

Make minimum wxWidgets version 2.6.3
Remove extra include of GTK includes from wxXtra directory
Remove direct linking to GTK libraries (should just work from wx) - in the event of link errors, restore the library linkage in the root Makefile.am


Diff:
Index: Trunk/XaraLX/wxXtra/doublebuffer.cpp
===================================================================
--- Trunk/XaraLX/wxXtra/doublebuffer.cpp	(revision 756)
+++ Trunk/XaraLX/wxXtra/doublebuffer.cpp	(revision 757)
@@ -10,17 +10,31 @@
 
 #ifdef __WXGTK__
 
+#if wxCHECK_VERSION(2,6,3)
+void SetDoubleBuffer (wxWindow * pWindow, bool DoubleBuffer)
+{
+#ifdef __WXGTK20__
+    pWindow->SetDoubleBuffered( DoubleBuffer );
+#endif // __WXGTK20__
+}
+
+#else // version 2.6.3 
+
+// this probably won't work without a longer link line - if you get a link
+// error here that means you aren't using wxWidgets 2.6.3 release which
+// is now the minimum version - this code should not be active
 #include <wx/gtk/win_gtk.h> // For GTK_PIZZA etc.
 
 void SetDoubleBuffer (wxWindow * pWindow, bool DoubleBuffer)
 {
 #ifdef __WXGTK20__
     gtk_widget_set_double_buffered( pWindow->m_wxwindow, DoubleBuffer );
-#endif
+#endif // __WXGTK20__
     gtk_pizza_set_clear( GTK_PIZZA(pWindow->m_wxwindow), DoubleBuffer );
 }
+#endif // version 2.6.3
 
-#else
+#else // __WXGTK__
 void SetDoubleBuffer (wxWindow * pWindow, bool DoubleBuffer) {return;}
-#endif
+#endif // __WXGTK__
 
Index: Trunk/XaraLX/wxXtra/Makefile.am
===================================================================
--- Trunk/XaraLX/wxXtra/Makefile.am	(revision 756)
+++ Trunk/XaraLX/wxXtra/Makefile.am	(revision 757)
@@ -9,8 +9,12 @@
 libwxXtra_a_SOURCES = manager.cpp wxmousestate.cpp doublebuffer.cpp
 
 # make sure this does NOT have our include files in the path
-libwxXtra_a_CXXFLAGS = @GTK_CFLAGS@
+# Don't use GTK includes for now - y ou will need this with sub-2.6.3 but that's not supported
+# right now
+# libwxXtra_a_CXXFLAGS = @GTK_CFLAGS@
 
-#libwxXtra_a_LDFLAGS = @GTK_LIBS@
+# Don't load the GTK libraries into wxXtra any more - you will need this with sub-2.6.3 but
+# that's not supported right now
+# libwxXtra_a_LDFLAGS = @GTK_LIBS@
 
 
Index: Trunk/XaraLX/Makefile.am
===================================================================
--- Trunk/XaraLX/Makefile.am	(revision 756)
+++ Trunk/XaraLX/Makefile.am	(revision 757)
@@ -22,7 +22,7 @@
     XaraLX_SOURCES	= Kernel/libKernel.a wxOil/libwxOil.a tools/libTools.a wxXtra/libwxXtra.a
     XaraLX_LDSOURCE = -Wl,--start-group $(XaraLX_SOURCES) -Wl,--end-group
 endif
-XaraLX_LDFLAGS		= --debug -L$(srcdir)/$(CDRAW_LIB_DIR) $(WX_LIBS) $(LIBS) -lCDraw @GTK_LIBS@
+XaraLX_LDFLAGS		= --debug -L$(srcdir)/$(CDRAW_LIB_DIR) $(WX_LIBS) $(LIBS) -lCDraw
 XaraLX_LD			= $(CXX)
 
 if STATIC_ENABLE


Xara