}
// An easy way to capture screenshots:
-static void wxCaptureScreenshot()
+static void wxCaptureScreenshot(bool activeWindowOnly)
{
#ifdef __DOS__
#define SCREENSHOT_FILENAME _T("sshot%03i.png")
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());
+ }
- wxMessageBox(_("Screenshot captured: ") + wxString(screenshot));
+ g_displayDC->savePNGFromDC(screenshot.mb_str(),
+ r.x, r. y, r.x+r.width, r.y+r.height);
+
+ wxMessageBox(wxString::Format(_T("Screenshot captured: %s"),
+ screenshot.c_str()));
}
// ---------------------------------------------------------------------------
if ( win->AcceptsFocus() && wxWindow::FindFocus() != win )
win->SetFocus();
- if ( e->message & EVT_LEFTBMASK )
- type = wxEVT_LEFT_DOWN;
- else if ( e->message & EVT_MIDDLEBMASK )
- type = wxEVT_MIDDLE_DOWN;
- else if ( e->message & EVT_RIGHTBMASK )
- type = wxEVT_RIGHT_DOWN;
-
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 emulate the second one.
- 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 )
else if ( e->message & EVT_RIGHTBMASK )
type = wxEVT_RIGHT_DCLICK;
}
+ else
+ {
+ if ( e->message & EVT_LEFTBMASK )
+ type = wxEVT_LEFT_DOWN;
+ else if ( e->message & EVT_MIDDLEBMASK )
+ type = wxEVT_MIDDLE_DOWN;
+ else if ( e->message & EVT_RIGHTBMASK )
+ type = wxEVT_RIGHT_DOWN;
+ }
break;
#ifdef __WXDEBUG__ // FIXME_MGL - remove when KB_sysReq works in MGL!
|| (event.m_keyCode == WXK_F1 &&
event.m_shiftDown && event.m_controlDown)
- )
#endif
+ )
{
- wxCaptureScreenshot();
- return TRUE;
- }
-
- if ( event.m_keyCode == WXK_F4 && event.m_altDown &&
- gs_activeFrame != NULL )
- {
- gs_activeFrame->Close();
+ wxCaptureScreenshot(event.m_altDown/*only active wnd?*/);
return TRUE;
}
-
+
return FALSE;
}
if ( !g_winMng )
{
if ( !wxTheApp->SetDisplayMode(wxGetDefaultDisplayMode()) )
- wxFatalError(_("Cannot initialize display."));
+ wxLogFatalError(_("Cannot initialize display."));
}
// generic:
if (gs_activeFrame == this)
{
- gs_activeFrame = NULL;
- // activate next frame in Z-order:
- if ( m_wnd->prev )
- {
- wxWindowMGL *win = (wxWindowMGL*)m_wnd->prev->userData;
- win->SetFocus();
+ gs_activeFrame = NULL;
+ // activate next frame in Z-order:
+ if ( m_wnd->prev )
+ {
+ wxWindowMGL *win = (wxWindowMGL*)m_wnd->prev->userData;
+ win->SetFocus();
+ }
+ else if ( m_wnd->next )
+ {
+ wxWindowMGL *win = (wxWindowMGL*)m_wnd->next->userData;
+ win->SetFocus();
}
}
if (!show && gs_activeFrame == this)
{
- // activate next frame in Z-order:
- if ( m_wnd->prev )
- {
- wxWindowMGL *win = (wxWindowMGL*)m_wnd->prev->userData;
- win->SetFocus();
+ // activate next frame in Z-order:
+ if ( m_wnd->prev )
+ {
+ wxWindowMGL *win = (wxWindowMGL*)m_wnd->prev->userData;
+ win->SetFocus();
+ }
+ else if ( m_wnd->next )
+ {
+ wxWindowMGL *win = (wxWindowMGL*)m_wnd->next->userData;
+ win->SetFocus();
+ }
+ else
+ {
+ gs_activeFrame = NULL;
}
}
void wxWindowMGL::DoReleaseMouse()
{
- wxASSERT_MSG( gs_mouseCapture == this, wxT("attempt to release mouse, but this window hasn't captured it") )
+ wxASSERT_MSG( gs_mouseCapture == this, wxT("attempt to release mouse, but this window hasn't captured it") );
MGL_wmUncaptureEvents(m_wnd, wxMGL_CAPTURE_MOUSE);
gs_mouseCapture = NULL;
void wxWindowMGL::WarpPointer(int x, int y)
{
+ int w, h;
+ wxDisplaySize(&w, &h);
+
ClientToScreen(&x, &y);
+ if ( x < 0 )
+ x = 0;
+ if ( y < 0 )
+ y = 0;
+ if ( x >= w )
+ x = w-1;
+ if ( y >= h )
+ y = h-1;
+
EVT_setMousePos(x, y);
}
// Get total size
void wxWindowMGL::DoGetSize(int *x, int *y) const
{
- wxASSERT_MSG( m_wnd, wxT("invalid window") )
+ wxASSERT_MSG( m_wnd, wxT("invalid window") );
if (x) *x = m_wnd->width;
if (y) *y = m_wnd->height;
void wxWindowMGL::DoGetPosition(int *x, int *y) const
{
- wxASSERT_MSG( m_wnd, wxT("invalid window") )
+ wxASSERT_MSG( m_wnd, wxT("invalid window") );
+
+ int pX = 0, pY = 0;
+ AdjustForParentClientOrigin(pX, pY, 0);
- if (x) *x = m_wnd->x;
- if (y) *y = m_wnd->y;
+ if (x) *x = m_wnd->x - pX;
+ if (y) *y = m_wnd->y - pY;
}
void wxWindowMGL::DoScreenToClient(int *x, int *y) const