summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2014-04-09 22:52:00 +0200
committerJulien Nabet <serval2412@yahoo.fr>2014-04-09 22:53:00 +0200
commit2e1177a1b602623d5f2703bdee558f83318928ac (patch)
tree42c1932bdd0945f1ca27c37a92533a0f813dd9b2
parent4cb706ba6fc3a665d66e514e76e690835394922d (diff)
-Werror=deprecated-declarations (on Debian, reportedly) (part2)
Change-Id: Ifd6a9897e3ebf978968efed79a478fa72cebe51a
-rw-r--r--vcl/unx/gtk/a11y/atktext.cxx4
-rw-r--r--vcl/unx/gtk/a11y/atkwindow.cxx4
-rw-r--r--vcl/unx/gtk/a11y/atkwrapper.cxx4
3 files changed, 12 insertions, 0 deletions
diff --git a/vcl/unx/gtk/a11y/atktext.cxx b/vcl/unx/gtk/a11y/atktext.cxx
index b3ee4f21c6f8..c3003e038018 100644
--- a/vcl/unx/gtk/a11y/atktext.cxx
+++ b/vcl/unx/gtk/a11y/atktext.cxx
@@ -657,7 +657,9 @@ text_wrapper_get_character_extents( AtkText *text,
if( coords == ATK_XY_SCREEN )
{
g_return_if_fail( ATK_IS_COMPONENT( text ) );
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
atk_component_get_position( ATK_COMPONENT( text ), &origin_x, &origin_y, coords);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
}
*x = aRect.X + origin_x;
@@ -713,7 +715,9 @@ text_wrapper_get_offset_at_point (AtkText *text,
if( coords == ATK_XY_SCREEN )
{
g_return_val_if_fail( ATK_IS_COMPONENT( text ), -1 );
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
atk_component_get_position( ATK_COMPONENT( text ), &origin_x, &origin_y, coords);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
}
return pText->getIndexAtPoint( awt::Point(x - origin_x, y - origin_y) );
diff --git a/vcl/unx/gtk/a11y/atkwindow.cxx b/vcl/unx/gtk/a11y/atkwindow.cxx
index 92b89509ffb6..093fdef66ad8 100644
--- a/vcl/unx/gtk/a11y/atkwindow.cxx
+++ b/vcl/unx/gtk/a11y/atkwindow.cxx
@@ -44,7 +44,11 @@ init_from_window( AtkObject *accessible, Window *pWindow )
// Special role for sub-menu and combo-box popups that are exposed directly
// by their parents already.
if( aDefaultRole == ATK_ROLE_INVALID )
+ {
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
aDefaultRole = atk_role_register( "redundant object" );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
+ }
AtkRole role = aDefaultRole;
diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx
index a4125fa53e9f..a688c354670f 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.cxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.cxx
@@ -176,7 +176,11 @@ static inline AtkRole registerRole( const gchar * name )
{
AtkRole ret = atk_role_for_name( name );
if( ATK_ROLE_INVALID == ret )
+ {
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
ret = atk_role_register( name );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
+ }
return ret;
}