diff --git a/src/common/log.cpp b/src/common/log.cpp
index fb2b01148f..6a4bf7bf0d 100644
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -500,18 +500,18 @@ void wxLogGui::DoLog(wxLogLevel level, const char *szString)
         {
           wxString strTime = TimeStamp();
 
-          #if (defined(__WIN32__) || defined(__WIN16__)) && !defined(__WXSTUBS__)
+          #ifdef __WXMSW__
               // don't prepend debug/trace here: it goes to the debug window
               // anyhow, but do put a timestamp
               OutputDebugString(strTime + szString + "\n\r");
-          #else   //!WIN32
+          #else  
             // send them to stderr
             fprintf(stderr, "%s %s: %s\n",
                     strTime.c_str(),
                     level == wxLOG_Trace ? _("Trace") : _("Debug"),
                     szString);
             fflush(stderr);
-          #endif  // WIN32
+          #endif
         }
       #endif
       break;
diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index edce82c9fc..bf243361d2 100644
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -191,6 +191,13 @@ bool wxFrame::Show( bool show )
         m_sizeSet = FALSE;
         GetEventHandler()->ProcessEvent( event );
 */
+
+        // here we give wxFrame a chance to do resize updates
+	// before appearing on screen. resize updates have to
+	// be handled in idle time because of GTK's super smart
+	// resize propagation algorithm.
+	
+        wxYield();
     }
     return wxWindow::Show( show );
 }
diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp
index edce82c9fc..bf243361d2 100644
--- a/src/gtk1/frame.cpp
+++ b/src/gtk1/frame.cpp
@@ -191,6 +191,13 @@ bool wxFrame::Show( bool show )
         m_sizeSet = FALSE;
         GetEventHandler()->ProcessEvent( event );
 */
+
+        // here we give wxFrame a chance to do resize updates
+	// before appearing on screen. resize updates have to
+	// be handled in idle time because of GTK's super smart
+	// resize propagation algorithm.
+	
+        wxYield();
     }
     return wxWindow::Show( show );
 }