Fix compilation of generic message dialog.

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

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 969e4b655f125158df3a25397b118599825a6305..7c6b7be2e7f41d9ffc9c22ee00b42f4cde18725e 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -1187,7 +1187,7 @@ static gint gtk_window_key_press_callback( GtkWidget *widget,
     }
 #endif
     if (return_after_IM)
     }
 #endif
     if (return_after_IM)

-        return true;
+        return false;

 
 #ifndef __WXGTK20__     
     // This is for GTK+ 1.2 only. The char event generatation for GTK+ 2.0 is done
 
 #ifndef __WXGTK20__     
     // This is for GTK+ 1.2 only. The char event generatation for GTK+ 2.0 is done


@@ -3111,22 +3111,10 @@ void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags
         if (GTK_WIDGET_CAN_DEFAULT(m_widget))
         {
 #ifdef __WXGTK20__
         if (GTK_WIDGET_CAN_DEFAULT(m_widget))
         {
 #ifdef __WXGTK20__

-#if 0
-            GtkBorder *default_border;
-            gtk_widget_style_get( m_widget, "default_border", &default_border, NULL );
-            if (default_border)
-            {
-                left_border += default_border->left;
-                right_border += default_border->right;
-                top_border += default_border->top;
-                bottom_border += default_border->bottom;
-                g_free( default_border );
-                
-            }
-#endif
-            GtkBorder *default_outside_border;
+            GtkBorder *default_outside_border = NULL;
+            gtk_widget_style_get( m_widget, "default_outside_border", &default_outside_border, NULL );
+            if (default_outside_border)

             {
             {

-                gtk_widget_style_get( m_widget, "default_outside_border", &default_outside_border, NULL );

                 left_border += default_outside_border->left;
                 right_border += default_outside_border->right;
                 top_border += default_outside_border->top;
                 left_border += default_outside_border->left;
                 right_border += default_outside_border->right;
                 top_border += default_outside_border->top;