// private functions
// ---------------------------------------------------------------------------
-// wxCreateMGL_WM creates MGL display DC and associates it with winmng_t
-// structure. Dimensions and depth of the DC are fetched from wxSystemOptions
-// object.
-// This function is *not* called from wxApp's initialization but rather at
-// the time when WM is needed, i.e. when first wxWindow is created. This
-// has two important effects:
-// a) it is possible to write windowless wxMGL apps
-// b) the app has plenty of time in wxApp::OnInit to feed wxSystemOptions
-// 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 width = 640, height = 480, depth = 16;
- 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") )
- height = wxSystemOptions::GetOptionInt(wxT("mgl.screen-height"));
- if ( wxSystemOptions::HasOption(wxT("mgl.screen-depth") )
- depth = wxSystemOptions::GetOptionInt(wxT("mgl.screen-depth"));
- if ( wxSystemOptions::HasOption(wxT("mgl.screen-refresh") )
- refresh = wxSystemOptions::GetOptionInt(wxT("mgl.screen-refresh"));
-#endif
-
- mode = MGL_findMode(width, height, depth);
- if ( mode == -1 )
- {
- wxLogWarning(_("Mode %ix%i-%i not available, falling back to default mode."), width, height, depth);
- mode = 0; // always available
- }
- g_displayDC = new MGLDisplayDC(mode, 1, refresh);
- if ( !g_displayDC->isValid() )
- {
- delete g_displayDC;
- g_displayDC = NULL;
- return FALSE;
- }
-
- g_winMng = MGL_wmCreate(g_displayDC->getDC());
- if (!g_winMng)
- return FALSE;
-
- MGL_wmSetWindowPainter(MGL_wmGetRootWindow(g_winMng), wxDesktopPainter);
-
- return TRUE;
-}
-
-void wxDestroyMGL_WM()
-{
- if ( g_winMng )
- {
- MGL_wmDestroy(g_winMng);
- g_winMng = NULL;
- }
- if ( g_displayDC )
- {
- delete g_displayDC;
- g_displayDC = NULL;
- }
-}
-
// Returns toplevel grandparent of given window:
static wxWindowMGL* wxGetTopLevelParent(wxWindowMGL *win)
{
// MGL_WM hooks:
// ---------------------------------------------------------------------------
-static void wxWindowPainter(window_t *wnd, MGLDC *dc)
+static void MGLAPI wxWindowPainter(window_t *wnd, MGLDC *dc)
{
wxWindowMGL *w = (wxWindow*) wnd->userData;
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)
+static ibool MGLAPI wxWindowMouseHandler(window_t *wnd, event_t *e)
{
wxWindowMGL *win = (wxWindowMGL*)MGL_wmGetWindowUserData(wnd);
+ wxPoint orig(win->GetClientAreaOrigin());
wxPoint where;
MGL_wmCoordGlobalToLocal(win->GetHandle(),
wxMouseEvent event;
event.SetEventObject(win);
event.SetTimestamp(e->when);
- event.m_x = where.x;
- event.m_y = where.y;
+ 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;
else if ( e->message & EVT_RIGHTBMASK )
type = (e->message & EVT_DBLCLICK) ?
wxEVT_RIGHT_DCLICK : wxEVT_RIGHT_DOWN;
+
+ if ( win->AcceptsFocus() && wxWindow::FindFocus() != win )
+ win->SetFocus();
+
break;
case EVT_MOUSEUP:
e->where_x, e->where_y,
&event2.m_x, &event2.m_y);
+ wxPoint orig(gs_windowUnderMouse->GetClientAreaOrigin());
+ event2.m_x -= orig.x;
+ event2.m_y -= orig.y;
+
event2.SetEventObject(gs_windowUnderMouse);
event2.SetEventType(wxEVT_LEAVE_WINDOW);
gs_windowUnderMouse->GetEventHandler()->ProcessEvent(event2);
}
}
-static long wxScanToKeyCode(event_t *event)
+static long wxScanToKeyCode(event_t *event, bool translate)
{
- #define KEY(mgl,wx) case mgl: key = wx; break;
+ // VS: make it __WXDEBUG__-only, since we have lots of wxLogTrace calls
+ // here and the arguments would be stored in non-debug executable even
+ // though wxLogTrace would be no-op...
+ #ifdef __WXDEBUG__
+ #define KEY(mgl_key,wx_key) \
+ case mgl_key: \
+ wxLogTrace(_T("keyevents"), \
+ _T("key " #mgl_key ", mapped to " #wx_key)); \
+ key = wx_key; \
+ break;
+ #else
+ #define KEY(mgl_key,wx_key) \
+ case mgl_key: key = wx_key; break;
+ #endif
long key = 0;
- switch ( EVT_scanCode(event->message) )
+
+ if ( translate )
{
- 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;
+ 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_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_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_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: break;
+ }
+ }
+
+ if ( key == 0 )
+ {
+ switch ( EVT_scanCode(event->message) )
+ {
+ KEY (KB_padEnter, WXK_NUMPAD_ENTER)
+ 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_backspace, WXK_BACK)
+ KEY (KB_tab, WXK_TAB)
+ KEY (KB_enter, WXK_RETURN)
+
+ 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)
+static ibool MGLAPI wxWindowKeybHandler(window_t *wnd, event_t *e)
{
wxWindowMGL *win = (wxWindowMGL*)MGL_wmGetWindowUserData(wnd);
wxKeyEvent event;
event.SetEventObject(win);
event.SetTimestamp(e->when);
- event.m_keyCode = wxScanToKeyCode(e);
+ 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;
}
#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);
+ // 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);
if ( !ret && event2.m_keyCode != 0 )
{
event2.SetEventType(wxEVT_CHAR);
ret = win->GetEventHandler()->ProcessEvent(event2);
}
+ // Synthetize navigation key event, but do it only if the TAB key
+ // wasn't handled yet.
+ if ( !ret && event.m_keyCode == WXK_TAB &&
+ win->GetParent() && win->GetParent()->HasFlag(wxTAB_TRAVERSAL) )
+ {
+ wxNavigationKeyEvent navEvent;
+ navEvent.SetEventObject(win->GetParent());
+ // Shift-TAB goes in reverse direction:
+ navEvent.SetDirection(!event.m_shiftDown);
+ // 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);
+ }
+
return ret;
}
}
// constructors and such
// ----------------------------------------------------------------------------
+extern wxDisplayModeInfo wxGetDefaultDisplayMode();
+
void wxWindowMGL::Init()
{
+ // First of all, make sure window manager is up and running. If it is
+ // not the case, initialize it in default display mode
+ if ( !g_winMng )
+ {
+ if ( !wxTheApp->SetDisplayMode(wxGetDefaultDisplayMode()) )
+ wxFatalError(_("Cannot initialize display."));
+ }
+
// generic:
InitBase();
x = 0; // FIXME_MGL, something better, see GTK+
if ( y == -1 )
y = 0; // FIXME_MGL, something better, see GTK+
+ AdjustForParentClientOrigin(x, y, 0);
w = WidthDefault(size.x);
h = HeightDefault(size.y);
wnd_parent = NULL;
}
- m_wnd = MGL_wmCreateWindow(g_winMng, wnd_parent, x, y, w, h);
+ window_t *wnd = MGL_wmCreateWindow(g_winMng, wnd_parent, x, y, w, h);
+
+ MGL_wmSetWindowFlags(wnd, mgl_style);
+ MGL_wmShowWindow(wnd, m_isShown);
+
+ SetMGLwindow_t(wnd);
+
+ return TRUE;
+}
+
+void wxWindowMGL::SetMGLwindow_t(struct window_t *wnd)
+{
+ if ( m_wnd )
+ MGL_wmDestroyWindow(m_wnd);
+
+ m_wnd = wnd;
+ if ( !m_wnd ) return;
+
+ m_isShown = m_wnd->visible;
- 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;
+
+ if ( m_cursor.Ok() )
+ MGL_wmSetWindowCursor(m_wnd, *m_cursor.GetMGLCursor());
+ else
+ MGL_wmSetWindowCursor(m_wnd, *wxSTANDARD_CURSOR->GetMGLCursor());
}
// ---------------------------------------------------------------------------
MGL_wmCaptureEvents(GetHandle(), EVT_KEYEVT, wxMGL_CAPTURE_KEYB);
-#if wxUSE_CARET
- // caret needs to be informed about focus change
- wxCaret *caret = GetCaret();
- if ( caret )
- caret->OnSetFocus();
-#endif // wxUSE_CARET
-
wxWindowMGL *active = wxGetTopLevelParent(this);
if ( !(m_windowStyle & wxPOPUP_WINDOW) && active != gs_activeFrame )
{
wxFocusEvent event(wxEVT_SET_FOCUS, GetId());
event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event);
+
+#if wxUSE_CARET
+ // caret needs to be informed about focus change
+ wxCaret *caret = GetCaret();
+ if ( caret )
+ caret->OnSetFocus();
+#endif // wxUSE_CARET
}
void wxWindowMGL::KillFocus()
MGL_wmLowerWindow(m_wnd);
}
-void wxWindowMGL::CaptureMouse()
+void wxWindowMGL::DoCaptureMouse()
{
if ( gs_mouseCapture )
MGL_wmUncaptureEvents(gs_mouseCapture->m_wnd, wxMGL_CAPTURE_MOUSE);
MGL_wmCaptureEvents(m_wnd, EVT_MOUSEEVT, wxMGL_CAPTURE_MOUSE);
}
-void wxWindowMGL::ReleaseMouse()
+void wxWindowMGL::DoReleaseMouse()
{
wxASSERT_MSG( gs_mouseCapture == this, wxT("attempt to release mouse, but this window hasn't captured it") )
width = currentW;
}
}
-
+
if ( height == -1 )
{
if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
height = currentH;
}
}
+
+ int maxWidth = GetMaxWidth(),
+ minWidth = GetMinWidth(),
+ maxHeight = GetMaxHeight(),
+ minHeight = GetMinHeight();
+
+ if ( minWidth != -1 && width < minWidth ) width = minWidth;
+ if ( maxWidth != -1 && width > maxWidth ) width = maxWidth;
+ if ( minHeight != -1 && height < minHeight ) height = minHeight;
+ if ( maxHeight != -1 && height > maxHeight ) height = maxHeight;
- DoMoveWindow(x, y, width, height);
+ if ( m_wnd->x != x || m_wnd->y != y ||
+ (int)m_wnd->width != width || (int)m_wnd->height != height )
+ {
+ DoMoveWindow(x, y, width, height);
- wxSizeEvent event(wxSize(width, height), GetId());
- event.SetEventObject(this);
- GetEventHandler()->ProcessEvent(event);
+ wxSizeEvent event(wxSize(width, height), GetId());
+ event.SetEventObject(this);
+ GetEventHandler()->ProcessEvent(event);
+ }
}
void wxWindowMGL::DoSetClientSize(int width, int height)
return;
}
-#if 0 // FIXME_MGL -- debugging stuff!
- dc->setColorRGB(255,0,255);
- dc->fillRect(-1000,-1000,2000,2000);
- wxUsleep(50);
+#ifdef __WXDEBUG__
+ // FIXME_MGL -- debugging stuff, to be removed!
+ static int debugPaintEvents = -1;
+ if ( debugPaintEvents == -1 )
+ debugPaintEvents = wxGetEnv(wxT("WXMGL_DEBUG_PAINT_EVENTS"), NULL);
+ if ( debugPaintEvents )
+ {
+ dc->setColorRGB(255,0,255);
+ dc->fillRect(-1000,-1000,2000,2000);
+ wxUsleep(50);
+ }
#endif
MGLRegion clip;
m_updateRegion = wxRegion(clip);
m_paintMGLDC = dc;
+#if wxUSE_CARET
+ // must hide caret temporarily, otherwise we'd get rendering artifacts
+ wxCaret *caret = GetCaret();
+ if ( caret )
+ caret->Hide();
+#endif // wxUSE_CARET
+
if ( m_eraseBackground != 0 )
{
wxWindowDC dc((wxWindow*)this);
eventPt.SetEventObject(this);
GetEventHandler()->ProcessEvent(eventPt);
+#if wxUSE_CARET
+ if ( caret )
+ caret->Show();
+#endif // wxUSE_CARET
+
m_paintMGLDC = NULL;
m_updateRegion.Clear();
}
projects / wxWidgets.git / blobdiff