// headers
// ---------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "window.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#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"
#endif
#if wxUSE_DRAG_AND_DROP
#include "wx/mgl/private.h"
#include "wx/intl.h"
#include "wx/dcscreen.h"
+#include "wx/caret.h"
#include <mgraph.hpp>
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)
{
)
{
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 )
{
// 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);
// mgl specific:
m_wnd = NULL;
- m_isShown = TRUE;
- m_frozen = FALSE;
+ m_isShown = true;
+ m_frozen = false;
m_paintMGLDC = NULL;
m_eraseBackground = -1;
}
{
SendDestroyEvent();
- m_isBeingDeleted = TRUE;
+ 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 = 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);
}
// 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);
}
}
- 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();
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,
{
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);
}
void wxWindowMGL::Freeze()
{
- m_frozen = TRUE;
- m_refreshAfterThaw = FALSE;
+ m_frozen = true;
+ m_refreshAfterThaw = false;
}
void wxWindowMGL::Thaw()
{
- m_frozen = FALSE;
+ m_frozen = false;
if ( m_refreshAfterThaw )
Refresh();
}
if ( m_frozen )
{
// Don't paint anything if the window is frozen.
- m_refreshAfterThaw = TRUE;
+ m_refreshAfterThaw = true;
return;
}
projects / wxWidgets.git / blobdiff