Increase wxStaticText height in wxMSW to align its text with wxTextCtrl.

[wxWidgets.git] / src / msw / basemsw.cpp

diff --git a/src/msw/basemsw.cpp b/src/msw/basemsw.cpp
index 4ba9b8b091703a86d6c85b0929e686dc32f26717..ba07b70914d1af42d6cfca1a2477d905a298c62f 100644 (file)
--- a/src/msw/basemsw.cpp
+++ b/src/msw/basemsw.cpp
@@ -6,7 +6,7 @@
 // Created:     22.06.2003
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// License:     wxWindows licence
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -25,6 +25,7 @@
 #endif
 
 #ifndef WX_PRECOMP
+    #include "wx/event.h"
 #endif //WX_PRECOMP
 
 #include "wx/apptrait.h"
@@ -35,6 +36,7 @@
 // wxBase.dll, and MSVC 5 will give linker errors
 #include "wx/recguard.h"
 
+#include "wx/crt.h"
 #include "wx/msw/private.h"
 
 // ============================================================================
@@ -50,21 +52,6 @@ WXDWORD wxAppTraits::DoSimpleWaitForThread(WXHANDLE hThread)
 // wxConsoleAppTraits implementation
 // ============================================================================
 
-void wxConsoleAppTraits::AlwaysYield()
-{
-    // we need to use special logic to deal with WM_PAINT: as this pseudo
-    // message is generated automatically as long as there are invalidated
-    // windows belonging to this thread, we'd never return if we waited here
-    // until we have no more of them left. OTOH, this message is always the
-    // last one in the queue, so we can safely return as soon as we detect it
-    MSG msg;
-    while ( ::PeekMessage(&msg, NULL, 0, 0, PM_REMOVE) )
-    {
-        if ( msg.message == WM_PAINT )
-            break;
-    }
-}
-
 void *wxConsoleAppTraits::BeforeChildWaitLoop()
 {
     // nothing to do here
@@ -106,3 +93,7 @@ WXDWORD wxConsoleAppTraits::WaitForThread(WXHANDLE hThread)
     return DoSimpleWaitForThread(hThread);
 }
 
+bool wxConsoleAppTraits::WriteToStderr(const wxString& text)
+{
+    return wxFprintf(stderr, "%s", text) != -1;
+}