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

Fix alpha handling in CSS syntax in wxColour in non-"C" locale.

Browse Source 
Use locale-independent functions to parse and generate the floating point
alpha representation in CSS syntax for colours to make it work in locales
which don't use period as decimal separator.

Closes #13077.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-03-31 09:28:41 +00:00
parent a99a3029c8
commit f0e52da8dc
2 changed files with 80 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
tests/graphics/colour.cpp
View File

@@ -20,6 +20,23 @@
#include "wx/colour.h"
#include "asserthelper.h"
// ----------------------------------------------------------------------------
// helpers
// ----------------------------------------------------------------------------
// Check the colour components, with and without alpha.
//
// NB: These are macros and not functions to have correct line numbers in case
// of failure.
#define ASSERT_EQUAL_RGB(c, r, g, b) \
CPPUNIT_ASSERT_EQUAL( r, (int)c.Red() ); \
CPPUNIT_ASSERT_EQUAL( g, (int)c.Green() ); \
CPPUNIT_ASSERT_EQUAL( b, (int)c.Blue() )
#define ASSERT_EQUAL_RGBA(c, r, g, b, a) \
ASSERT_EQUAL_RGB(c, r, g, b); \
CPPUNIT_ASSERT_EQUAL( a, (int)c.Alpha() )
// ----------------------------------------------------------------------------
// test class
// ----------------------------------------------------------------------------
@@ -32,9 +49,11 @@ public:
private:
CPPUNIT_TEST_SUITE( ColourTestCase );
CPPUNIT_TEST( GetSetRGB );
CPPUNIT_TEST( FromString );
CPPUNIT_TEST_SUITE_END();
void GetSetRGB();
void FromString();
DECLARE_NO_COPY_CLASS(ColourTestCase)
};
@@ -78,3 +97,19 @@ void ColourTestCase::GetSetRGB()
#endif // __WXX11__
}
void ColourTestCase::FromString()
{
ASSERT_EQUAL_RGB( wxColour("rgb(11, 22, 33)"), 11, 22, 33 );
ASSERT_EQUAL_RGBA( wxColour("rgba(11, 22, 33, 0.5)"), 11, 22, 33, 128 );
ASSERT_EQUAL_RGBA( wxColour("rgba( 11, 22, 33, 0.5 )"), 11, 22, 33, 128 );
ASSERT_EQUAL_RGB( wxColour("#aabbcc"), 0xaa, 0xbb, 0xcc );
ASSERT_EQUAL_RGB( wxColour("red"), 0xff, 0, 0 );
wxColour col;
CPPUNIT_ASSERT( !wxFromString("rgb(1, 2)", &col) );
CPPUNIT_ASSERT( !wxFromString("rgba(1, 2, 3.456)", &col) );
CPPUNIT_ASSERT( !wxFromString("rgba(1, 2, 3.456, foo)", &col) );
}