Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use GtkIMContext variable, not GtkIMMulticontext, we don't use functions that take the latter as their argument

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-06-24 17:54:08 +00:00
parent 3ad32dc5ef
commit da21012040
5 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/defs.h
View File

@@ -2369,7 +2369,7 @@ typedef GtkWidget *WXWidget;
#ifdef __WXGTK20__ #ifdef __WXGTK20__
/* Input method thing */ /* Input method thing */
typedef struct _GtkIMMulticontext GtkIMMulticontext; typedef struct _GtkIMContext GtkIMContext;
#endif /* __WXGTK20__ */ #endif /* __WXGTK20__ */
#endif /* __WXGTK__ */ #endif /* __WXGTK__ */

2
include/wx/gtk/window.h
View File

@@ -193,7 +193,7 @@ public:
GtkWidget *m_focusWidget; GtkWidget *m_focusWidget;
#ifdef __WXGTK20__ #ifdef __WXGTK20__
GtkIMMulticontext *m_imContext; GtkIMContext *m_imContext;
#else #else
#if HAVE_XIM #if HAVE_XIM
// XIM support for wxWidgets // XIM support for wxWidgets

2
include/wx/gtk1/window.h
View File

@@ -193,7 +193,7 @@ public:
GtkWidget *m_focusWidget; GtkWidget *m_focusWidget;
#ifdef __WXGTK20__ #ifdef __WXGTK20__
GtkIMMulticontext *m_imContext; GtkIMContext *m_imContext;
#else #else
#if HAVE_XIM #if HAVE_XIM
// XIM support for wxWidgets // XIM support for wxWidgets

16
src/gtk/window.cpp
View File

@@ -1142,7 +1142,7 @@ static gint gtk_window_key_press_callback( GtkWidget *widget,
key_code = wxTranslateKeySymToWXKey(gdk_event->keyval, FALSE /* isChar */); key_code = wxTranslateKeySymToWXKey(gdk_event->keyval, FALSE /* isChar */);
if ( !key_code && win->m_imContext ) if ( !key_code && win->m_imContext )
{ {
gtk_im_context_filter_keypress ( (GtkIMContext*) win->m_imContext, gdk_event ); gtk_im_context_filter_keypress(win->m_imContext, gdk_event );
ret = TRUE; ret = TRUE;
} }
else else
@@ -2311,7 +2311,7 @@ gtk_window_realized_callback( GtkWidget *m_widget, wxWindow *win )
if (win->m_imContext) if (win->m_imContext)
{ {
GtkPizza *pizza = GTK_PIZZA( m_widget ); GtkPizza *pizza = GTK_PIZZA( m_widget );
gtk_im_context_set_client_window( (GtkIMContext*) win->m_imContext, pizza->bin_window ); gtk_im_context_set_client_window( win->m_imContext, pizza->bin_window );
} }
#endif #endif
@@ -2697,13 +2697,13 @@ bool wxWindowGTK::Create( wxWindow *parent,
#ifdef __WXGTK20__ #ifdef __WXGTK20__
// Create input method handler // Create input method handler
m_imContext = (GtkIMMulticontext*) gtk_im_multicontext_new (); m_imContext = gtk_im_multicontext_new();
// Cannot handle drawing preedited text yet // Cannot handle drawing preedited text yet
gtk_im_context_set_use_preedit( (GtkIMContext*) m_imContext, FALSE ); gtk_im_context_set_use_preedit( m_imContext, FALSE );
g_signal_connect (G_OBJECT (m_imContext), "commit", g_signal_connect (G_OBJECT (m_imContext), "commit",
G_CALLBACK (gtk_wxwindow_commit_cb), this); G_CALLBACK (gtk_wxwindow_commit_cb), this);
#endif #endif
gtk_widget_show( m_wxwindow ); gtk_widget_show( m_wxwindow );
@@ -2804,13 +2804,13 @@ void wxWindowGTK::PostCreation()
#ifdef __WXGTK20__ #ifdef __WXGTK20__
// Create input method handler // Create input method handler
m_imContext = (GtkIMMulticontext*) gtk_im_multicontext_new (); m_imContext = gtk_im_multicontext_new();
// Cannot handle drawing preedited text yet // Cannot handle drawing preedited text yet
gtk_im_context_set_use_preedit( (GtkIMContext*) m_imContext, FALSE ); gtk_im_context_set_use_preedit( m_imContext, FALSE );
g_signal_connect (G_OBJECT (m_imContext), "commit", g_signal_connect (G_OBJECT (m_imContext), "commit",
G_CALLBACK (gtk_wxwindow_commit_cb), this); G_CALLBACK (gtk_wxwindow_commit_cb), this);
#endif #endif
} }

