summaryrefslogtreecommitdiff
path: root/vcl/unx/gtk
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2007-04-26 09:39:17 +0000
committerRüdiger Timm <rt@openoffice.org>2007-04-26 09:39:17 +0000
commit1613d52d73dd163b0a2d488e8e52af8d7b9d4e76 (patch)
treec46e9dfa7f108786f7a92c56092fb99ddc1c877b /vcl/unx/gtk
parent5f883f47e6c251579e83b42eb37db19c3cda3ae0 (diff)
INTEGRATION: CWS vcl75 (1.31.20); FILE MERGED
2007/03/20 12:36:58 pl 1.31.20.2: RESYNC: (1.31-1.32); FILE MERGED 2007/02/21 19:52:43 pl 1.31.20.1: #i69116# #i69117# refresh keyboard name in gtk plugin
Diffstat (limited to 'vcl/unx/gtk')
-rw-r--r--vcl/unx/gtk/app/gtkdata.cxx12
1 files changed, 10 insertions, 2 deletions
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index cdc767d42910..c340dd1afc78 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: gtkdata.cxx,v $
*
- * $Revision: 1.32 $
+ * $Revision: 1.33 $
*
- * last change: $Author: kz $ $Date: 2007-02-12 14:51:58 $
+ * last change: $Author: rt $ $Date: 2007-04-26 10:39:17 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -133,6 +133,13 @@ GdkFilterReturn call_filterGdkEvent( GdkXEvent* sys_event,
{
return GtkSalDisplay::filterGdkEvent( sys_event, event, data );
}
+
+void signalKeysChanged( GdkKeymap*, gpointer data )
+{
+ GtkSalDisplay* pDisp = (GtkSalDisplay*)data;
+ pDisp->GetKeyboardName(TRUE);
+}
+
}
GdkFilterReturn GtkSalDisplay::filterGdkEvent( GdkXEvent* sys_event,
@@ -596,6 +603,7 @@ void GtkXLib::Init()
m_pGtkSalDisplay->SetKbdExtension( pKbdExtension );
+ g_signal_connect( G_OBJECT(gdk_keymap_get_default()), "keys_changed", G_CALLBACK(signalKeysChanged), m_pGtkSalDisplay );
}
extern "C"