Build fix in wxLog

  Moved wxFrame::Resize without success..

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1025 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/log.cpp b/src/common/log.cpp
index fb2b01148f97db78ee25275dbe14619e1d3247ba..6a4bf7bf0d07ecb9f2b8794a73f15a96f5a62487 100644 (file)
--- 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();
 
         {
           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");
               // 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);
             // 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;
         }
       #endif
       break;

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index edce82c9fc47de2835b36ab866286bf190c92645..bf243361d23dd43aad7a3525035480d5bd8c67f8 100644 (file)
--- 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 );
 */
         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 );
 }
     }
     return wxWindow::Show( show );
 }

diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp
index edce82c9fc47de2835b36ab866286bf190c92645..bf243361d23dd43aad7a3525035480d5bd8c67f8 100644 (file)
--- 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 );
 */
         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 );
 }
     }
     return wxWindow::Show( show );
 }