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

Reverted last two changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34521 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-06-02 10:16:50 +00:00
parent 27d2f680a7
commit ed56a258b1
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gtk/window.cpp
View File

@@ -1165,7 +1165,6 @@ static gint gtk_window_key_press_callback( GtkWidget *widget,
wxKeyEvent event( wxEVT_KEY_DOWN ); wxKeyEvent event( wxEVT_KEY_DOWN );
bool ret = false; bool ret = false;
bool return_after_IM = false; bool return_after_IM = false;
win->m_imData->lastKeyEvent = gdk_event;
if( wxTranslateGTKKeyEventToWx(event, win, gdk_event) ) if( wxTranslateGTKKeyEventToWx(event, win, gdk_event) )
{ {
@@ -2931,11 +2930,6 @@ void wxWindowGTK::PostCreation()
{ {
wxASSERT_MSG( (m_widget != NULL), wxT("invalid window") ); wxASSERT_MSG( (m_widget != NULL), wxT("invalid window") );
#ifdef __WXGTK20__
// Create input method handler
m_imData = new wxGtkIMData;
#endif
if (m_wxwindow) if (m_wxwindow)
{ {
if (!m_noExpose) if (!m_noExpose)
@@ -2962,6 +2956,9 @@ void wxWindowGTK::PostCreation()
} }
#ifdef __WXGTK20__ #ifdef __WXGTK20__
// Create input method handler
m_imData = new wxGtkIMData;
// Cannot handle drawing preedited text yet // Cannot handle drawing preedited text yet
gtk_im_context_set_use_preedit( m_imData->context, FALSE ); gtk_im_context_set_use_preedit( m_imData->context, FALSE );

9
src/gtk1/window.cpp
View File

@@ -1165,7 +1165,6 @@ static gint gtk_window_key_press_callback( GtkWidget *widget,
wxKeyEvent event( wxEVT_KEY_DOWN ); wxKeyEvent event( wxEVT_KEY_DOWN );
bool ret = false; bool ret = false;
bool return_after_IM = false; bool return_after_IM = false;
win->m_imData->lastKeyEvent = gdk_event;
if( wxTranslateGTKKeyEventToWx(event, win, gdk_event) ) if( wxTranslateGTKKeyEventToWx(event, win, gdk_event) )
{ {
@@ -2931,11 +2930,6 @@ void wxWindowGTK::PostCreation()
{ {
wxASSERT_MSG( (m_widget != NULL), wxT("invalid window") ); wxASSERT_MSG( (m_widget != NULL), wxT("invalid window") );
#ifdef __WXGTK20__
// Create input method handler
m_imData = new wxGtkIMData;
#endif
if (m_wxwindow) if (m_wxwindow)
{ {
if (!m_noExpose) if (!m_noExpose)
@@ -2962,6 +2956,9 @@ void wxWindowGTK::PostCreation()
} }
#ifdef __WXGTK20__ #ifdef __WXGTK20__
// Create input method handler
m_imData = new wxGtkIMData;
// Cannot handle drawing preedited text yet // Cannot handle drawing preedited text yet
gtk_im_context_set_use_preedit( m_imData->context, FALSE ); gtk_im_context_set_use_preedit( m_imData->context, FALSE );