/////////////////////////////////////////////////////////////////////////////
-// Name: windows.cpp
+// Name: src/motif/windows.cpp
// Purpose: wxWindow
// Author: Julian Smart
// Modified by:
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "window.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
#ifdef __VMS
#define XtDisplay XTDISPLAY
#define XtScreen XTSCREEN
#endif
-#include "wx/setup.h"
+#ifndef WX_PRECOMP
+ #include "wx/hash.h"
+#endif
+
#include "wx/menu.h"
#include "wx/dc.h"
#include "wx/dcclient.h"
#include "wx/menuitem.h"
#include "wx/log.h"
#include "wx/evtloop.h"
-#include "wx/hash.h"
#if wxUSE_DRAG_AND_DROP
#include "wx/dnd.h"
// DoSetSizeIntr and DoMoveWindowIntr
// PROBLEM:
// under Motif composite controls (such as wxCalendarCtrl or generic wxSpinCtrl
-// did nott work and/or segfaulted because
+// did not work and/or segfaulted because
// 1) wxWindow::Create calls SetSize,
// which results in a call to DoSetSize much earlier than in the other ports
// 2) if wxWindow::Create is called (wxControl::Create calls it)
#include <string.h>
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-static const int SCROLL_MARGIN = 4;
-
// ----------------------------------------------------------------------------
// global variables for this module
// ----------------------------------------------------------------------------
{
Widget w = (Widget)widget;
if ( !w )
- return FALSE;
+ return false;
// Rationale: a lot of common operations (including but not
// limited to moving, resizing and appending items to a listbox)
// XtUnmapWidget(w);
}
- return TRUE;
+ return true;
}
// ----------------------------------------------------------------------------
void wxWindow::Init()
{
- // generic initializations first
- InitBase();
-
// Motif-specific
- m_needsRefresh = TRUE;
+ m_needsRefresh = true;
m_mainWidget = (WXWidget) 0;
- m_winCaptured = FALSE;
+ m_winCaptured = false;
+
+ m_isShown = true;
- m_isShown = TRUE;
- m_isBeingDeleted = FALSE;
-
m_hScrollBar =
m_vScrollBar =
m_borderWidget =
long style,
const wxString& name)
{
- wxCHECK_MSG( parent, FALSE, "can't create wxWindow without parent" );
+ wxCHECK_MSG( parent, false, "can't create wxWindow without parent" );
CreateBase(parent, id, pos, size, style, wxDefaultValidator, name);
//// drawing area, since otherwise the translations are different.
// New translations for getting mouse motion feedback
- static const String translations =
+ static const String translations = wxMOTIF_STR(
"<Btn1Motion>: wxCanvasMotionEvent() DrawingAreaInput() ManagerGadgetButtonMotion()\n\
<Btn2Motion>: wxCanvasMotionEvent() DrawingAreaInput() ManagerGadgetButtonMotion()\n\
<Btn3Motion>: wxCanvasMotionEvent() DrawingAreaInput() ManagerGadgetButtonMotion()\n\
<Motion>: wxCanvasMotionEvent() DrawingAreaInput()\n\
<EnterWindow>: wxCanvasMotionEvent() DrawingAreaInput()\n\
<LeaveWindow>: wxCanvasMotionEvent() DrawingAreaInput()\n\
-<Key>: DrawingAreaInput()";
+<Key>: DrawingAreaInput()");
XtActionsRec actions[1];
- actions[0].string = "wxCanvasMotionEvent";
+ actions[0].string = wxMOTIF_STR("wxCanvasMotionEvent");
actions[0].proc = (XtActionProc) wxCanvasMotionEvent;
XtAppAddActions ((XtAppContext) wxTheApp->GetAppContext(), actions, 1);
// Scrolled widget needs to have its colour changed or we get a little blue
// square where the scrollbars abutt
wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
- wxDoChangeBackgroundColour(m_scrolledWindow, backgroundColour, TRUE);
- wxDoChangeBackgroundColour(m_drawingArea, backgroundColour, TRUE);
+ wxDoChangeBackgroundColour(m_scrolledWindow, backgroundColour, true);
+ wxDoChangeBackgroundColour(m_drawingArea, backgroundColour, true);
XmScrolledWindowSetAreas(
(Widget)m_scrolledWindow,
// sample).
SetCursor(*wxSTANDARD_CURSOR);
SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
- DoSetSizeIntr(pos.x, pos.y, size.x,size.y, wxSIZE_AUTO, TRUE);
- return TRUE;
+ DoSetSizeIntr(pos.x, pos.y, size.x,size.y, wxSIZE_AUTO, true);
+ return true;
}
// Destructor
{
if (g_captureWindow == this)
g_captureWindow = NULL;
-
- m_isBeingDeleted = TRUE;
-
+
+ m_isBeingDeleted = true;
+
// Motif-specific actions first
WXWidget wMain = GetMainWidget();
if ( wMain )
DetachWidget(wMain);
}
- if ( m_parent )
- m_parent->RemoveChild( this );
-
// If m_drawingArea, we're a fully-fledged window with drawing area,
// scrollbars etc. (what wxCanvas used to be)
if ( m_drawingArea )
m_hScrollBar = DoCreateScrollBar( m_scrolledWindow, wxHORIZONTAL,
(void (*)())wxScrollBarCallback );
- wxDoChangeBackgroundColour(m_hScrollBar, backgroundColour, TRUE);
+ wxDoChangeBackgroundColour(m_hScrollBar, backgroundColour, true);
XtRealizeWidget( (Widget)m_hScrollBar );
m_vScrollBar = DoCreateScrollBar( m_scrolledWindow, wxVERTICAL,
(void (*)())wxScrollBarCallback );
- wxDoChangeBackgroundColour(m_vScrollBar, backgroundColour, TRUE);
+ wxDoChangeBackgroundColour(m_vScrollBar, backgroundColour, true);
XtRealizeWidget((Widget)m_vScrollBar);
}
// Get the window with the focus
-wxWindow *wxWindowBase::FindFocus()
+wxWindow *wxWindowBase::DoFindFocus()
{
// TODO Problems:
// (1) Can there be multiple focussed widgets in an application?
// (2) The widget with the focus may not be in the widget table
// depending on which widgets I put in the table
wxWindow *winFocus = (wxWindow *)NULL;
- for ( wxWindowList::Node *node = wxTopLevelWindows.GetFirst();
+ for ( wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();
node;
node = node->GetNext() )
{
bool wxWindow::Enable(bool enable)
{
if ( !wxWindowBase::Enable(enable) )
- return FALSE;
+ return false;
Widget wMain = (Widget)GetMainWidget();
if ( wMain )
XmUpdateDisplay(wMain);
}
- return TRUE;
+ return true;
}
bool wxWindow::Show(bool show)
{
if ( !wxWindowBase::Show(show) )
- return FALSE;
+ return false;
if (m_borderWidget || m_scrolledWindow)
{
MapOrUnmap(GetMainWidget(), show);
}
- return TRUE;
+ return true;
}
// Raise the window to the top of the Z order
XLowerWindow(XtDisplay(wTop), window);
}
-void wxWindow::SetTitle(const wxString& title)
+void wxWindow::SetLabel(const wxString& label)
{
- XtVaSetValues((Widget)GetMainWidget(), XmNtitle, title.c_str(), NULL);
+ XtVaSetValues((Widget)GetMainWidget(), XmNtitle, label.c_str(), NULL);
}
-wxString wxWindow::GetTitle() const
+wxString wxWindow::GetLabel() const
{
- char *title;
- XtVaGetValues((Widget)GetMainWidget(), XmNtitle, &title, NULL);
+ char *label;
+ XtVaGetValues((Widget)GetMainWidget(), XmNtitle, &label, NULL);
- return wxString(title);
+ return wxString(label);
}
void wxWindow::DoCaptureMouse()
Widget wMain = (Widget)GetMainWidget();
if ( wMain )
- XtAddGrab(wMain, TRUE, FALSE);
+ XtAddGrab(wMain, True, False);
- m_winCaptured = TRUE;
+ m_winCaptured = true;
}
void wxWindow::DoReleaseMouse()
if ( wMain )
XtRemoveGrab(wMain);
- m_winCaptured = FALSE;
+ m_winCaptured = false;
}
bool wxWindow::SetFont(const wxFont& font)
if ( !wxWindowBase::SetFont(font) )
{
// nothing to do
- return FALSE;
+ return false;
}
ChangeFont();
- return TRUE;
+ return true;
}
bool wxWindow::SetCursor(const wxCursor& cursor)
if ( !wxWindowBase::SetCursor(cursor) )
{
// no change
- return FALSE;
+ return false;
}
// wxASSERT_MSG( m_cursor.Ok(),
// wxT("cursor must be valid after call to the base version"));
- wxCursor* cursor2 = NULL;
+ const wxCursor* cursor2 = NULL;
if (m_cursor.Ok())
cursor2 = & m_cursor;
else
Window win = XtWindow(w);
XDefineCursor((Display*) dpy, win, (Cursor) x_cursor);
- return TRUE;
+ return true;
}
// Coordinates relative to the window
int wxWindow::GetScrollRange(int orient) const
{
Widget scrollBar = (Widget)GetScrollbar((wxOrientation)orient);
- wxCHECK_MSG( scrollBar, 0, "no such scrollbar" );
+ // CE scintilla windows don't always have these scrollbars
+ // and it tends to pile up a whole bunch of asserts
+ //wxCHECK_MSG( scrollBar, 0, "no such scrollbar" );
int range = 0;
- if (scrollBar)
+ if (scrollBar)
XtVaGetValues(scrollBar, XmNmaximum, &range, NULL);
return range;
}
int wxWindow::GetScrollThumb(int orient) const
{
Widget scrollBar = (Widget)GetScrollbar((wxOrientation)orient);
- wxCHECK_MSG( scrollBar, 0, "no such scrollbar" );
+ //wxCHECK_MSG( scrollBar, 0, "no such scrollbar" );
- int thumb;
- XtVaGetValues(scrollBar, XmNsliderSize, &thumb, NULL);
+ int thumb = 0;
+ if (scrollBar)
+ XtVaGetValues(scrollBar, XmNsliderSize, &thumb, NULL);
return thumb;
}
// Adjusting scrollbars can resize the canvas accidentally
if (newW != oldW || newH != oldH)
- SetSize(-1, -1, oldW, oldH);
+ SetSize(wxDefaultCoord, wxDefaultCoord, oldW, oldH);
}
// Does a physical scroll
XCopyArea(display, window, window, (GC) dc.GetGC(),
x1, y1, w1, h1, x2, y2);
- dc.SetAutoSetting(TRUE);
+ dc.SetAutoSetting(true);
wxBrush brush(GetBackgroundColour(), wxSOLID);
dc.SetBrush(brush); // FIXME: needed?
- wxWindowList::Node *cnode = m_children.GetFirst();
+ wxWindowList::compatibility_iterator cnode = m_children.GetFirst();
while (cnode)
{
wxWindow *child = cnode->GetData();
// Now send expose events
- wxList::Node* node = updateRects.GetFirst();
+ wxList::compatibility_iterator node = updateRects.GetFirst();
while (node)
{
wxRect* rect = (wxRect*) node->GetData();
bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
{
+ if ( x == wxDefaultCoord && y == wxDefaultCoord )
+ {
+ wxPoint mouse = ScreenToClient(wxGetMousePosition());
+ x = mouse.x; y = mouse.y;
+ }
+
Widget widget = (Widget) GetMainWidget();
/* The menuId field seems to be usused, so we'll use it to
*/
if (menu->GetParent() && (menu->GetId() != -1))
- return FALSE;
+ return false;
if (menu->GetMainWidget())
{
- menu->DestroyMenu(TRUE);
+ menu->DestroyMenu(true);
}
menu->SetId(1); /* Mark as popped-up */
- menu->CreateMenu(NULL, widget, menu);
+ menu->CreateMenu(NULL, widget, menu, 0);
menu->SetInvokingWindow(this);
menu->UpdateUI();
wxDoEventLoopIteration( evtLoop );
}
- return TRUE;
+ return true;
}
#endif
bool wxWindow::PreResize()
{
- return TRUE;
+ return true;
}
// Get total size
XmNwidth, &xx,
XmNheight, &yy,
NULL );
- if(x) *x = xx;
+ if(x) *x = xx;
if(y) *y = yy;
}
{
Widget widget = (Widget)
( m_drawingArea ?
- ( m_borderWidget ? m_borderWidget : m_scrolledWindow ) :
+ ( m_borderWidget ? m_borderWidget : m_scrolledWindow ) :
GetTopWidget() );
Position xx, yy;
if (GetParent())
{
wxPoint pt(GetParent()->GetClientAreaOrigin());
- xx -= pt.x;
- yy -= pt.y;
+ xx = (Position)(xx - pt.x);
+ yy = (Position)(yy - pt.y);
}
if(x) *x = xx;
void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
- DoSetSizeIntr(x, y, width, height, sizeFlags, FALSE);
+ DoSetSizeIntr(x, y, width, height, sizeFlags, false);
}
void wxWindow::DoSetSizeIntr(int x, int y, int width, int height,
int sizeFlags, bool fromCtor)
{
// A bit of optimization to help sort out the flickers.
- int oldX = -1, oldY = -1, oldW = -1, oldH = -1;
+ int oldX = oldY = oldW = oldH = -1;
+
if( !fromCtor )
{
GetSize(& oldW, & oldH);
y = oldY;
}
- wxSize size(-1, -1);
+ wxSize size(wxDefaultSize);
if ( width <= 0 )
{
if ( ( sizeFlags & wxSIZE_AUTO_WIDTH ) && !fromCtor )
XtVaSetValues(widget, XmNheight, height, NULL);
}
-// For implementation purposes - sometimes decorations make the client area
-// smaller
-wxPoint wxWindow::GetClientAreaOrigin() const
-{
- return wxPoint(0, 0);
-}
-
void wxWindow::DoMoveWindowIntr(int xx, int yy, int w, int h,
int flags)
{
w -= 2 * (thick + margin);
}
+ if( w < 1 ) w = 1;
XtVaSetValues ((Widget) m_scrolledWindow, XmNwidth, w, NULL);
}
h -= 2 * (thick + margin);
}
+ if( h < 1 ) h = 1;
XtVaSetValues ((Widget) m_scrolledWindow, XmNheight, h, NULL);
}
}
else
{
+ if( xx < 0 ) xx = 0;
+ if( yy < 0 ) yy = 0;
if( w < 1 ) w = 1;
if( h < 1 ) h = 1;
{
wxCHECK_MSG( m_font.Ok(), 0, "valid window font needed" );
- WXFontStructPtr pFontStruct = m_font.GetFontStruct(1.0, GetXDisplay());
+ int height;
- int direction, ascent, descent;
- XCharStruct overall;
- XTextExtents ((XFontStruct*) pFontStruct, "x", 1, &direction, &ascent,
- &descent, &overall);
+ wxGetTextExtent (GetXDisplay(), m_font, 1.0,
+ "x", NULL, &height, NULL, NULL);
- // return (overall.ascent + overall.descent);
- return (ascent + descent);
+ return height;
}
int wxWindow::GetCharWidth() const
{
wxCHECK_MSG( m_font.Ok(), 0, "valid window font needed" );
- WXFontStructPtr pFontStruct = m_font.GetFontStruct(1.0, GetXDisplay());
+ int width;
- int direction, ascent, descent;
- XCharStruct overall;
- XTextExtents ((XFontStruct*) pFontStruct, "x", 1, &direction, &ascent,
- &descent, &overall);
+ wxGetTextExtent (GetXDisplay(), m_font, 1.0,
+ "x", &width, NULL, NULL, NULL);
- return overall.width;
+ return width;
}
void wxWindow::GetTextExtent(const wxString& string,
int *descent, int *externalLeading,
const wxFont *theFont) const
{
- wxFont *fontToUse = (wxFont *)theFont;
- if (!fontToUse)
- fontToUse = (wxFont *) & m_font;
+ const wxFont *fontToUse = theFont ? theFont : &m_font;
wxCHECK_RET( fontToUse->Ok(), "valid window font needed" );
-
- WXFontStructPtr pFontStruct = fontToUse->GetFontStruct(1.0, GetXDisplay());
- int direction, ascent, descent2;
- XCharStruct overall;
- int slen = string.Len();
-
-#if 0
- if (use16)
- XTextExtents16((XFontStruct*) pFontStruct, (XChar2b *) (char*) (const char*) string, slen, &direction,
- &ascent, &descent2, &overall);
-#endif
-
- XTextExtents((XFontStruct*) pFontStruct, string, slen,
- &direction, &ascent, &descent2, &overall);
-
- if ( x )
- *x = (overall.width);
- if ( y )
- *y = (ascent + descent2);
- if (descent)
- *descent = descent2;
if (externalLeading)
*externalLeading = 0;
-
+ wxGetTextExtent (GetXDisplay(), *fontToUse, 1.0,
+ string, x, y, NULL, descent);
}
// ----------------------------------------------------------------------------
void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
{
- m_needsRefresh = TRUE;
+ m_needsRefresh = true;
Display *display = XtDisplay((Widget) GetMainWidget());
Window thisWindow = XtWindow((Widget) GetMainWidget());
XSendEvent(display, thisWindow, False, ExposureMask, (XEvent *)&dummyEvent);
}
-void wxWindow::Clear()
-{
- wxClientDC dc(this);
- wxBrush brush(GetBackgroundColour(), wxSOLID);
- dc.SetBackground(brush);
- dc.Clear();
-}
-
void wxWindow::DoPaint()
{
//TODO : make a temporary gc so we can do the XCopyArea below
// otherwise we don't know how many pixels have been scrolled. We might
// solve this in the future by defining virtual wxWindow functions to get
// the scroll position in pixels. Or, each kind of scrolled window has to
- // implement backing stores itself, using generic wxWindows code.
+ // implement backing stores itself, using generic wxWidgets code.
wxScrolledWindow* scrolledWindow = wxDynamicCast(this, wxScrolledWindow);
if ( scrolledWindow )
{
event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event);
- m_needsRefresh = FALSE;
+ m_needsRefresh = false;
}
}
// Responds to colour changes: passes event on to children.
void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event)
{
- wxWindowList::Node *node = GetChildren().GetFirst();
+ wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
while ( node )
{
// Only propagate to non-top-level windows
if ( win->GetParent() )
{
wxSysColourChangedEvent event2;
- event.m_eventObject = win;
+ event.SetEventObject(win);
win->GetEventHandler()->ProcessEvent(event2);
}
{
#if wxUSE_ACCEL
if (!m_acceleratorTable.Ok())
- return FALSE;
+ return false;
int count = m_acceleratorTable.GetCount();
wxAcceleratorEntry* entries = m_acceleratorTable.GetEntries();
parent = parent->GetParent();
if (!parent)
- return FALSE;
+ return false;
wxFrame* frame = wxDynamicCast(parent, wxFrame);
if ( frame )
wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, entry->GetCommand());
commandEvent.SetEventObject(frame);
- // If ProcessEvent returns TRUE (it was handled), then
+ // If ProcessEvent returns true (it was handled), then
// the calling code will skip the event handling.
return frame->GetEventHandler()->ProcessEvent(commandEvent);
}
// No such child
if (!child)
- return FALSE;
+ return false;
// Now we process those kinds of windows that we can.
// For now, only buttons.
return child->GetEventHandler()->ProcessEvent(commandEvent);
}
- return FALSE;
+ return false;
} // matches event
}// for
#endif
// We didn't match the key event against an accelerator.
- return FALSE;
+ return false;
}
// ============================================================================
// ============================================================================
// ----------------------------------------------------------------------------
-// function which maintain the global hash table mapping Widgets to wxWindows
+// function which maintain the global hash table mapping Widgets to wxWidgets
// ----------------------------------------------------------------------------
bool wxAddWindowToTable(Widget w, wxWindow *win)
{
- wxWindow *oldItem = NULL;
- if ((oldItem = (wxWindow *)wxWidgetHashTable->Get ((long) w)))
+ const long key = (long)w;
+ if ( wxWidgetHashTable->Get(key))
{
wxLogDebug("Widget table clash: new widget is %ld, %s",
- (long)w, win->GetClassInfo()->GetClassName());
- return FALSE;
+ key, win->GetClassInfo()->GetClassName());
+ return false;
}
- wxWidgetHashTable->Put((long) w, win);
+ wxWidgetHashTable->Put(key, win);
wxLogTrace("widget", "Widget 0x%p <-> window %p (%s)",
- (WXWidget)w, win, win->GetClassInfo()->GetClassName());
+ w, win, win->GetClassInfo()->GetClassName());
- return TRUE;
+ return true;
}
wxWindow *wxGetWindowFromTable(Widget w)
if (formWidget)
{
if (!wxAddWindowToTable((Widget) formWidget, this))
- return FALSE;
+ return false;
XtTranslations ptr;
XtOverrideTranslations ((Widget) formWidget,
x = 0;
if (y == -1)
y = 0;
- SetSize (x, y, width, height);
+ DoSetSize (x, y, width, height, wxSIZE_USE_EXISTING);
- return TRUE;
+ return true;
}
// Remove event handler, remove from hash table
(XtPointer)this);
wxDeleteWindowFromTable((Widget) widget);
- return TRUE;
+ return true;
}
// ----------------------------------------------------------------------------
// Motif-specific accessors
// ----------------------------------------------------------------------------
+WXWindow wxWindow::GetClientXWindow() const
+{
+ Widget wMain = (Widget)GetClientWidget();
+ if ( wMain )
+ return (WXWindow) XtWindow(wMain);
+ else
+ return (WXWindow) 0;
+}
+
// Get the underlying X window
WXWindow wxWindow::GetXWindow() const
{
if (win->PreResize())
{
- int width, height;
- win->GetSize(&width, &height);
- wxSizeEvent sizeEvent(wxSize(width, height), win->GetId());
+ wxSize newSize(win->GetSize());
+ wxSizeEvent sizeEvent(newSize, win->GetId());
sizeEvent.SetEventObject(win);
win->GetEventHandler()->ProcessEvent(sizeEvent);
}
XmDrawingAreaCallbackStruct * cbs)
{
wxWindow *canvas = wxGetWindowFromTable(drawingArea);
- XEvent local_event;
+ XEvent* xevent = cbs->event;
if (canvas==NULL)
return;
if (cbs->reason != XmCR_INPUT)
return;
- local_event = *(cbs->event); // We must keep a copy!
-
- switch (local_event.xany.type)
+ switch (xevent->xany.type)
{
case EnterNotify:
case LeaveNotify:
case ButtonPress:
case ButtonRelease:
case MotionNotify:
- {
- wxMouseEvent wxevent;
- if(wxTranslateMouseEvent(wxevent, canvas, drawingArea, &local_event))
{
- canvas->GetEventHandler()->ProcessEvent(wxevent);
+ wxMouseEvent wxevent(0);
+ if (wxTranslateMouseEvent(wxevent, canvas, drawingArea, xevent))
+ {
+ canvas->GetEventHandler()->ProcessEvent(wxevent);
+ }
+ break;
}
- break;
- }
case KeyPress:
{
wxKeyEvent event (wxEVT_CHAR);
- if (wxTranslateKeyEvent (event, canvas, (Widget) 0, &local_event))
+ if (wxTranslateKeyEvent (event, canvas, (Widget) 0, xevent))
{
// Implement wxFrame::OnCharHook by checking ancestor.
wxWindow *parent = canvas;
case KeyRelease:
{
wxKeyEvent event (wxEVT_KEY_UP);
- if (wxTranslateKeyEvent (event, canvas, (Widget) 0, &local_event))
+ if (wxTranslateKeyEvent (event, canvas, (Widget) 0, xevent))
{
canvas->GetEventHandler()->ProcessEvent (event);
}
}
case FocusIn:
{
- if (local_event.xfocus.detail != NotifyPointer)
+ if (xevent->xfocus.detail != NotifyPointer)
{
wxFocusEvent event(wxEVT_SET_FOCUS, canvas->GetId());
event.SetEventObject(canvas);
}
case FocusOut:
{
- if (local_event.xfocus.detail != NotifyPointer)
+ if (xevent->xfocus.detail != NotifyPointer)
{
wxFocusEvent event(wxEVT_KILL_FOCUS, canvas->GetId());
event.SetEventObject(canvas);
}
// TODO: probably the key to allowing default behaviour to happen. Say we
- // set a m_doDefault flag to FALSE at the start of this function. Then in
+ // set a m_doDefault flag to false at the start of this function. Then in
// e.g. wxWindow::OnMouseEvent we can call Default() which sets this flag to
- // TRUE, indicating that default processing can happen. Thus, behaviour can
+ // true, indicating that default processing can happen. Thus, behaviour can
// appear to be overridden just by adding an event handler and not calling
// wxWindow::OnWhatever. ALSO, maybe we can use this instead of the current
// way of handling drawing area events, to simplify things.
XmScrollBarCallbackStruct *cbs)
{
wxWindow *win = wxGetWindowFromTable(scrollbar);
- wxOrientation orientation = (wxOrientation)(int)clientData;
+ wxOrientation orientation = (wxOrientation)wxPtrToUInt(clientData);
wxEventType eventType = wxEVT_NULL;
switch (cbs->reason)
// For repainting arbitrary windows
void wxUniversalRepaintProc(Widget w, XtPointer WXUNUSED(c_data), XEvent *event, char *)
{
- Window window;
- Display *display;
-
wxWindow* win = wxGetWindowFromTable(w);
if (!win)
return;
- switch(event -> type)
+ switch ( event->type )
{
- case Expose:
+ case Expose:
{
- window = (Window) win -> GetXWindow();
- display = (Display *) win -> GetXDisplay();
-
win->AddUpdateRect(event->xexpose.x, event->xexpose.y,
event->xexpose.width, event->xexpose.height);
- if (event -> xexpose.count == 0)
+ if ( event->xexpose.count == 0 )
{
win->DoPaint();
}
// ----------------------------------------------------------------------------
bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win,
- Widget widget, XEvent *xevent)
+ Widget widget, const XEvent *xevent)
{
switch (xevent->xany.type)
{
case ButtonRelease:
case MotionNotify:
{
+ int eventx = xevent->xbutton.x, eventy = xevent->xbutton.y;
+
wxEventType eventType = wxEVT_NULL;
if (xevent->xany.type == LeaveNotify)
else if (xevent->xany.type == MotionNotify)
{
eventType = wxEVT_MOTION;
+
+ if (xevent->xmotion.is_hint == NotifyHint)
+ {
+ Window root, child;
+ int x_root, y_root;
+ unsigned int state;
+ Display *dpy = XtDisplay (widget);
+
+ XQueryPointer (dpy, XtWindow (widget),
+ &root, &child,
+ &x_root, &y_root, &eventx, &eventy, &state);
+ }
}
else if (xevent->xany.type == ButtonPress)
{
eventType = wxEVT_RIGHT_UP;
}
else
- return FALSE;
+ return false;
}
else
{
- return FALSE;
+ return false;
}
wxevent.SetEventType(eventType);
int x2, y2;
win->GetPosition(&x2, &y2);
- // The button x/y must be translated to wxWindows
+ // The button x/y must be translated to wxWidgets
// window space - the widget might be a label or button,
// within a form.
int dx = 0;
dy = y1;
}
- wxevent.m_x = xevent->xbutton.x + dx;
- wxevent.m_y = xevent->xbutton.y + dy;
+ wxevent.m_x = eventx + dx;
+ wxevent.m_y = eventy + dy;
wxevent.m_leftDown = ((eventType == wxEVT_LEFT_DOWN)
|| (event_left_is_down (xevent)
|| (event_right_is_down (xevent)
&& (eventType != wxEVT_RIGHT_UP)));
- wxevent.m_shiftDown = xevent->xbutton.state & ShiftMask;
- wxevent.m_controlDown = xevent->xbutton.state & ControlMask;
- wxevent.m_altDown = xevent->xbutton.state & Mod3Mask;
- wxevent.m_metaDown = xevent->xbutton.state & Mod1Mask;
+ wxevent.m_shiftDown = (xevent->xbutton.state & ShiftMask) == ShiftMask;
+ wxevent.m_controlDown = (xevent->xbutton.state & ControlMask) == ControlMask;
+ wxevent.m_altDown = (xevent->xbutton.state & Mod3Mask) == Mod3Mask;
+ wxevent.m_metaDown = (xevent->xbutton.state & Mod1Mask) == Mod1Mask;
wxevent.SetId(win->GetId());
wxevent.SetEventObject(win);
- return TRUE;
+ return true;
}
}
- return FALSE;
+ return false;
}
bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win,
- Widget WXUNUSED(widget), XEvent *xevent)
+ Widget WXUNUSED(widget), const XEvent *xevent)
{
switch (xevent->xany.type)
{
id = toupper(id);
if (xevent->xkey.state & ShiftMask)
- wxevent.m_shiftDown = TRUE;
+ wxevent.m_shiftDown = true;
if (xevent->xkey.state & ControlMask)
- wxevent.m_controlDown = TRUE;
+ wxevent.m_controlDown = true;
if (xevent->xkey.state & Mod3Mask)
- wxevent.m_altDown = TRUE;
+ wxevent.m_altDown = true;
if (xevent->xkey.state & Mod1Mask)
- wxevent.m_metaDown = TRUE;
+ wxevent.m_metaDown = true;
wxevent.SetEventObject(win);
wxevent.m_keyCode = id;
wxevent.SetTimestamp(xevent->xkey.time);
wxevent.m_y = xevent->xbutton.y;
if (id > -1)
- return TRUE;
- else
- return FALSE;
- break;
+ return true;
+
+ return false;
}
default:
break;
}
- return FALSE;
+ return false;
}
// ----------------------------------------------------------------------------
#define YAllocColor XAllocColor
XColor g_itemColors[5];
-int wxComputeColours (Display *display, wxColour * back, wxColour * fore)
+int wxComputeColours (Display *display, const wxColour * back, const wxColour * fore)
{
int result;
static XmColorProc colorProc;
if (back)
{
- g_itemColors[0].red = (((long) back->Red ()) << 8);
- g_itemColors[0].green = (((long) back->Green ()) << 8);
- g_itemColors[0].blue = (((long) back->Blue ()) << 8);
+ g_itemColors[0].red = (unsigned short)(((long) back->Red ()) << 8);
+ g_itemColors[0].green = (unsigned short)(((long) back->Green ()) << 8);
+ g_itemColors[0].blue = (unsigned short)(((long) back->Blue ()) << 8);
g_itemColors[0].flags = DoRed | DoGreen | DoBlue;
if (colorProc == (XmColorProc) NULL)
{
}
if (fore)
{
- g_itemColors[wxFORE_INDEX].red = (((long) fore->Red ()) << 8);
- g_itemColors[wxFORE_INDEX].green = (((long) fore->Green ()) << 8);
- g_itemColors[wxFORE_INDEX].blue = (((long) fore->Blue ()) << 8);
+ g_itemColors[wxFORE_INDEX].red = (unsigned short)(((long) fore->Red ()) << 8);
+ g_itemColors[wxFORE_INDEX].green = (unsigned short)(((long) fore->Green ()) << 8);
+ g_itemColors[wxFORE_INDEX].blue = (unsigned short)(((long) fore->Blue ()) << 8);
g_itemColors[wxFORE_INDEX].flags = DoRed | DoGreen | DoBlue;
if (result == wxNO_COLORS)
result = wxFORE_COLORS;
WXWidget mainWidget = GetMainWidget();
if ( mainWidget )
wxDoChangeBackgroundColour(mainWidget, m_backgroundColour);
+ if ( m_scrolledWindow && mainWidget != m_scrolledWindow )
+ wxDoChangeForegroundColour(m_scrolledWindow, m_backgroundColour);
}
void wxWindow::ChangeForegroundColour()
bool wxWindow::SetBackgroundColour(const wxColour& col)
{
if ( !wxWindowBase::SetBackgroundColour(col) )
- return FALSE;
+ return false;
ChangeBackgroundColour();
- return TRUE;
+ return true;
}
bool wxWindow::SetForegroundColour(const wxColour& col)
{
if ( !wxWindowBase::SetForegroundColour(col) )
- return FALSE;
+ return false;
ChangeForegroundColour();
- return TRUE;
+ return true;
}
void wxWindow::ChangeFont(bool keepOriginalSize)
GetSize(& width1, & height1);
if (keepOriginalSize && (width != width1 || height != height1))
{
- SetSize(-1, -1, width, height);
+ SetSize(wxDefaultCoord, wxDefaultCoord, width, height);
}
}
}
// position.
wxWindow* wxFindWindowAtPointer(wxPoint& pt)
{
- return wxFindWindowAtPoint(wxGetMousePosition());
+ pt = wxGetMousePosition();
+ return wxFindWindowAtPoint(pt);
}
// Get the current mouse position.
// ----------------------------------------------------------------------------
int wxNoOptimize::ms_count = 0;
-
projects / wxWidgets.git / blobdiff