static void wxCaptureScreenshot(bool activeWindowOnly)
{
#ifdef __DOS__
- #define SCREENSHOT_FILENAME _T("sshot%03i.png")
+ #define SCREENSHOT_FILENAME wxT("sshot%03i.png")
#else
- #define SCREENSHOT_FILENAME _T("screenshot-%03i.png")
+ #define SCREENSHOT_FILENAME wxT("screenshot-%03i.png")
#endif
static int screenshot_num = 0;
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"),
+ wxMessageBox(wxString::Format(wxT("Screenshot captured: %s"),
screenshot.c_str()));
}
{
case EVT_MOUSEDOWN:
// Change focus if the user clicks outside focused window:
- if ( win->AcceptsFocus() && wxWindow::FindFocus() != win )
+ if ( win->CanAcceptFocus() && wxWindow::FindFocus() != win )
win->SetFocus();
if ( e->message & EVT_DBLCLICK )
event2.SetEventObject(gs_windowUnderMouse);
event2.SetEventType(wxEVT_LEAVE_WINDOW);
- gs_windowUnderMouse->GetEventHandler()->ProcessEvent(event2);
+ gs_windowUnderMouse->HandleWindowEvent(event2);
}
wxMouseEvent event3(event);
event3.SetEventType(wxEVT_ENTER_WINDOW);
- win->GetEventHandler()->ProcessEvent(event3);
+ win->HandleWindowEvent(event3);
gs_windowUnderMouse = win;
}
wxMouseEvent evt(inside ?
wxEVT_ENTER_WINDOW : wxEVT_LEAVE_WINDOW);
evt.SetEventObject(win);
- win->GetEventHandler()->ProcessEvent(evt);
+ win->HandleWindowEvent(evt);
gs_windowUnderMouse = inside ? win : NULL;
}
}
else
{
event.SetEventType(type);
- return win->GetEventHandler()->ProcessEvent(event);
+ return win->HandleWindowEvent(event);
}
}
#ifdef __WXDEBUG__
#define KEY(mgl_key,wx_key) \
case mgl_key: \
- wxLogTrace(_T("keyevents"), \
- _T("key " #mgl_key ", mapped to " #wx_key)); \
+ wxLogTrace(wxT("keyevents"), \
+ wxT("key " #mgl_key ", mapped to " #wx_key)); \
key = wx_key; \
break;
#else
event.SetEventObject(win);
event.SetTimestamp(e->when);
event.m_keyCode = wxScanToKeyCode(e, true);
- event.m_scanCode = 0; // not used by wx at all
event.m_x = where.x;
event.m_y = where.y;
event.m_shiftDown = ( e->modifiers & EVT_SHIFTKEY ) != 0;
if ( e->what == EVT_KEYUP )
{
event.SetEventType(wxEVT_KEY_UP);
- return win->GetEventHandler()->ProcessEvent(event);
+ return win->HandleWindowEvent(event);
}
else
{
event.SetEventType(wxEVT_KEY_DOWN);
event2 = event;
- ret = win->GetEventHandler()->ProcessEvent(event);
+ ret = win->HandleWindowEvent(event);
// wxMSW doesn't send char events with Alt pressed
// Only send wxEVT_CHAR event if not processed yet. Thus, ALT-x
if ( !ret && event2.m_keyCode != 0 )
{
event2.SetEventType(wxEVT_CHAR);
- ret = win->GetEventHandler()->ProcessEvent(event2);
+ ret = win->HandleWindowEvent(event2);
}
// Synthetize navigation key event, but do it only if the TAB key
// Ctrl-TAB changes the (parent) window, i.e. switch notebook page:
navEvent.SetWindowChange(event.m_controlDown);
navEvent.SetCurrentFocus(wxStaticCast(win, wxWindow));
- ret = win->GetParent()->GetEventHandler()->ProcessEvent(navEvent);
+ ret = win->HandleWindowEvent(navEvent);
}
// Finally, process special meaning keys that are usually
if ( !g_winMng )
{
if ( !wxTheApp->SetDisplayMode(wxGetDefaultDisplayMode()) )
+ {
wxLogFatalError(_("Cannot initialize display."));
+ }
}
// mgl specific:
m_wnd = NULL;
m_isShown = true;
- m_frozen = false;
m_paintMGLDC = NULL;
m_eraseBackground = -1;
}
{
SendDestroyEvent();
- m_isBeingDeleted = true;
-
if ( gs_mouseCapture == this )
ReleaseMouse();
MGL_wmPushWindowEventHandler(m_wnd, wxWindowMouseHandler, EVT_MOUSEEVT, 0);
MGL_wmPushWindowEventHandler(m_wnd, wxWindowKeybHandler, EVT_KEYEVT, 0);
- if ( m_cursor.Ok() )
+ if ( m_cursor.IsOk() )
MGL_wmSetWindowCursor(m_wnd, *m_cursor.GetMGLCursor());
else
MGL_wmSetWindowCursor(m_wnd, *wxSTANDARD_CURSOR->GetMGLCursor());
{
wxActivateEvent event(wxEVT_ACTIVATE, false, gs_activeFrame->GetId());
event.SetEventObject(gs_activeFrame);
- gs_activeFrame->GetEventHandler()->ProcessEvent(event);
+ gs_activeFrame->HandleWindowEvent(event);
}
gs_activeFrame = active;
wxActivateEvent event(wxEVT_ACTIVATE, true, gs_activeFrame->GetId());
event.SetEventObject(gs_activeFrame);
- gs_activeFrame->GetEventHandler()->ProcessEvent(event);
+ gs_activeFrame->HandleWindowEvent(event);
}
+ // notify the parent keeping track of focus for the kbd navigation
+ // purposes that we got it
+ wxChildFocusEvent eventFocus((wxWindow*)this);
+ HandleWindowEvent(eventFocus);
+
wxFocusEvent event(wxEVT_SET_FOCUS, GetId());
event.SetEventObject(this);
event.SetWindow((wxWindow*)oldFocusedWindow);
- GetEventHandler()->ProcessEvent(event);
+ HandleWindowEvent(event);
#if wxUSE_CARET
// caret needs to be informed about focus change
wxFocusEvent event(wxEVT_KILL_FOCUS, GetId());
event.SetEventObject(this);
event.SetWindow(gs_toBeFocusedWindow);
- GetEventHandler()->ProcessEvent(event);
+ HandleWindowEvent(event);
}
// ----------------------------------------------------------------------------
return false;
}
- if ( m_cursor.Ok() )
+ if ( m_cursor.IsOk() )
MGL_wmSetWindowCursor(m_wnd, *m_cursor.GetMGLCursor());
else
MGL_wmSetWindowCursor(m_wnd, *wxSTANDARD_CURSOR->GetMGLCursor());
wxSize newSize(width, height);
wxSizeEvent event(newSize, GetId());
event.SetEventObject(this);
- GetEventHandler()->ProcessEvent(event);
+ HandleWindowEvent(event);
}
}
return dc.GetCharWidth();
}
-void wxWindowMGL::GetTextExtent(const wxString& string,
- int *x, int *y,
- int *descent, int *externalLeading,
- const wxFont *theFont) const
+void wxWindowMGL::DoGetTextExtent(const wxString& string,
+ int *x, int *y,
+ int *descent,
+ int *externalLeading,
+ const wxFont *theFont) const
{
wxScreenDC dc;
if (!theFont)
// painting
// ---------------------------------------------------------------------------
-void wxWindowMGL::Clear()
-{
- wxClientDC dc((wxWindow *)this);
- wxBrush brush(GetBackgroundColour(), wxSOLID);
- dc.SetBackground(brush);
- dc.Clear();
-}
-
void wxWindowMGL::Refresh(bool eraseBack, const wxRect *rect)
{
if ( m_eraseBackground == -1 )
void wxWindowMGL::Update()
{
- if ( !m_frozen )
+ if ( !IsFrozen() )
MGL_wmUpdateDC(g_winMng);
}
-void wxWindowMGL::Freeze()
+void wxWindowMGL::DoFreeze()
{
- m_frozen = true;
m_refreshAfterThaw = false;
}
-void wxWindowMGL::Thaw()
+void wxWindowMGL::DoThaw()
{
- m_frozen = false;
if ( m_refreshAfterThaw )
Refresh();
}
void wxWindowMGL::HandlePaint(MGLDevCtx *dc)
{
- if ( m_frozen )
+ if ( IsFrozen() )
{
// Don't paint anything if the window is frozen.
m_refreshAfterThaw = true;
return;
}
-#ifdef __WXDEBUG__
+#if wxDEBUG_LEVEL >= 2
// FIXME_MGL -- debugging stuff, to be removed!
static int debugPaintEvents = -1;
if ( debugPaintEvents == -1 )
dc->fillRect(-1000,-1000,2000,2000);
wxMilliSleep(50);
}
-#endif
+#endif // wxDEBUG_LEVEL >= 2
MGLRegion clip;
dc->getClipRegion(clip);
wxWindowDC dc((wxWindow*)this);
wxEraseEvent eventEr(m_windowId, &dc);
eventEr.SetEventObject(this);
- GetEventHandler()->ProcessEvent(eventEr);
+ HandleWindowEvent(eventEr);
}
m_eraseBackground = -1;
wxNcPaintEvent eventNc(GetId());
eventNc.SetEventObject(this);
- GetEventHandler()->ProcessEvent(eventNc);
+ HandleWindowEvent(eventNc);
wxPaintEvent eventPt(GetId());
eventPt.SetEventObject(this);
- GetEventHandler()->ProcessEvent(eventPt);
+ HandleWindowEvent(eventPt);
#if wxUSE_CARET
if ( caret )
window_t *wnd = MGL_wmGetWindowAtPosition(g_winMng, pt.x, pt.y);
return (wxWindow*)wnd->userData;
}
-
-
-// ---------------------------------------------------------------------------
-// idle events processing
-// ---------------------------------------------------------------------------
-
-void wxWindowMGL::OnInternalIdle()
-{
- if (wxUpdateUIEvent::CanUpdate(this))
- UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
-}