Preserve logging state during QT plugin initialization.

[wxWidgets.git] / src / gtk1 / window.cpp

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index ddf893813842cbaeff553b8239b218425cbe854a..345274e55d7dce1c482d79c094b96c1ba82d3713 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -1165,7 +1165,6 @@ static gint gtk_window_key_press_callback( GtkWidget *widget,
     wxKeyEvent event( wxEVT_KEY_DOWN );
     bool ret = false;
     bool return_after_IM = false;
-    win->m_imData->lastKeyEvent = gdk_event;
 
     if( wxTranslateGTKKeyEventToWx(event, win, gdk_event) )
     {
@@ -1705,6 +1704,7 @@ static gint gtk_window_button_press_callback( GtkWidget *widget,
     // GdkDisplay is a GTK+ 2.2.0 thing
 #if defined(__WXGTK20__) && GTK_CHECK_VERSION(2, 2, 0)
     if ( gdk_event->type == GDK_2BUTTON_PRESS &&
+            !gtk_check_version(2,2,0) &&
             gdk_event->button >= 1 && gdk_event->button <= 3 )
     {
         // Reset GDK internal timestamp variables in order to disable GDK
@@ -2931,11 +2931,6 @@ void wxWindowGTK::PostCreation()
 {
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid window") );
 
-#ifdef __WXGTK20__
-    // Create input method handler
-    m_imData = new wxGtkIMData;
-#endif
-
     if (m_wxwindow)
     {
         if (!m_noExpose)
@@ -2962,6 +2957,9 @@ void wxWindowGTK::PostCreation()
         }
 
 #ifdef __WXGTK20__
+        // Create input method handler
+        m_imData = new wxGtkIMData;
+
         // Cannot handle drawing preedited text yet
         gtk_im_context_set_use_preedit( m_imData->context, FALSE );