generic: re-work X error push/pop and error message handling

1 files changed, 20 insertions, 15 deletions

diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index 5f39bd9c9053..52b7166c2899 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -99,7 +99,7 @@ GtkSalDisplay::GtkSalDisplay( GdkDisplay* pDisplay ) :
     gdk_window_add_filter( NULL, call_filterGdkEvent, this );
 
     if ( getenv( "SAL_IGNOREXERRORS" ) )
-        errorTrapPush(); // and leak the trap
+        GetGenericData()->ErrorTrapPush(); // and leak the trap
 }
 
 GtkSalDisplay::~GtkSalDisplay()
@@ -119,20 +119,6 @@ GtkSalDisplay::~GtkSalDisplay()
             gdk_cursor_unref( m_aCursors[ i ] );
 }
 
-void GtkSalDisplay::errorTrapPush()
-{
-    gdk_error_trap_push ();
-}
-
-void GtkSalDisplay::errorTrapPop()
-{
-#if !GTK_CHECK_VERSION(3,0,0)
-    gdk_error_trap_pop ();
-#else
-    gdk_error_trap_pop_ignored (); // faster
-#endif
-}
-
 extern "C" {
 
 void signalKeysChanged( GdkKeymap*, gpointer data )
@@ -773,6 +759,25 @@ void GtkData::Init()
     }
 }
 
+void GtkData::ErrorTrapPush()
+{
+    gdk_error_trap_push ();
+}
+
+bool GtkData::ErrorTrapPop( bool bIgnoreError )
+{
+#if GTK_CHECK_VERSION(3,0,0)
+    if( bIgnoreError )
+    {
+        gdk_error_trap_pop_ignored (); // faster
+        return false;
+    }
+#else
+    (void) bIgnoreError;
+#endif
+    return gdk_error_trap_pop () != 0;
+}
+
 GtkSalTimer::GtkSalTimer()
     : m_pTimeout( 0 )
 {