Applied #13763 from dghart, to use primary selections if available

[wxWidgets.git] / tests / graphics / measuring.cpp

diff --git a/tests/graphics/measuring.cpp b/tests/graphics/measuring.cpp
index b5e8419a49a80319c7b73c2c464442d76afaaebd..a0b9803a55a06f553e9e50325654b6206f7f0a03 100644 (file)
--- a/tests/graphics/measuring.cpp
+++ b/tests/graphics/measuring.cpp
@@ -1,10 +1,10 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        tests/controls/clientsize.cpp
-// Purpose:     Client vs. window size handling unit test
-// Author:      Vaclav Slavik
+// Name:        tests/graphics/measuring.cpp
+// Purpose:     Tests for wxGraphicsRenderer::CreateMeasuringContext
+// Author:      Kevin Ollivier

 // Created:     2008-02-12
 // Created:     2008-02-12

-// RCS-ID:      $Id: clientsize.cpp 53740 2008-05-25 02:56:22Z VZ $
-// Copyright:   (c) 2008 Vaclav Slavik <vslavik@fastmail.fm>
+// RCS-ID:      $Id$
+// Copyright:   (c) 2008 Kevin Ollivier <kevino@theolliviers.com>

 ///////////////////////////////////////////////////////////////////////////////
 
 // ----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
 // ----------------------------------------------------------------------------


@@ -13,7 +13,8 @@
 
 #include "testprec.h"
 
 
 #include "testprec.h"
 

-#if wxUSE_GRAPHICS_CONTEXT
+// wxCairoRenderer::CreateMeasuringContext() is not implement for wxX11
+#if wxUSE_GRAPHICS_CONTEXT && !defined(__WXX11__)

 
 #ifdef __BORLANDC__
     #pragma hdrstop
 
 #ifdef __BORLANDC__
     #pragma hdrstop


@@ -53,7 +54,7 @@ private:
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION( MeasuringContextTestCase );
 
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION( MeasuringContextTestCase );
 

-// also include in it's own registry so that these tests can be run alone
+// also include in its own registry so that these tests can be run alone

 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( MeasuringContextTestCase, "MeasuringContextTestCase" );
 
 // ----------------------------------------------------------------------------
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( MeasuringContextTestCase, "MeasuringContextTestCase" );
 
 // ----------------------------------------------------------------------------