X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8e35ab96f64a0ad21470043492e0153980b95382..2bbc1b285523e4ff3d325b0bf36205e5c1aa844a:/src/gtk/window.cpp

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 01febc0b4a..9ad817a824 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -517,7 +517,7 @@ static int gtk_window_expose_callback( GtkWidget *widget,
     GtkPizza *pizza = GTK_PIZZA( widget );
     if (gdk_event->window != pizza->bin_window) return FALSE;
 
-#if 1
+#if 0
     if (win->GetName())
     {
         wxPrintf( wxT("OnExpose from ") );
@@ -1260,8 +1260,8 @@ static gint gtk_window_key_press_callback( GtkWidget *widget,
 
 #ifdef __WXGTK20__
 static void gtk_wxwindow_commit_cb (GtkIMContext *context,
-						   const gchar  *str,
-						   wxWindow     *window)
+                           const gchar  *str,
+                           wxWindow     *window)
 {
     bool ret = FALSE;
 
@@ -2883,9 +2883,9 @@ void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags
 
     int currentX, currentY;
     GetPosition(&currentX, &currentY);
-    if (x == -1)
+    if (x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
         x = currentX;
-    if (y == -1)
+    if (y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
         y = currentY;
     AdjustForParentClientOrigin(x, y, sizeFlags);