#pragma hdrstop
#endif
+#include "wx/window.h"
+
#ifndef WX_PRECOMP
- #include "wx/window.h"
#include "wx/msgdlg.h"
#include "wx/accel.h"
- #include "wx/setup.h"
#include "wx/dc.h"
#include "wx/dcclient.h"
#include "wx/utils.h"
#include "wx/app.h"
#include "wx/panel.h"
+ #include "wx/intl.h"
+ #include "wx/log.h"
+ #include "wx/dcscreen.h"
+ #include "wx/menu.h"
#endif
#if wxUSE_DRAG_AND_DROP
#include "wx/dnd.h"
#endif
-#include "wx/log.h"
#include "wx/sysopt.h"
#include "wx/mgl/private.h"
-#include "wx/intl.h"
-#include "wx/dcscreen.h"
#include "wx/caret.h"
#include <mgraph.hpp>
// the frame that is currently active (i.e. its child has focus). It is
// used to generate wxActivateEvents
static wxWindowMGL *gs_activeFrame = NULL;
+// track the mouse button state for wxGetMouseState()
+unsigned long g_buttonState = 0;
// ---------------------------------------------------------------------------
// constants
wxPoint orig(win->GetClientAreaOrigin());
wxPoint where;
+ g_buttonState = e->modifiers;
+
MGL_wmCoordGlobalToLocal(win->GetHandle(),
e->where_x, e->where_y, &where.x, &where.y);
event.SetTimestamp(e->when);
event.m_x = where.x - orig.x;
event.m_y = where.y - orig.y;
- event.m_shiftDown = e->modifiers & EVT_SHIFTKEY;
- event.m_controlDown = e->modifiers & EVT_CTRLSTATE;
- event.m_altDown = e->modifiers & EVT_LEFTALT;
- event.m_metaDown = e->modifiers & EVT_RIGHTALT;
- event.m_leftDown = e->modifiers & EVT_LEFTBUT;
- event.m_middleDown = e->modifiers & EVT_MIDDLEBUT;
- event.m_rightDown = e->modifiers & EVT_RIGHTBUT;
+ event.m_shiftDown = ( e->modifiers & EVT_SHIFTKEY ) != 0;
+ event.m_controlDown = ( e->modifiers & EVT_CTRLSTATE ) != 0;
+ event.m_altDown = ( e->modifiers & EVT_LEFTALT ) != 0;
+ event.m_metaDown = ( e->modifiers & EVT_RIGHTALT ) != 0;
+ event.m_leftDown = ( e->modifiers & EVT_LEFTBUT ) != 0;
+ event.m_middleDown = ( e->modifiers & EVT_MIDDLEBUT ) != 0;
+ event.m_rightDown = ( e->modifiers & EVT_RIGHTBUT ) != 0;
switch (e->what)
{
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);
}
}
if ( translate )
{
+ bool numlock = (event->modifiers & EVT_NUMLOCK) != 0;
+
switch ( EVT_scanCode(event->message) )
{
KEY (KB_padMinus, WXK_NUMPAD_SUBTRACT)
KEY (KB_padPlus, WXK_NUMPAD_ADD)
KEY (KB_padTimes, WXK_NUMPAD_MULTIPLY)
KEY (KB_padDivide, WXK_NUMPAD_DIVIDE)
- KEY (KB_padCenter, WXK_NUMPAD_SEPARATOR) // ?
- KEY (KB_padLeft, WXK_NUMPAD_LEFT)
- KEY (KB_padRight, WXK_NUMPAD_RIGHT)
- KEY (KB_padUp, WXK_NUMPAD_UP)
- KEY (KB_padDown, WXK_NUMPAD_DOWN)
- KEY (KB_padInsert, WXK_NUMPAD_INSERT)
- KEY (KB_padDelete, WXK_NUMPAD_DELETE)
- KEY (KB_padHome, WXK_NUMPAD_HOME)
- KEY (KB_padEnd, WXK_NUMPAD_END)
- KEY (KB_padPageUp, WXK_NUMPAD_PAGEUP)
- //KEY (KB_padPageUp, WXK_NUMPAD_PRIOR)
- KEY (KB_padPageDown, WXK_NUMPAD_PAGEDOWN)
- //KEY (KB_padPageDown, WXK_NUMPAD_NEXT)
+ KEY (KB_padCenter, numlock ? WXK_NUMPAD5 : WXK_NUMPAD_SEPARATOR) // ?
+ KEY (KB_padLeft, numlock ? WXK_NUMPAD4 : WXK_NUMPAD_LEFT)
+ KEY (KB_padRight, numlock ? WXK_NUMPAD6 : WXK_NUMPAD_RIGHT)
+ KEY (KB_padUp, numlock ? WXK_NUMPAD8 : WXK_NUMPAD_UP)
+ KEY (KB_padDown, numlock ? WXK_NUMPAD2 : WXK_NUMPAD_DOWN)
+ KEY (KB_padInsert, numlock ? WXK_NUMPAD0 : WXK_NUMPAD_INSERT)
+ KEY (KB_padDelete, numlock ? WXK_DECIMAL : WXK_NUMPAD_DELETE)
+ KEY (KB_padHome, numlock ? WXK_NUMPAD7 : WXK_NUMPAD_HOME)
+ KEY (KB_padEnd, numlock ? WXK_NUMPAD1 : WXK_NUMPAD_END)
+ KEY (KB_padPageUp, numlock ? WXK_NUMPAD9 : WXK_NUMPAD_PAGEUP)
+ KEY (KB_padPageDown, numlock ? WXK_NUMPAD3 : WXK_NUMPAD_PAGEDOWN)
KEY (KB_1, '1')
KEY (KB_2, '2')
KEY (KB_3, '3')
)
{
wxCaptureScreenshot(event.m_altDown/*only active wnd?*/);
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
static ibool MGLAPI wxWindowKeybHandler(window_t *wnd, event_t *e)
wxKeyEvent event;
event.SetEventObject(win);
event.SetTimestamp(e->when);
- event.m_keyCode = wxScanToKeyCode(e, TRUE);
+ 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;
- event.m_controlDown = e->modifiers & EVT_CTRLSTATE;
- event.m_altDown = e->modifiers & EVT_LEFTALT;
- event.m_metaDown = e->modifiers & EVT_RIGHTALT;
+ event.m_shiftDown = ( e->modifiers & EVT_SHIFTKEY ) != 0;
+ event.m_controlDown = ( e->modifiers & EVT_CTRLSTATE ) != 0;
+ event.m_altDown = ( e->modifiers & EVT_LEFTALT ) != 0;
+ event.m_metaDown = ( e->modifiers & EVT_RIGHTALT ) != 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
// will only be sent if it is not in an accelerator table:
- event2.m_keyCode = wxScanToKeyCode(e, FALSE);
+ event2.m_keyCode = wxScanToKeyCode(e, false);
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
// mgl specific:
m_wnd = NULL;
- m_isShown = TRUE;
- m_frozen = FALSE;
+ m_isShown = true;
m_paintMGLDC = NULL;
m_eraseBackground = -1;
}
{
SendDestroyEvent();
- m_isBeingDeleted = TRUE;
-
if ( gs_mouseCapture == this )
ReleaseMouse();
const wxString& name)
{
if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
- return FALSE;
+ return false;
if ( parent )
parent->AddChild(this);
{
mgl_style |= MGL_WM_ALWAYS_ON_TOP;
// it is created hidden as other top level windows
- m_isShown = FALSE;
+ m_isShown = false;
wnd_parent = NULL;
}
SetMGLwindow_t(wnd);
- return TRUE;
+ return true;
}
void wxWindowMGL::SetMGLwindow_t(struct window_t *wnd)
m_wnd = wnd;
if ( !m_wnd ) return;
- m_isShown = m_wnd->visible;
+ m_isShown = (bool)m_wnd->visible;
MGL_wmSetWindowUserData(m_wnd, (void*) this);
MGL_wmSetWindowPainter(m_wnd, wxWindowPainter);
{
if ( gs_activeFrame )
{
- wxActivateEvent event(wxEVT_ACTIVATE, FALSE, gs_activeFrame->GetId());
+ 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());
+ 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);
}
// ----------------------------------------------------------------------------
bool wxWindowMGL::Show(bool show)
{
if ( !wxWindowBase::Show(show) )
- return FALSE;
+ return false;
MGL_wmShowWindow(m_wnd, show);
}
}
- return TRUE;
+ return true;
}
// Raise the window to the top of the Z order
if ( !wxWindowBase::SetCursor(cursor) )
{
// no change
- return FALSE;
+ return false;
}
if ( m_cursor.Ok() )
else
MGL_wmSetWindowCursor(m_wnd, *wxSTANDARD_CURSOR->GetMGLCursor());
- return TRUE;
+ return true;
}
void wxWindowMGL::WarpPointer(int x, int y)
bool wxWindowMGL::Reparent(wxWindowBase *parent)
{
if ( !wxWindowBase::Reparent(parent) )
- return FALSE;
+ return false;
MGL_wmReparentWindow(m_wnd, parent->GetHandle());
- return TRUE;
+ return true;
}
// old style file-manager drag&drop support: we retain the old-style
// DragAcceptFiles in parallel with SetDropTarget.
-void wxWindowMGL::DragAcceptFiles(bool accept)
+void wxWindowMGL::DragAcceptFiles(bool WXUNUSED(accept))
{
#if 0 // FIXME_MGL
HWND hWnd = GetHwnd();
{
DoMoveWindow(x, y, width, height);
- wxSizeEvent event(wxSize(width, height), GetId());
+ wxSize newSize(width, height);
+ wxSizeEvent event(newSize, GetId());
event.SetEventObject(this);
- GetEventHandler()->ProcessEvent(event);
+ HandleWindowEvent(event);
}
}
// painting
// ---------------------------------------------------------------------------
-void wxWindowMGL::Clear()
-{
- wxClientDC dc((wxWindow *)this);
- wxBrush brush(GetBackgroundColour(), wxSOLID);
- dc.SetBackground(brush);
- dc.Clear();
-}
-
-#include "wx/menu.h"
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;
+ 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;
+ m_refreshAfterThaw = true;
return;
}
{
dc->setColorRGB(255,0,255);
dc->fillRect(-1000,-1000,2000,2000);
- wxUsleep(50);
+ wxMilliSleep(50);
}
#endif
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 )
void wxWindowMGL::OnInternalIdle()
{
- if (wxUpdateUIEvent::CanUpdate(this))
+ if (wxUpdateUIEvent::CanUpdate(this) && IsShown())
UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
}
projects / wxWidgets.git / blobdiff