diff options
| author | Jonathon Jongsma <jjongsma@gnome.org> | 2008-12-08 22:31:56 -0600 |
|---|---|---|
| committer | Jonathon Jongsma <jjongsma@gnome.org> | 2008-12-08 22:31:56 -0600 |
| commit | 3be1dc30c7ff2562eb19bcab278610d44e9ba13c (patch) | |
| tree | 9e221351333a4583cc222caa6aae315600d7e777 /tests | |
| parent | b1d01ff7dadf2418bb06b3bf58a3847616769e0e (diff) | |
UserFontFace redesign to use virtual functions
* cairomm/fontface.cc:
* cairomm/fontface.h: Change UserFontFace implementation to a vfunc-based
implementation rather than requiring people to supply callbacks at runtime as
sigc::slot objects. This was requested by Ian Britten on the mailing list and
was my original plan but ran into issues in my original implementation. This
isn't a fully-working implementation yet, but I think I can overcome the
issues now, so I'm moving forward on the redesign.
* tests/test-font-face.cc: disable UserFontFace tests for now
Conflicts:
ChangeLog
cairomm/fontface.cc
cairomm/fontface.h
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test-font-face.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/test-font-face.cc b/tests/test-font-face.cc index 0ebe91e..85ccccf 100644 --- a/tests/test-font-face.cc +++ b/tests/test-font-face.cc @@ -46,6 +46,7 @@ void test_toy_getters () BOOST_CHECK_EQUAL (Cairo::FONT_TYPE_TOY, toy->get_type()); } +#if 0 void test_user_font_create() { Cairo::RefPtr<Cairo::UserFontFace> font = Cairo::UserFontFace::create(); @@ -280,6 +281,7 @@ void test_user_font_replace_callback() BOOST_CHECK (init2_call_count > 0); BOOST_CHECK_EQUAL (init_call_count, 0); } +#endif // UserFont disabled #ifdef CAIRO_HAS_FT_FONT void test_ft_font_face() @@ -344,12 +346,14 @@ init_unit_test_suite(int argc, char* argv[]) test->add (BOOST_TEST_CASE (&test_create_toy)); test->add (BOOST_TEST_CASE (&test_toy_getters)); + /* test->add (BOOST_TEST_CASE (&test_user_font_create)); test->add (BOOST_TEST_CASE (&test_user_font_callbacks_ptr)); test->add (BOOST_TEST_CASE (&test_user_font_callbacks_ptr_text)); test->add (BOOST_TEST_CASE (&test_user_font_callbacks_mem)); test->add (BOOST_TEST_CASE (&test_user_font_callbacks_exception)); test->add (BOOST_TEST_CASE (&test_user_font_replace_callback)); + */ #ifdef CAIRO_HAS_FT_FONT test->add (BOOST_TEST_CASE (&test_ft_font_face)); #endif // CAIRO_HAS_FT_FONT |