[ 1216436 ] cleanup 'shadow variable' warnings from gcc in headers.

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

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index ddf893813842cbaeff553b8239b218425cbe854a..950f84f25afb1bb1cdf119d445ff12792e06bb15 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/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;
     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) )
     {
 
     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_noExpose)
     if (m_wxwindow)
     {
         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
         gtk_im_context_set_use_preedit( m_imData->context, FALSE );
 
         // Cannot handle drawing preedited text yet
         gtk_im_context_set_use_preedit( m_imData->context, FALSE );