// (based on GTK & MSW implementations)
// RCS-ID: $Id$
// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence: wxWindows license
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ===========================================================================
// headers
// ---------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "window.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#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/caret.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>
winmng_t *g_winMng = NULL;
MGLDevCtx *g_displayDC = NULL;
-// the window that has keyboard focus:
+// the window that has keyboard focus:
static wxWindowMGL *gs_focusedWindow = NULL;
-// the window that is about to be focused after currently focused
+// the window that is about to be focused after currently focused
// one looses focus:
static wxWindow *gs_toBeFocusedWindow = NULL;
// the window that is currently under mouse cursor:
// 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
// ---------------------------------------------------------------------------
-// Custom identifiers used to distinguish between various event handlers
+// Custom identifiers used to distinguish between various event handlers
// and capture handlers passed to MGL_wm
enum
{
#endif
static int screenshot_num = 0;
wxString screenshot;
-
- do
+
+ do
{
screenshot.Printf(SCREENSHOT_FILENAME, screenshot_num++);
} while ( wxFileExists(screenshot) && screenshot_num < 1000 );
-
+
wxRect r(0, 0, g_displayDC->sizex(), g_displayDC->sizey());
if ( activeWindowOnly && gs_activeFrame )
{
r.Intersect(gs_activeFrame->GetRect());
}
-
- g_displayDC->savePNGFromDC(screenshot.mb_str(),
+
+ g_displayDC->savePNGFromDC(screenshot.mb_str(),
r.x, r. y, r.x+r.width, r.y+r.height);
-
- wxMessageBox(_("Screenshot captured: ") + wxString(screenshot));
+
+ wxMessageBox(wxString::Format(_T("Screenshot captured: %s"),
+ screenshot.c_str()));
}
// ---------------------------------------------------------------------------
static void MGLAPI wxWindowPainter(window_t *wnd, MGLDC *dc)
{
wxWindowMGL *w = (wxWindow*) wnd->userData;
-
+
if ( w && !(w->GetWindowStyle() & wxTRANSPARENT_WINDOW) )
{
MGLDevCtx ctx(dc);
wxWindowMGL *win = (wxWindowMGL*)MGL_wmGetWindowUserData(wnd);
wxPoint orig(win->GetClientAreaOrigin());
wxPoint where;
-
- MGL_wmCoordGlobalToLocal(win->GetHandle(),
+
+ g_buttonState = e->modifiers;
+
+ MGL_wmCoordGlobalToLocal(win->GetHandle(),
e->where_x, e->where_y, &where.x, &where.y);
for (wxWindowMGL *w = win; w; w = w->GetParent())
{
- if ( !w->IsEnabled() )
+ if ( !w->IsEnabled() )
return FALSE;
if ( w->IsTopLevel() )
break;
}
-
+
wxEventType type = wxEVT_NULL;
wxMouseEvent event;
event.SetEventObject(win);
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 )
if ( gs_windowUnderMouse )
{
wxMouseEvent event2(event);
- MGL_wmCoordGlobalToLocal(gs_windowUnderMouse->GetHandle(),
- e->where_x, e->where_y,
+ MGL_wmCoordGlobalToLocal(gs_windowUnderMouse->GetHandle(),
+ e->where_x, e->where_y,
&event2.m_x, &event2.m_y);
wxPoint orig(gs_windowUnderMouse->GetClientAreaOrigin());
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;
}
}
else // gs_mouseCapture
{
- bool inside = (where.x >= 0 &&
+ 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 ?
+ wxMouseEvent evt(inside ?
wxEVT_ENTER_WINDOW : wxEVT_LEAVE_WINDOW);
evt.SetEventObject(win);
- win->GetEventHandler()->ProcessEvent(evt);
+ win->HandleWindowEvent(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);
+ return win->HandleWindowEvent(event);
}
}
break;
#else
#define KEY(mgl_key,wx_key) \
- case mgl_key: key = wx_key; break;
+ case mgl_key: key = wx_key; break;
#endif
long key = 0;
-
+
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')
default: break;
}
}
-
+
if ( key == 0 )
{
switch ( EVT_scanCode(event->message) )
KEY (KB_esc, WXK_ESCAPE)
KEY (KB_backspace, WXK_BACK)
KEY (KB_tab, WXK_TAB)
- KEY (KB_enter, WXK_RETURN)
+ KEY (KB_enter, WXK_RETURN)
- default:
- key = EVT_asciiCode(event->message);
+ default:
+ key = EVT_asciiCode(event->message);
break;
}
}
// Add an easy way to capture screenshots:
if ( event.m_keyCode == WXK_SNAPSHOT
#ifdef __WXDEBUG__ // FIXME_MGL - remove when KB_sysReq works in MGL!
- || (event.m_keyCode == WXK_F1 &&
- event.m_shiftDown && event.m_controlDown)
- )
+ || (event.m_keyCode == WXK_F1 &&
+ event.m_shiftDown && event.m_controlDown)
#endif
+ )
{
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)
if ( !win->IsEnabled() ) return FALSE;
wxPoint where;
- MGL_wmCoordGlobalToLocal(win->GetHandle(),
+ 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, 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
// wasn't handled yet:
if ( !ret && event.m_keyCode == WXK_TAB &&
// 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
+
+ // Finally, process special meaning keys that are usually
// a responsibility of OS or window manager:
if ( !ret )
ret = wxHandleSpecialKeys(event);
-
+
return ret;
}
}
IMPLEMENT_ABSTRACT_CLASS(wxWindowMGL, wxWindowBase)
BEGIN_EVENT_TABLE(wxWindowMGL, wxWindowBase)
- EVT_IDLE(wxWindowMGL::OnIdle)
END_EVENT_TABLE()
// ===========================================================================
// constructors and such
// ----------------------------------------------------------------------------
-extern wxDisplayModeInfo wxGetDefaultDisplayMode();
+extern wxVideoMode wxGetDefaultDisplayMode();
void wxWindowMGL::Init()
{
if ( !g_winMng )
{
if ( !wxTheApp->SetDisplayMode(wxGetDefaultDisplayMode()) )
- wxFatalError(_("Cannot initialize display."));
+ wxLogFatalError(_("Cannot initialize display."));
}
- // generic:
- InitBase();
-
// mgl specific:
m_wnd = NULL;
- m_isShown = TRUE;
- m_isBeingDeleted = FALSE;
- m_isEnabled = TRUE;
- m_frozen = FALSE;
+ m_isShown = true;
m_paintMGLDC = NULL;
m_eraseBackground = -1;
}
// Destructor
wxWindowMGL::~wxWindowMGL()
{
- m_isBeingDeleted = TRUE;
+ SendDestroyEvent();
+
+ m_isBeingDeleted = true;
if ( gs_mouseCapture == this )
ReleaseMouse();
win->SetFocus();
}
}
-
+
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
- // find their parent frame (see above).
DestroyChildren();
- if ( m_parent )
- m_parent->RemoveChild(this);
-
if ( m_wnd )
MGL_wmDestroyWindow(m_wnd);
}
const wxString& name)
{
if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
- return FALSE;
+ return false;
if ( parent )
parent->AddChild(this);
AdjustForParentClientOrigin(x, y, 0);
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) )
+ if ( style & wxFULL_REPAINT_ON_RESIZE )
{
mgl_style |= MGL_WM_FULL_REPAINT_ON_RESIZE;
}
{
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;
}
MGL_wmSetWindowFlags(wnd, mgl_style);
MGL_wmShowWindow(wnd, m_isShown);
-
+
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);
gs_focusedWindow->KillFocus();
gs_toBeFocusedWindow = NULL;
}
-
+
gs_focusedWindow = this;
-
+
MGL_wmCaptureEvents(GetHandle(), EVT_KEYEVT, wxMGL_CAPTURE_KEYB);
wxWindowMGL *active = wxGetTopLevelParent(this);
{
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
gs_focusedWindow = NULL;
if ( m_isBeingDeleted ) return;
-
+
MGL_wmUncaptureEvents(GetHandle(), wxMGL_CAPTURE_KEYB);
#if wxUSE_CARET
wxFocusEvent event(wxEVT_KILL_FOCUS, GetId());
event.SetEventObject(this);
event.SetWindow(gs_toBeFocusedWindow);
- GetEventHandler()->ProcessEvent(event);
+ HandleWindowEvent(event);
}
// ----------------------------------------------------------------------------
// this wxWindowBase function is implemented here (in platform-specific file)
// because it is static and so couldn't be made virtual
// ----------------------------------------------------------------------------
-wxWindow *wxWindowBase::FindFocus()
+wxWindow *wxWindowBase::DoFindFocus()
{
return (wxWindow*)gs_focusedWindow;
}
bool wxWindowMGL::Show(bool show)
{
if ( !wxWindowBase::Show(show) )
- return FALSE;
+ return false;
MGL_wmShowWindow(m_wnd, show);
-
+
if (!show && gs_activeFrame == this)
{
// activate next frame in Z-order:
}
}
- return TRUE;
+ return true;
}
// Raise the window to the top of the Z order
void wxWindowMGL::DoReleaseMouse()
{
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;
}
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)
x = w-1;
if ( y >= h )
y = h-1;
-
- EVT_setMousePos(x, y);
-}
-
-#if WXWIN_COMPATIBILITY
-// If nothing defined for this, try the parent.
-// E.g. we may be a button loaded from a resource, with no callback function
-// defined.
-void wxWindowMGL::OnCommand(wxWindow& win, wxCommandEvent& event)
-{
- if ( GetEventHandler()->ProcessEvent(event) )
- return;
- if ( m_parent )
- m_parent->GetEventHandler()->OnCommand(win, event);
-}
-#endif // WXWIN_COMPATIBILITY_2
-#if WXWIN_COMPATIBILITY
-wxObject* wxWindowMGL::GetChild(int number) const
-{
- // Return a pointer to the Nth object in the Panel
- wxNode *node = GetChildren().First();
- int n = number;
- while (node && n--)
- node = node->Next();
- if ( node )
- {
- wxObject *obj = (wxObject *)node->Data();
- return(obj);
- }
- else
- return NULL;
+ EVT_setMousePos(x, y);
}
-#endif // WXWIN_COMPATIBILITY
// Set this window to be the child of 'parent'.
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();
void wxWindowMGL::DoGetSize(int *x, int *y) const
{
wxASSERT_MSG( m_wnd, wxT("invalid window") );
-
+
if (x) *x = m_wnd->width;
if (y) *y = m_wnd->height;
}
wxASSERT_MSG( m_wnd, wxT("invalid window") );
int pX = 0, pY = 0;
- AdjustForParentClientOrigin(pX, pY, 0);
+ AdjustForParentClientOrigin(pX, pY, 0);
if (x) *x = m_wnd->x - pX;
if (y) *y = m_wnd->y - pY;
void wxWindowMGL::DoMoveWindow(int x, int y, int width, int height)
{
- MGL_wmSetWindowPosition(GetHandle(), x, y, width, height);
+ wxRect rcClient(GetClientRect());
+
+ MGL_wmSetWindowPosition(m_wnd, x, y, width, height);
+
+ // When the origin or a window stays fixed but the height or width
+ // changes, invalidate the old and new non-client areas
+ if ( !HasFlag(wxFULL_REPAINT_ON_RESIZE) &&
+ m_wnd->x == x && m_wnd->y == y &&
+ rcClient.Intersect(GetClientRect()) != wxRect(0, 0, width, height) )
+ {
+ wxRegion rgn(0, 0, width, height);
+ rgn.Subtract(rcClient);
+
+ // This should work I think, but doesn't seem to:
+ //MGL_wmInvalidateWindowRegion(m_wnd, rgn.GetMGLRegion().rgnPointer());
+
+ // Use MGL_wmInvalidateWindowRect instead:
+ for (wxRegionIterator it(rgn); it; it++)
+ {
+ rect_t rc;
+ rc.left = it.GetX();
+ rc.top = it.GetY();
+ rc.right = rc.left + it.GetW();
+ rc.bottom = rc.top + it.GetH();
+ MGL_wmInvalidateWindowRect(m_wnd, &rc);
+ }
+ }
}
// set the size of the window: if the dimensions are positive, just use them,
width = currentW;
}
}
-
+
if ( height == -1 )
{
if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
height = currentH;
}
}
-
+
int maxWidth = GetMaxWidth(),
- minWidth = GetMinWidth(),
+ 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;
- if ( m_wnd->x != x || m_wnd->y != y ||
+ 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());
+ wxSize newSize(width, height);
+ wxSizeEvent event(newSize, GetId());
event.SetEventObject(this);
- GetEventHandler()->ProcessEvent(event);
+ HandleWindowEvent(event);
}
}
dc.GetTextExtent(string, x, y, descent, externalLeading, (wxFont*)theFont);
}
-#if wxUSE_CARET && WXWIN_COMPATIBILITY
-// ---------------------------------------------------------------------------
-// Caret manipulation
-// ---------------------------------------------------------------------------
-
-void wxWindowMGL::CreateCaret(int w, int h)
-{
- SetCaret(new wxCaret(this, w, h));
-}
-
-void wxWindowMGL::CreateCaret(const wxBitmap *WXUNUSED(bitmap))
-{
- wxFAIL_MSG("not implemented");
-}
-
-void wxWindowMGL::ShowCaret(bool show)
-{
- wxCHECK_RET( m_caret, "no caret to show" );
-
- m_caret->Show(show);
-}
-
-void wxWindowMGL::DestroyCaret()
-{
- SetCaret(NULL);
-}
-
-void wxWindowMGL::SetCaretPos(int x, int y)
-{
- wxCHECK_RET( m_caret, "no caret to move" );
-
- m_caret->Move(x, y);
-}
-
-void wxWindowMGL::GetCaretPos(int *x, int *y) const
-{
- wxCHECK_RET( m_caret, "no caret to get position of" );
-
- m_caret->GetPosition(x, y);
-}
-#endif // wxUSE_CARET
-
// ---------------------------------------------------------------------------
// 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 )
m_eraseBackground = eraseBack;
else
m_eraseBackground |= eraseBack;
-
+
if ( rect )
{
rect_t r;
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;
+ // Don't paint anything if the window is frozen.
+ m_refreshAfterThaw = true;
return;
}
-
-#ifdef __WXDEBUG__
+
+#ifdef __WXDEBUG__
// FIXME_MGL -- debugging stuff, to be removed!
static int debugPaintEvents = -1;
if ( debugPaintEvents == -1 )
{
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 )
// idle events processing
// ---------------------------------------------------------------------------
-void wxWindowMGL::OnIdle(wxIdleEvent& WXUNUSED(event))
+void wxWindowMGL::OnInternalIdle()
{
- UpdateWindowUI();
+ if (wxUpdateUIEvent::CanUpdate(this) && IsShown())
+ UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
}
projects / wxWidgets.git / blobdiff