Always send an erase event to satisfy some users...

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

diff --git a/src/mgl/window.cpp b/src/mgl/window.cpp
index dd5bfd6c403f21446d829399734e6c840df5507b..d2f4633140c39c3fde9e483ca4bd181fc9581086 100644 (file)
--- a/src/mgl/window.cpp
+++ b/src/mgl/window.cpp
@@ -104,7 +104,7 @@ static wxWindowMGL* wxGetTopLevelParent(wxWindowMGL *win)
 }
 
 // An easy way to capture screenshots:
-static void wxCaptureScreenshot()
+static void wxCaptureScreenshot(bool activeWindowOnly)
 {
 #ifdef __DOS__
     #define SCREENSHOT_FILENAME _T("sshot%03i.png")
@@ -119,9 +119,15 @@ static void wxCaptureScreenshot()
         screenshot.Printf(SCREENSHOT_FILENAME, screenshot_num++);
     } while ( wxFileExists(screenshot) && screenshot_num < 1000 );
     
-    g_displayDC->savePNGFromDC(screenshot.mb_str(), 0, 0, 
-                               g_displayDC->sizex(), 
-                               g_displayDC->sizey());
+    wxRect r(0, 0, g_displayDC->sizex(), g_displayDC->sizey());
+
+    if ( activeWindowOnly && gs_activeFrame )
+    {
+        r.Intersect(gs_activeFrame->GetRect());
+    }
+    
+    g_displayDC->savePNGFromDC(screenshot.mb_str(), 
+                               r.x, r. y, r.x+r.width, r.y+r.height);
     
     wxMessageBox(_("Screenshot captured: ") + wxString(screenshot));
 }
@@ -171,22 +177,50 @@ static ibool MGLAPI wxWindowMouseHandler(window_t *wnd, event_t *e)
     event.m_leftDown = e->modifiers & EVT_LEFTBUT;
     event.m_middleDown = e->modifiers & EVT_MIDDLEBUT;
     event.m_rightDown = e->modifiers & EVT_RIGHTBUT;
-    
+   
     switch (e->what)
     {
         case EVT_MOUSEDOWN:
+            // Change focus if the user clicks outside focused window:
+            if ( win->AcceptsFocus() && wxWindow::FindFocus() != win )
+                win->SetFocus();
+
             if ( e->message & EVT_LEFTBMASK )
-                type = (e->message & EVT_DBLCLICK) ?
-                        wxEVT_LEFT_DCLICK : wxEVT_LEFT_DOWN;
+                type = wxEVT_LEFT_DOWN;
             else if ( e->message & EVT_MIDDLEBMASK )
-                type = (e->message & EVT_DBLCLICK) ?
-                        wxEVT_MIDDLE_DCLICK : wxEVT_MIDDLE_DOWN;
+                type = wxEVT_MIDDLE_DOWN;
             else if ( e->message & EVT_RIGHTBMASK )
-                type = (e->message & EVT_DBLCLICK) ? 
-                        wxEVT_RIGHT_DCLICK : wxEVT_RIGHT_DOWN;
+                type = wxEVT_RIGHT_DOWN;
 
-            if ( win->AcceptsFocus() && wxWindow::FindFocus() != win )
-                win->SetFocus();
+            if ( e->message & EVT_DBLCLICK )
+            {
+                // MGL doesn't generate two subsequent single clicks prior
+                // to a double click, but rather only fires one single click
+                // followed by one double click. wxWindows expects two single
+                // clicks, so we have to synthetize the second one. First
+                // generate wxEVT_?_DOWN:
+                event.SetEventType(type);
+                win->GetEventHandler()->ProcessEvent(event);
+
+                // ...followed by wxEVT_?_UP:
+                if ( e->message & EVT_LEFTBMASK )
+                    type = wxEVT_LEFT_UP;
+                else if ( e->message & EVT_MIDDLEBMASK )
+                    type = wxEVT_MIDDLE_UP;
+                else if ( e->message & EVT_RIGHTBMASK )
+                    type = wxEVT_RIGHT_UP;
+                event.SetEventType(type);
+                win->GetEventHandler()->ProcessEvent(event);
+            
+                // And change event type for the real double click event
+                // that will be generated later in this function:
+                if ( e->message & EVT_LEFTBMASK )
+                    type = wxEVT_LEFT_DCLICK;
+                else if ( e->message & EVT_MIDDLEBMASK )
+                    type = wxEVT_MIDDLE_DCLICK;
+                else if ( e->message & EVT_RIGHTBMASK )
+                    type = wxEVT_RIGHT_DCLICK;
+            }
 
             break;
 
@@ -421,7 +455,7 @@ static bool wxHandleSpecialKeys(wxKeyEvent& event)
        )
     #endif
     {
-        wxCaptureScreenshot();
+        wxCaptureScreenshot(event.m_altDown/*only active wnd?*/);
         return TRUE;
     }