projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update compile support for OpenVMS
[wxWidgets.git]
/
src
/
mgl
/
window.cpp
diff --git
a/src/mgl/window.cpp
b/src/mgl/window.cpp
index 2c2fec1ed3e5dd4b6daf1bec5ebb7d92c4cd8a38..5ad62e94e3ffebdc4f11d690b4f520f0f66131f6 100644
(file)
--- a/
src/mgl/window.cpp
+++ b/
src/mgl/window.cpp
@@
-184,7
+184,7
@@
static ibool MGLAPI wxWindowMouseHandler(window_t *wnd, event_t *e)
{
case EVT_MOUSEDOWN:
// Change focus if the user clicks outside focused window:
{
case EVT_MOUSEDOWN:
// Change focus if the user clicks outside focused window:
- if ( win->
Accepts
Focus() && wxWindow::FindFocus() != win )
+ if ( win->
CanAccept
Focus() && wxWindow::FindFocus() != win )
win->SetFocus();
if ( e->message & EVT_DBLCLICK )
win->SetFocus();
if ( e->message & EVT_DBLCLICK )
@@
-235,12
+235,12
@@
static ibool MGLAPI wxWindowMouseHandler(window_t *wnd, event_t *e)
event2.SetEventObject(gs_windowUnderMouse);
event2.SetEventType(wxEVT_LEAVE_WINDOW);
event2.SetEventObject(gs_windowUnderMouse);
event2.SetEventType(wxEVT_LEAVE_WINDOW);
- gs_windowUnderMouse->
GetEventHandler()->Process
Event(event2);
+ gs_windowUnderMouse->
HandleWindow
Event(event2);
}
wxMouseEvent event3(event);
event3.SetEventType(wxEVT_ENTER_WINDOW);
}
wxMouseEvent event3(event);
event3.SetEventType(wxEVT_ENTER_WINDOW);
- win->
GetEventHandler()->Process
Event(event3);
+ win->
HandleWindow
Event(event3);
gs_windowUnderMouse = win;
}
gs_windowUnderMouse = win;
}
@@
-257,7
+257,7
@@
static ibool MGLAPI wxWindowMouseHandler(window_t *wnd, event_t *e)
wxMouseEvent evt(inside ?
wxEVT_ENTER_WINDOW : wxEVT_LEAVE_WINDOW);
evt.SetEventObject(win);
wxMouseEvent evt(inside ?
wxEVT_ENTER_WINDOW : wxEVT_LEAVE_WINDOW);
evt.SetEventObject(win);
- win->
GetEventHandler()->Process
Event(evt);
+ win->
HandleWindow
Event(evt);
gs_windowUnderMouse = inside ? win : NULL;
}
}
gs_windowUnderMouse = inside ? win : NULL;
}
}
@@
-276,7
+276,7
@@
static ibool MGLAPI wxWindowMouseHandler(window_t *wnd, event_t *e)
else
{
event.SetEventType(type);
else
{
event.SetEventType(type);
- return win->
GetEventHandler()->Process
Event(event);
+ return win->
HandleWindow
Event(event);
}
}
}
}
@@
-471,7
+471,7
@@
static ibool MGLAPI wxWindowKeybHandler(window_t *wnd, event_t *e)
if ( e->what == EVT_KEYUP )
{
event.SetEventType(wxEVT_KEY_UP);
if ( e->what == EVT_KEYUP )
{
event.SetEventType(wxEVT_KEY_UP);
- return win->
GetEventHandler()->Process
Event(event);
+ return win->
HandleWindow
Event(event);
}
else
{
}
else
{
@@
-481,7
+481,7
@@
static ibool MGLAPI wxWindowKeybHandler(window_t *wnd, event_t *e)
event.SetEventType(wxEVT_KEY_DOWN);
event2 = event;
event.SetEventType(wxEVT_KEY_DOWN);
event2 = event;
- ret = win->
GetEventHandler()->Process
Event(event);
+ ret = win->
HandleWindow
Event(event);
// wxMSW doesn't send char events with Alt pressed
// Only send wxEVT_CHAR event if not processed yet. Thus, ALT-x
// wxMSW doesn't send char events with Alt pressed
// Only send wxEVT_CHAR event if not processed yet. Thus, ALT-x
@@
-490,7
+490,7
@@
static ibool MGLAPI wxWindowKeybHandler(window_t *wnd, event_t *e)
if ( !ret && event2.m_keyCode != 0 )
{
event2.SetEventType(wxEVT_CHAR);
if ( !ret && event2.m_keyCode != 0 )
{
event2.SetEventType(wxEVT_CHAR);
- ret = win->
GetEventHandler()->Process
Event(event2);
+ ret = win->
HandleWindow
Event(event2);
}
// Synthetize navigation key event, but do it only if the TAB key
}
// Synthetize navigation key event, but do it only if the TAB key
@@
-505,7
+505,7
@@
static ibool MGLAPI wxWindowKeybHandler(window_t *wnd, event_t *e)
// Ctrl-TAB changes the (parent) window, i.e. switch notebook page:
navEvent.SetWindowChange(event.m_controlDown);
navEvent.SetCurrentFocus(wxStaticCast(win, wxWindow));
// 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()->Process
Event(navEvent);
+ ret = win->
HandleWindow
Event(navEvent);
}
// Finally, process special meaning keys that are usually
}
// Finally, process special meaning keys that are usually
@@
-550,7
+550,6
@@
void wxWindowMGL::Init()
// mgl specific:
m_wnd = NULL;
m_isShown = true;
// mgl specific:
m_wnd = NULL;
m_isShown = true;
- m_frozen = false;
m_paintMGLDC = NULL;
m_eraseBackground = -1;
}
m_paintMGLDC = NULL;
m_eraseBackground = -1;
}
@@
-695,19
+694,24
@@
void wxWindowMGL::SetFocus()
{
wxActivateEvent event(wxEVT_ACTIVATE, false, gs_activeFrame->GetId());
event.SetEventObject(gs_activeFrame);
{
wxActivateEvent event(wxEVT_ACTIVATE, false, gs_activeFrame->GetId());
event.SetEventObject(gs_activeFrame);
- gs_activeFrame->
GetEventHandler()->Process
Event(event);
+ gs_activeFrame->
HandleWindow
Event(event);
}
gs_activeFrame = active;
wxActivateEvent event(wxEVT_ACTIVATE, true, gs_activeFrame->GetId());
event.SetEventObject(gs_activeFrame);
}
gs_activeFrame = active;
wxActivateEvent event(wxEVT_ACTIVATE, true, gs_activeFrame->GetId());
event.SetEventObject(gs_activeFrame);
- gs_activeFrame->
GetEventHandler()->Process
Event(event);
+ gs_activeFrame->
HandleWindow
Event(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);
wxFocusEvent event(wxEVT_SET_FOCUS, GetId());
event.SetEventObject(this);
event.SetWindow((wxWindow*)oldFocusedWindow);
-
GetEventHandler()->Process
Event(event);
+
HandleWindow
Event(event);
#if wxUSE_CARET
// caret needs to be informed about focus change
#if wxUSE_CARET
// caret needs to be informed about focus change
@@
-736,7
+740,7
@@
void wxWindowMGL::KillFocus()
wxFocusEvent event(wxEVT_KILL_FOCUS, GetId());
event.SetEventObject(this);
event.SetWindow(gs_toBeFocusedWindow);
wxFocusEvent event(wxEVT_KILL_FOCUS, GetId());
event.SetEventObject(this);
event.SetWindow(gs_toBeFocusedWindow);
-
GetEventHandler()->Process
Event(event);
+
HandleWindow
Event(event);
}
// ----------------------------------------------------------------------------
}
// ----------------------------------------------------------------------------
@@
-1051,7
+1055,7
@@
void wxWindowMGL::DoSetSize(int x, int y, int width, int height, int sizeFlags)
wxSize newSize(width, height);
wxSizeEvent event(newSize, GetId());
event.SetEventObject(this);
wxSize newSize(width, height);
wxSizeEvent event(newSize, GetId());
event.SetEventObject(this);
-
GetEventHandler()->Process
Event(event);
+
HandleWindow
Event(event);
}
}
}
}
@@
-1094,14
+1098,6
@@
void wxWindowMGL::GetTextExtent(const wxString& string,
// painting
// ---------------------------------------------------------------------------
// 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::Refresh(bool eraseBack, const wxRect *rect)
{
if ( m_eraseBackground == -1 )
@@
-1122,26
+1118,24
@@
void wxWindowMGL::Refresh(bool eraseBack, const wxRect *rect)
void wxWindowMGL::Update()
{
void wxWindowMGL::Update()
{
- if ( !
m_frozen
)
+ if ( !
IsFrozen()
)
MGL_wmUpdateDC(g_winMng);
}
MGL_wmUpdateDC(g_winMng);
}
-void wxWindowMGL::Freeze()
+void wxWindowMGL::
Do
Freeze()
{
{
- m_frozen = true;
m_refreshAfterThaw = false;
}
m_refreshAfterThaw = false;
}
-void wxWindowMGL::Thaw()
+void wxWindowMGL::
Do
Thaw()
{
{
- m_frozen = false;
if ( m_refreshAfterThaw )
Refresh();
}
void wxWindowMGL::HandlePaint(MGLDevCtx *dc)
{
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;
{
// Don't paint anything if the window is frozen.
m_refreshAfterThaw = true;
@@
-1178,17
+1172,17
@@
void wxWindowMGL::HandlePaint(MGLDevCtx *dc)
wxWindowDC dc((wxWindow*)this);
wxEraseEvent eventEr(m_windowId, &dc);
eventEr.SetEventObject(this);
wxWindowDC dc((wxWindow*)this);
wxEraseEvent eventEr(m_windowId, &dc);
eventEr.SetEventObject(this);
-
GetEventHandler()->Process
Event(eventEr);
+
HandleWindow
Event(eventEr);
}
m_eraseBackground = -1;
wxNcPaintEvent eventNc(GetId());
eventNc.SetEventObject(this);
}
m_eraseBackground = -1;
wxNcPaintEvent eventNc(GetId());
eventNc.SetEventObject(this);
-
GetEventHandler()->Process
Event(eventNc);
+
HandleWindow
Event(eventNc);
wxPaintEvent eventPt(GetId());
eventPt.SetEventObject(this);
wxPaintEvent eventPt(GetId());
eventPt.SetEventObject(this);
-
GetEventHandler()->Process
Event(eventPt);
+
HandleWindow
Event(eventPt);
#if wxUSE_CARET
if ( caret )
#if wxUSE_CARET
if ( caret )
@@
-1220,6
+1214,6
@@
wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
void wxWindowMGL::OnInternalIdle()
{
void wxWindowMGL::OnInternalIdle()
{
- if (wxUpdateUIEvent::CanUpdate(this))
+ if (wxUpdateUIEvent::CanUpdate(this)
&& IsShown()
)
UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
}
UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
}