Doc tweaks

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

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 969e4b655f125158df3a25397b118599825a6305..b4f55985b8139a96122d1c3d0f83eaedebc76e2f 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -1187,7 +1187,7 @@ static gint gtk_window_key_press_callback( GtkWidget *widget,
     }
 #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
@@ -3111,8 +3111,7 @@ void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags
         if (GTK_WIDGET_CAN_DEFAULT(m_widget))
         {
 #ifdef __WXGTK20__
-#if 0
-            GtkBorder *default_border;
+            GtkBorder *default_border = NULL;
             gtk_widget_style_get( m_widget, "default_border", &default_border, NULL );
             if (default_border)
             {
@@ -3121,17 +3120,6 @@ void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags
                 top_border += default_border->top;
                 bottom_border += default_border->bottom;
                 g_free( default_border );
-                
-            }
-#endif
-            GtkBorder *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;
-                bottom_border += default_outside_border->bottom;
-                g_free( default_outside_border );
             }
 #else
             left_border = 6;
@@ -4033,7 +4021,7 @@ void wxWindowGTK::GtkSendPaintEvents()
                             (char *)"base",
                             0, 0, -1, -1 );
 
-                upd ++;
+                ++upd;
             }
         }
     }