[Libreoffice-commits] core.git: 2 commits - vcl/Library_vclplug_gtk3.mk vcl/unx

[Stephan Bergmann]

 vcl/Library_vclplug_gtk3.mk        |    6 +++++-
 vcl/unx/gtk/app/gtkdata.cxx        |    4 ++--
 vcl/unx/gtk/app/gtkinst.cxx        |    2 +-
 vcl/unx/gtk/window/gtksalframe.cxx |   22 +++++++++++-----------
 4 files changed, 19 insertions(+), 15 deletions(-)

New commits:
commit 019c342c9b69bb437e030d1ad495ebfba5566316
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Mar 28 10:02:08 2014 +0100

    Disable only -Wdeprecated-declarations in Gtk3 vclplugin
    
    Change-Id: I32558229af857ab705b872e9f1be2d84ca04204a

diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk
index 6b35be0..0be8e20 100644
--- a/vcl/Library_vclplug_gtk3.mk
+++ b/vcl/Library_vclplug_gtk3.mk
@@ -19,7 +19,11 @@
 
 $(eval $(call gb_Library_Library,vclplug_gtk3))
 
-$(eval $(call gb_Library_set_warnings_not_errors,vclplug_gtk3))
+# Silence deprecation warnings wholesale as long as vcl/unx/gtk3/*.cxx just
+# forward to vcl/unx/gtk/*.cxx:
+$(eval $(call gb_Library_add_cxxflags,vclplug_gtk3, \
+    -Wno-deprecated-declarations \
+))
 
 $(eval $(call gb_Library_set_include,vclplug_gtk3,\
     $$(INCLUDE) \
commit d3daec09cec3bfd1d055a47da57029bdc539a9ab
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Mar 28 09:55:22 2014 +0100

    Turn Gtk3 vclplugin #warnings into //FIXMEs
    
    ...to be able to remove the sledgehammer gb_Library_set_warnigns_not_errors.
    
    Change-Id: Ib2cde5bbeaa1fb4dba629c51c493b77523455ff9

diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index ce8211a..5787caf 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -171,7 +171,7 @@ GdkFilterReturn GtkSalDisplay::filterGdkEvent( GdkXEvent* sys_event,
     return aFilterReturn;
 #else
     (void) sys_event;
-#warning FIXME: implement filterGdkEvent ...
+    //FIXME: implement filterGdkEvent ...
     return GDK_FILTER_CONTINUE;
 #endif
 }
@@ -714,7 +714,7 @@ void GtkData::Init()
     gdk_error_trap_pop();
     GetGtkDisplay()->SetKbdExtension( pKbdExtension );
 #else
-#  warning unwind keyboard extension bits
+    //FIXME: unwind keyboard extension bits
 #endif
 
     // add signal handler to notify screen size changes
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index 24ff3c8..83e0d1f 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.cxx
@@ -218,7 +218,7 @@ SalObject* GtkInstance::CreateObject( SalFrame* pParent, SystemWindowData* pWind
         return X11SalObject::CreateObject( pParent, pWindowData, bShow );
 #else
     (void)pWindowData;
-#warning FIXME: Missing CreateObject functionality ...
+    //FIXME: Missing CreateObject functionality ...
 #endif
 
     return new GtkSalObject( static_cast<GtkSalFrame*>(pParent), bShow );
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index a8160ce..8d3a513 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -1199,7 +1199,7 @@ static void lcl_set_accept_focus( GtkWindow* pWindow, gboolean bAccept, bool bBe
     }
 #else
     (void)pWindow; (void)bAccept; (void)bBeforeRealize;
-#  warning FIXME: No set_accept_focus impl
+    //FIXME: No set_accept_focus impl
 #endif
 }
 
@@ -1234,7 +1234,7 @@ static void lcl_set_user_time( GtkWindow* i_pWindow, guint32 i_nTime )
     }
 #else
     (void)i_pWindow; (void)i_nTime;
-#  warning FIXME: no lcl_set_user_time impl.
+    //FIXME: no lcl_set_user_time impl.
 #endif
 };
 
@@ -1398,7 +1398,7 @@ GdkNativeWindow GtkSalFrame::findTopLevelSystemWindow( GdkNativeWindow aWindow )
     return aWindow;
 #else
     (void)aWindow;
-# warning FIXME: no findToplevelSystemWindow
+    //FIXME: no findToplevelSystemWindow
     return 0;
 #endif
 }
@@ -1453,7 +1453,7 @@ void GtkSalFrame::Init( SystemParentData* pSysData )
                          0, 0 );
     }
 #else
-#warning Handling embedded windows, is going to be fun ...
+    //FIXME: Handling embedded windows, is going to be fun ...
 #endif
 }
 
@@ -1480,7 +1480,7 @@ void GtkSalFrame::askForXEmbedFocus( sal_Int32 i_nTimeCode )
     GetGenericData()->ErrorTrapPop();
 #else
     (void)i_nTimeCode;
-#warning FIXME: no askForXEmbedFocus for gtk3 yet
+    //FIXME: no askForXEmbedFocus for gtk3 yet
 #endif
 }
 
@@ -2747,7 +2747,7 @@ void GtkSalFrame::grabPointer( bool bGrab, bool bOwnerEvents )
     }
 #else
     (void)bGrab; (void) bOwnerEvents;
-#warning FIXME: No GrabPointer implementation for gtk3 ...
+    //FIXME: No GrabPointer implementation for gtk3 ...
 #endif
 }
 
@@ -2801,9 +2801,9 @@ OUString GtkSalFrame::GetKeyName( sal_uInt16 nKeyCode )
 #if !GTK_CHECK_VERSION(3,0,0)
     return getDisplay()->GetKeyName( nKeyCode );
 #else
-  (void)nKeyCode;
-# warning FIXME - key names
-  return OUString();
+    (void)nKeyCode;
+    //FIXME: key names
+    return OUString();
 #endif
 }
 
@@ -3038,7 +3038,7 @@ bool GtkSalFrame::SetPluginParent( SystemParentData* pSysParent )
     return true;
 #else
     (void)pSysParent;
-#warning FIXME: no SetPluginParent impl. for gtk3
+    //FIXME: no SetPluginParent impl. for gtk3
     return false;
 #endif
 }
@@ -3635,7 +3635,7 @@ gboolean GtkSalFrame::signalMap( GtkWidget *pWidget, GdkEvent*, gpointer frame )
     }
 #else
     (void)pWidget; (void)bSetFocus;
-#  warning FIXME no set input focus ...
+    //FIXME: no set input focus ...
 #endif
 
     pThis->CallCallback( SALEVENT_RESIZE, NULL );