region calculation for windows with borders too small

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

diff --git a/src/mgl/window.cpp b/src/mgl/window.cpp
index 8044f63ced81bf0e32b82d29644e17718df6594f..562756b248f585c1afd6ded9a8f80e2ade192560 100644 (file)
--- a/src/mgl/window.cpp
+++ b/src/mgl/window.cpp
@@ -129,7 +129,8 @@ static void wxCaptureScreenshot(bool activeWindowOnly)
     g_displayDC->savePNGFromDC(screenshot.mb_str(), 
                                r.x, r. y, r.x+r.width, r.y+r.height);
     
-    wxMessageBox(_("Screenshot captured: ") + wxString(screenshot));
+    wxMessageBox(wxString::Format(_T("Screenshot captured: %s"),
+                                  screenshot.c_str()));
 }
 
 // ---------------------------------------------------------------------------
@@ -434,8 +435,8 @@ static bool wxHandleSpecialKeys(wxKeyEvent& event)
     #ifdef __WXDEBUG__ // FIXME_MGL - remove when KB_sysReq works in MGL!
          || (event.m_keyCode == WXK_F1 && 
             event.m_shiftDown && event.m_controlDown) 
-       )
     #endif
+       )
     {
         wxCaptureScreenshot(event.m_altDown/*only active wnd?*/);
         return TRUE;
@@ -543,7 +544,7 @@ void wxWindowMGL::Init()
     if ( !g_winMng )
     {
         if ( !wxTheApp->SetDisplayMode(wxGetDefaultDisplayMode()) )
-            wxFatalError(_("Cannot initialize display."));
+            wxLogFatalError(_("Cannot initialize display."));
     }
 
     // generic: