winmng_t *g_winMng = NULL;
MGLDevCtx *g_displayDC = NULL;
-extern wxList WXDLLEXPORT wxPendingDelete;
- // FIXME_MGL -- ???
-
-// the window that has keyboard+joystick focus:
-static wxWindowMGL *g_focusedWindow = NULL;
+// the window that has keyboard focus:
+static wxWindowMGL *gs_focusedWindow = NULL;
// the window that is currently under mouse cursor:
-static wxWindowMGL *g_windowUnderMouse = NULL;
+static wxWindowMGL *gs_windowUnderMouse = NULL;
+// the window that has mouse capture
+static wxWindowMGL *gs_mouseCapture = NULL;
+// the frame that is currently active (i.e. its child has focus). It is
+// used to generate wxActivateEvents
+static wxWindowMGL *gs_activeFrame = NULL;
// ---------------------------------------------------------------------------
// constants
// with desired settings
// FIXME_MGL -- move to app.cpp??
+static void wxDesktopPainter(window_t *wnd, MGLDC *dc)
+{
+ // FIXME_MGL - for now...
+ MGL_setColorRGB(0x63, 0x63, 0x96);
+ MGL_fillRectCoord(0, 0, wnd->width, wnd->height);
+}
+
+
bool wxCreateMGL_WM()
{
int mode;
int refresh = MGL_DEFAULT_REFRESH;
#if wxUSE_SYSTEM_OPTIONS
+ // FIXME_MGL -- so what is The Proper Way?
if ( wxSystemOptions::HasOption(wxT("mgl.screen-width") )
width = wxSystemOptions::GetOptionInt(wxT("mgl.screen-width"));
if ( wxSystemOptions::HasOption(wxT("mgl.screen-height") )
g_winMng = MGL_wmCreate(g_displayDC->getDC());
if (!g_winMng)
return FALSE;
+
+ MGL_wmSetWindowPainter(MGL_wmGetRootWindow(g_winMng), wxDesktopPainter);
return TRUE;
}
}
}
+// Returns toplevel grandparent of given window:
+static wxWindowMGL* wxGetTopLevelParent(wxWindowMGL *win)
+{
+ wxWindowMGL *p = win;
+ while (p && !p->IsTopLevel())
+ p = p->GetParent();
+ return p;
+}
+
// ---------------------------------------------------------------------------
// MGL_WM hooks:
// ---------------------------------------------------------------------------
static void wxWindowPainter(window_t *wnd, MGLDC *dc)
{
wxWindowMGL *w = (wxWindow*) wnd->userData;
- if (w)
+ if ( w && !(w->GetWindowStyle() & wxTRANSPARENT_WINDOW) )
{
MGLDevCtx ctx(dc);
w->HandlePaint(&ctx);
}
+ // FIXME_MGL -- root window should be a regular window so that
+ // enter/leave and activate/deactivate events work correctly
+}
+
+static ibool wxWindowMouseHandler(window_t *wnd, event_t *e)
+{
+ wxWindowMGL *win = (wxWindowMGL*)MGL_wmGetWindowUserData(wnd);
+ wxPoint where;
+
+ MGL_wmCoordGlobalToLocal(win->GetHandle(),
+ e->where_x, e->where_y, &where.x, &where.y);
+
+ if ( !win->IsEnabled() ) return FALSE;
+
+ wxEventType type = wxEVT_NULL;
+ wxMouseEvent event;
+ event.SetEventObject(win);
+ event.SetTimestamp(e->when);
+ 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_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:
+ if ( e->message & EVT_LEFTBMASK )
+ type = (e->message & EVT_DBLCLICK) ?
+ wxEVT_LEFT_DCLICK : wxEVT_LEFT_DOWN;
+ else if ( e->message & EVT_MIDDLEBMASK )
+ type = (e->message & EVT_DBLCLICK) ?
+ wxEVT_MIDDLE_DCLICK : wxEVT_MIDDLE_DOWN;
+ else if ( e->message & EVT_RIGHTBMASK )
+ type = (e->message & EVT_DBLCLICK) ?
+ wxEVT_RIGHT_DCLICK : wxEVT_RIGHT_DOWN;
+ break;
+
+ case EVT_MOUSEUP:
+ 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;
+ break;
+
+ case EVT_MOUSEMOVE:
+ if ( !gs_mouseCapture )
+ {
+ if ( win != gs_windowUnderMouse )
+ {
+ if ( gs_windowUnderMouse )
+ {
+ wxMouseEvent event2(event);
+ MGL_wmCoordGlobalToLocal(gs_windowUnderMouse->GetHandle(),
+ e->where_x, e->where_y,
+ &event2.m_x, &event2.m_y);
+
+ event2.SetEventObject(gs_windowUnderMouse);
+ event2.SetEventType(wxEVT_LEAVE_WINDOW);
+ gs_windowUnderMouse->GetEventHandler()->ProcessEvent(event2);
+ }
+
+ wxMouseEvent event3(event);
+ event3.SetEventType(wxEVT_ENTER_WINDOW);
+ win->GetEventHandler()->ProcessEvent(event3);
+
+ gs_windowUnderMouse = win;
+ }
+ }
+ else // gs_mouseCapture
+ {
+ bool inside = (where.x >= 0 &&
+ where.y >= 0 &&
+ where.x < win->GetSize().x &&
+ where.y < win->GetSize().y);
+ if ( (inside && gs_windowUnderMouse != win) ||
+ (!inside && gs_windowUnderMouse == win) )
+ {
+ wxMouseEvent evt(inside ?
+ wxEVT_ENTER_WINDOW : wxEVT_LEAVE_WINDOW);
+ evt.SetEventObject(win);
+ win->GetEventHandler()->ProcessEvent(evt);
+ gs_windowUnderMouse = inside ? win : NULL;
+ }
+ }
+
+ type = wxEVT_MOTION;
+ break;
+
+ default:
+ break;
+ }
+
+ if ( type == wxEVT_NULL )
+ {
+ return FALSE;
+ }
+ else
+ {
+ event.SetEventType(type);
+ return win->GetEventHandler()->ProcessEvent(event);
+ }
+}
+
+static long wxScanToKeyCode(event_t *event)
+{
+ #define KEY(mgl,wx) case mgl: key = wx; break;
+
+ long key = 0;
+ switch ( EVT_scanCode(event->message) )
+ {
+ KEY (KB_padEnter, WXK_NUMPAD_ENTER)
+ 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_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, WXK_NUMPAD_SEPARATOR) // ?
+ KEY (KB_F1, WXK_F1)
+ KEY (KB_F2, WXK_F2)
+ KEY (KB_F3, WXK_F3)
+ KEY (KB_F4, WXK_F4)
+ KEY (KB_F5, WXK_F5)
+ KEY (KB_F6, WXK_F6)
+ KEY (KB_F7, WXK_F7)
+ KEY (KB_F8, WXK_F8)
+ KEY (KB_F9, WXK_F9)
+ KEY (KB_F10, WXK_F10)
+ KEY (KB_F11, WXK_F11)
+ KEY (KB_F12, WXK_F12)
+ KEY (KB_left, WXK_LEFT)
+ KEY (KB_right, WXK_RIGHT)
+ KEY (KB_up, WXK_UP)
+ KEY (KB_down, WXK_DOWN)
+ KEY (KB_insert, WXK_INSERT)
+ KEY (KB_delete, WXK_DELETE)
+ KEY (KB_home, WXK_HOME)
+ KEY (KB_end, WXK_END)
+ KEY (KB_pageUp, WXK_PAGEUP)
+ KEY (KB_pageDown, WXK_PAGEDOWN)
+ KEY (KB_capsLock, WXK_CAPITAL)
+ KEY (KB_numLock, WXK_NUMLOCK)
+ KEY (KB_scrollLock, WXK_SCROLL)
+ KEY (KB_leftShift, WXK_SHIFT)
+ KEY (KB_rightShift, WXK_SHIFT)
+ KEY (KB_leftCtrl, WXK_CONTROL)
+ KEY (KB_rightCtrl, WXK_CONTROL)
+ KEY (KB_leftAlt, WXK_ALT)
+ KEY (KB_rightAlt, WXK_ALT)
+ KEY (KB_leftWindows, WXK_START)
+ KEY (KB_rightWindows, WXK_START)
+ KEY (KB_menu, WXK_MENU)
+ KEY (KB_sysReq, WXK_SNAPSHOT)
+ KEY (KB_esc, WXK_ESCAPE)
+ KEY (KB_1, '1')
+ KEY (KB_2, '2')
+ KEY (KB_3, '3')
+ KEY (KB_4, '4')
+ KEY (KB_5, '5')
+ KEY (KB_6, '6')
+ KEY (KB_7, '7')
+ KEY (KB_8, '8')
+ KEY (KB_9, '9')
+ KEY (KB_0, '0')
+ KEY (KB_minus, WXK_SUBTRACT)
+ KEY (KB_equals, WXK_ADD)
+ KEY (KB_backSlash, '\\')
+ KEY (KB_backspace, WXK_BACK)
+ KEY (KB_tab, WXK_TAB)
+ KEY (KB_Q, 'Q')
+ KEY (KB_W, 'W')
+ KEY (KB_E, 'E')
+ KEY (KB_R, 'R')
+ KEY (KB_T, 'T')
+ KEY (KB_Y, 'Y')
+ KEY (KB_U, 'U')
+ KEY (KB_I, 'I')
+ KEY (KB_O, 'O')
+ KEY (KB_P, 'P')
+ KEY (KB_leftSquareBrace,'[')
+ KEY (KB_rightSquareBrace,']')
+ KEY (KB_enter, WXK_RETURN)
+ KEY (KB_A, 'A')
+ KEY (KB_S, 'S')
+ KEY (KB_D, 'D')
+ KEY (KB_F, 'F')
+ KEY (KB_G, 'G')
+ KEY (KB_H, 'H')
+ KEY (KB_J, 'J')
+ KEY (KB_K, 'K')
+ KEY (KB_L, 'L')
+ KEY (KB_semicolon, ';')
+ KEY (KB_apostrophe, '\'')
+ KEY (KB_Z, 'Z')
+ KEY (KB_X, 'X')
+ KEY (KB_C, 'C')
+ KEY (KB_V, 'V')
+ KEY (KB_B, 'B')
+ KEY (KB_N, 'N')
+ KEY (KB_M, 'M')
+ KEY (KB_comma, ',')
+ KEY (KB_period, '.')
+ KEY (KB_divide, WXK_DIVIDE)
+ KEY (KB_space, WXK_SPACE)
+ KEY (KB_tilde, '~')
+
+ default:
+ key = EVT_asciiCode(event->message);
+ break;
+ }
+
+ #undef KEY
+
+ return key;
+}
+
+static long wxAsciiToKeyCode(event_t *event)
+{
+ return (long)EVT_asciiCode(event->message);
+}
+
+static ibool wxWindowKeybHandler(window_t *wnd, event_t *e)
+{
+ wxWindowMGL *win = (wxWindowMGL*)MGL_wmGetWindowUserData(wnd);
+
+ if ( !win->IsEnabled() ) return FALSE;
+
+ wxPoint where;
+ MGL_wmCoordGlobalToLocal(win->GetHandle(),
+ e->where_x, e->where_y, &where.x, &where.y);
+
+ wxKeyEvent event;
+ event.SetEventObject(win);
+ event.SetTimestamp(e->when);
+ event.m_keyCode = wxScanToKeyCode(e);
+ 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;
+
+ if ( e->what == EVT_KEYUP )
+ {
+ event.SetEventType(wxEVT_KEY_UP);
+ return win->GetEventHandler()->ProcessEvent(event);
+ }
+ else
+ {
+ bool ret;
+ wxKeyEvent event2;
+
+ event.SetEventType(wxEVT_KEY_DOWN);
+ event2 = event;
+
+ ret = win->GetEventHandler()->ProcessEvent(event);
+
+#if wxUSE_ACCEL
+ if ( !ret )
+ {
+ for (wxWindowMGL *w = win; w; w = w->GetParent())
+ {
+ int command = w->GetAcceleratorTable()->GetCommand(event);
+ if ( command != -1 )
+ {
+ wxCommandEvent eventc(wxEVT_COMMAND_MENU_SELECTED, command);
+ ret = w->GetEventHandler()->ProcessEvent(eventc);
+ break;
+ }
+ if ( w->IsTopLevel() )
+ break;
+ }
+ }
+#endif // wxUSE_ACCEL
+
+ /* 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 = wxAsciiToKeyCode(e);
+ if ( !ret && event2.m_keyCode != 0 )
+ {
+ event2.SetEventType(wxEVT_CHAR);
+ ret = win->GetEventHandler()->ProcessEvent(event2);
+ }
+
+ return ret;
+ }
}
// ---------------------------------------------------------------------------
// event tables
// ---------------------------------------------------------------------------
-// in wxUniv/MSW this class is abstract because it doesn't have DoPopupMenu()
-// method
+// in wxUniv this class is abstract because it doesn't have DoPopupMenu()
IMPLEMENT_ABSTRACT_CLASS(wxWindowMGL, wxWindowBase)
BEGIN_EVENT_TABLE(wxWindowMGL, wxWindowBase)
InitBase();
// mgl specific:
- if ( !g_winMng && !wxCreateMGL_WM() )
- wxFatalError(_T("Can't initalize MGL, aborting!"));
-
m_wnd = NULL;
m_isShown = TRUE;
m_isBeingDeleted = FALSE;
m_isEnabled = TRUE;
m_frozen = FALSE;
m_paintMGLDC = NULL;
+ m_eraseBackground = -1;
}
// Destructor
{
m_isBeingDeleted = TRUE;
- if ( g_focusedWindow == this )
- KillFocus();
+ if ( gs_mouseCapture == this )
+ ReleaseMouse();
-#if 0 // -- fixme - do we need this?
- // VS: make sure there's no wxFrame with last focus set to us:
- for (wxWindow *win = GetParent(); win; win = win->GetParent())
+ if (gs_activeFrame == this)
{
- wxFrame *frame = wxDynamicCast(win, wxFrame);
- if ( frame )
- {
- if ( frame->GetLastFocus() == this )
- frame->SetLastFocus((wxWindow*)NULL);
- break;
+ gs_activeFrame = NULL;
+ // activate next frame in Z-order:
+ if ( m_wnd->prev )
+ {
+ wxWindowMGL *win = (wxWindowMGL*)m_wnd->prev->userData;
+ win->SetFocus();
}
}
-#endif
+
+ if ( gs_focusedWindow == this )
+ KillFocus();
+
+ if ( gs_windowUnderMouse == this )
+ gs_windowUnderMouse = NULL;
// VS: destroy children first and _then_ detach *this from its parent.
// If we'd do it the other way around, children wouldn't be able
long style,
const wxString& name)
{
- // FIXME_MGL -- temporary!
- //wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindow without parent") );
-
if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
return FALSE;
- if ( parent ) // FIXME_MGL temporary
+ if ( parent )
parent->AddChild(this);
- else
- m_isShown=FALSE;// FIXME_MGL -- temporary, simulates wxTLW/wxFrame
+ int x, y, w, h;
+ x = pos.x, y = pos.y;
+ if ( x == -1 )
+ x = 0; // FIXME_MGL, something better, see GTK+
+ if ( y == -1 )
+ y = 0; // FIXME_MGL, something better, see GTK+
+ w = WidthDefault(size.x);
+ h = HeightDefault(size.y);
+
+ long mgl_style = 0;
+ window_t *wnd_parent = parent ? parent->GetHandle() : NULL;
+
+ if ( !(style & wxNO_FULL_REPAINT_ON_RESIZE) )
+ {
+ mgl_style |= MGL_WM_FULL_REPAINT_ON_RESIZE;
+ }
+ if ( style & wxSTAY_ON_TOP )
+ {
+ mgl_style |= MGL_WM_ALWAYS_ON_TOP;
+ }
if ( style & wxPOPUP_WINDOW )
{
+ mgl_style |= MGL_WM_ALWAYS_ON_TOP;
// it is created hidden as other top level windows
m_isShown = FALSE;
+ wnd_parent = NULL;
}
- m_wnd = MGL_wmCreateWindow(g_winMng,
- parent ? parent->GetHandle() : NULL,
- pos.x, pos.y, size.x, size.y);
- MGL_wmShowWindow(m_wnd, m_isShown);
+ m_wnd = MGL_wmCreateWindow(g_winMng, wnd_parent, x, y, w, h);
+
+ MGL_wmSetWindowFlags(m_wnd, mgl_style);
MGL_wmSetWindowUserData(m_wnd, (void*) this);
MGL_wmSetWindowPainter(m_wnd, wxWindowPainter);
+ MGL_wmShowWindow(m_wnd, m_isShown);
+ MGL_wmSetWindowCursor(m_wnd, *wxSTANDARD_CURSOR->GetMGLCursor());
+
+ MGL_wmPushWindowEventHandler(m_wnd, wxWindowMouseHandler, EVT_MOUSEEVT, 0);
+ MGL_wmPushWindowEventHandler(m_wnd, wxWindowKeybHandler, EVT_KEYEVT, 0);
+
return TRUE;
}
void wxWindowMGL::SetFocus()
{
- if (g_focusedWindow)
- g_focusedWindow->KillFocus();
+ if ( gs_focusedWindow )
+ gs_focusedWindow->KillFocus();
- g_focusedWindow = this;
+ gs_focusedWindow = this;
- MGL_wmCaptureEvents(GetHandle(), EVT_KEYEVT | EVT_JOYEVT, wxMGL_CAPTURE_KEYB);
+ MGL_wmCaptureEvents(GetHandle(), EVT_KEYEVT, wxMGL_CAPTURE_KEYB);
#if wxUSE_CARET
// caret needs to be informed about focus change
wxCaret *caret = GetCaret();
- if (caret)
+ if ( caret )
caret->OnSetFocus();
#endif // wxUSE_CARET
- if (IsTopLevel())
+ wxWindowMGL *active = wxGetTopLevelParent(this);
+ if ( active != gs_activeFrame )
{
- wxActivateEvent event(wxEVT_ACTIVATE, TRUE, GetId());
- event.SetEventObject(this);
- GetEventHandler()->ProcessEvent(event);
+ if ( gs_activeFrame )
+ {
+ wxActivateEvent event(wxEVT_ACTIVATE, FALSE, gs_activeFrame->GetId());
+ event.SetEventObject(gs_activeFrame);
+ gs_activeFrame->GetEventHandler()->ProcessEvent(event);
+ }
+
+ gs_activeFrame = active;
+ wxActivateEvent event(wxEVT_ACTIVATE, TRUE, gs_activeFrame->GetId());
+ event.SetEventObject(gs_activeFrame);
+ gs_activeFrame->GetEventHandler()->ProcessEvent(event);
}
wxFocusEvent event(wxEVT_SET_FOCUS, GetId());
void wxWindowMGL::KillFocus()
{
- if ( g_focusedWindow != this ) return;
- g_focusedWindow = NULL;
+ if ( gs_focusedWindow != this ) return;
+ gs_focusedWindow = NULL;
if ( m_isBeingDeleted ) return;
if ( IsTopLevel() )
{
+ // FIXME_MGL - this is wrong, see wxGTK!
wxActivateEvent event(wxEVT_ACTIVATE, FALSE, GetId());
event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event);
// ----------------------------------------------------------------------------
wxWindow *wxWindowBase::FindFocus()
{
- return (wxWindow*)g_focusedWindow;
+ return (wxWindow*)gs_focusedWindow;
}
bool wxWindowMGL::Show(bool show)
return FALSE;
MGL_wmShowWindow(m_wnd, show);
+
+ if (!show && gs_activeFrame == this)
+ {
+ // activate next frame in Z-order:
+ if ( m_wnd->prev )
+ {
+ wxWindowMGL *win = (wxWindowMGL*)m_wnd->prev->userData;
+ win->SetFocus();
+ }
+ }
+
return TRUE;
}
void wxWindowMGL::CaptureMouse()
{
+ if ( gs_mouseCapture )
+ MGL_wmUncaptureEvents(gs_mouseCapture->m_wnd, wxMGL_CAPTURE_MOUSE);
+
+ gs_mouseCapture = this;
MGL_wmCaptureEvents(m_wnd, EVT_MOUSEEVT, wxMGL_CAPTURE_MOUSE);
}
void wxWindowMGL::ReleaseMouse()
{
+ 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;
}
/* static */ wxWindow *wxWindowBase::GetCapture()
{
- for (captureentry_t *c = g_winMng->capturedEvents; c; c = c->next)
- {
- if ( c->id == wxMGL_CAPTURE_MOUSE )
- return (wxWindow*)c->wnd->userData;
- }
- return NULL;
+ return (wxWindow*)gs_mouseCapture;
}
bool wxWindowMGL::SetCursor(const wxCursor& cursor)
if ( m_cursor.Ok() )
MGL_wmSetWindowCursor(m_wnd, *m_cursor.GetMGLCursor());
+ else
+ MGL_wmSetWindowCursor(m_wnd, *wxSTANDARD_CURSOR->GetMGLCursor());
return TRUE;
}
void wxWindowMGL::DoScreenToClient(int *x, int *y) const
{
int ax, ay;
- wxPoint co = GetClientAreaOrigin();
-
- MGL_wmCoordGlobalToLocal(m_wnd, m_wnd->x, m_wnd->y, &ax, &ay);
- ax -= co.x;
- ay -= co.y;
+ MGL_wmCoordGlobalToLocal(m_wnd, 0, 0, &ax, &ay);
if (x)
- *x = ax;
+ (*x) += ax;
if (y)
- *y = ay;
+ (*y) += ay;
}
void wxWindowMGL::DoClientToScreen(int *x, int *y) const
{
int ax, ay;
- wxPoint co = GetClientAreaOrigin();
-
- MGL_wmCoordGlobalToLocal(m_wnd, m_wnd->x+co.x, m_wnd->y+co.y, &ax, &ay);
+ MGL_wmCoordLocalToGlobal(m_wnd, 0, 0, &ax, &ay);
if (x)
- *x = ax;
+ (*x) += ax;
if (y)
- *y = ay;
+ (*y) += ay;
}
// Get size *available for subwindows* i.e. excluding menu bar etc.
if ( y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
y = currentY;
-#if 0 // FIXME_MGL -- what's this good for?
AdjustForParentClientOrigin(x, y, sizeFlags);
-#endif
wxSize size(-1, -1);
if ( width == -1 )
dc.Clear();
}
-void wxWindowMGL::Refresh(bool WXUNUSED(eraseBack), const wxRect *rect)
+void wxWindowMGL::Refresh(bool eraseBack, const wxRect *rect)
{
+ if ( m_eraseBackground == -1 )
+ m_eraseBackground = eraseBack;
+ else
+ m_eraseBackground |= eraseBack;
+
if ( rect )
{
rect_t r;
m_refreshAfterThaw = TRUE;
return;
}
-
+
MGLRegion clip;
dc->getClipRegion(clip);
m_updateRegion = wxRegion(clip);
m_paintMGLDC = dc;
+ if ( m_eraseBackground != 0 )
{
- wxWindowDC dc((wxWindow*)this);
- wxEraseEvent eventEr(m_windowId, &dc);
- eventEr.SetEventObject(this);
- GetEventHandler()->ProcessEvent(eventEr);
+ wxWindowDC dc((wxWindow*)this);
+ wxEraseEvent eventEr(m_windowId, &dc);
+ eventEr.SetEventObject(this);
+ GetEventHandler()->ProcessEvent(eventEr);
}
+ m_eraseBackground = -1;
wxNcPaintEvent eventNc(GetId());
eventNc.SetEventObject(this);
projects / wxWidgets.git / blobdiff