16
src/gtk1/window.cpp
View File

@@ -1142,7 +1142,7 @@ static gint gtk_window_key_press_callback( GtkWidget *widget,
key_code = wxTranslateKeySymToWXKey(gdk_event->keyval, FALSE /* isChar */); key_code = wxTranslateKeySymToWXKey(gdk_event->keyval, FALSE /* isChar */);
if ( !key_code && win->m_imContext ) if ( !key_code && win->m_imContext )
{ {
gtk_im_context_filter_keypress ( (GtkIMContext*) win->m_imContext, gdk_event ); gtk_im_context_filter_keypress(win->m_imContext, gdk_event );
ret = TRUE; ret = TRUE;
} }
else else
@@ -2311,7 +2311,7 @@ gtk_window_realized_callback( GtkWidget *m_widget, wxWindow *win )
if (win->m_imContext) if (win->m_imContext)
{ {
GtkPizza *pizza = GTK_PIZZA( m_widget ); GtkPizza *pizza = GTK_PIZZA( m_widget );
gtk_im_context_set_client_window( (GtkIMContext*) win->m_imContext, pizza->bin_window ); gtk_im_context_set_client_window( win->m_imContext, pizza->bin_window );
} }
#endif #endif
@@ -2697,13 +2697,13 @@ bool wxWindowGTK::Create( wxWindow *parent,
#ifdef __WXGTK20__ #ifdef __WXGTK20__
// Create input method handler // Create input method handler
m_imContext = (GtkIMMulticontext*) gtk_im_multicontext_new (); m_imContext = gtk_im_multicontext_new();
// Cannot handle drawing preedited text yet // Cannot handle drawing preedited text yet
gtk_im_context_set_use_preedit( (GtkIMContext*) m_imContext, FALSE ); gtk_im_context_set_use_preedit( m_imContext, FALSE );
g_signal_connect (G_OBJECT (m_imContext), "commit", g_signal_connect (G_OBJECT (m_imContext), "commit",
G_CALLBACK (gtk_wxwindow_commit_cb), this); G_CALLBACK (gtk_wxwindow_commit_cb), this);
#endif #endif
gtk_widget_show( m_wxwindow ); gtk_widget_show( m_wxwindow );
@@ -2804,13 +2804,13 @@ void wxWindowGTK::PostCreation()
#ifdef __WXGTK20__ #ifdef __WXGTK20__
// Create input method handler // Create input method handler
m_imContext = (GtkIMMulticontext*) gtk_im_multicontext_new (); m_imContext = gtk_im_multicontext_new();
// Cannot handle drawing preedited text yet // Cannot handle drawing preedited text yet
gtk_im_context_set_use_preedit( (GtkIMContext*) m_imContext, FALSE ); gtk_im_context_set_use_preedit( m_imContext, FALSE );
g_signal_connect (G_OBJECT (m_imContext), "commit", g_signal_connect (G_OBJECT (m_imContext), "commit",
G_CALLBACK (gtk_wxwindow_commit_cb), this); G_CALLBACK (gtk_wxwindow_commit_cb), this);
#endif #endif
} }