#include "wx/dcclient.h"
#include "wx/utils.h"
#include "wx/app.h"
-#include "wx/panel.h"
#include "wx/layout.h"
-#include "wx/dialog.h"
-#include "wx/listbox.h"
#include "wx/button.h"
#include "wx/settings.h"
-#include "wx/msgdlg.h"
#include "wx/frame.h"
#include "wx/scrolwin.h"
#include "wx/module.h"
#include "wx/dnd.h"
#endif
-// DoSetSizeIntr and CanvasSetSizeIntr
+// DoSetSizeIntr and DoMoveWindowIntr
// PROBLEM:
// under Motif composite controls (such as wxCalendarCtrl or generic wxSpinCtrl
-// don't work and/or segfault because
+// did nott 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)
// SOLUTION:
// 1) don't call SetSize, DoSetSize, DoMoveWindow, DoGetPosition,
// DoSetPosition directly or indirectly from wxWindow::Create
-// 2) call DoMoveWindow from DoSetSize, allowing controls to override it,
-// but make wxWindow::DoMoveWindow a no-op if it is called from
-// an overridden DoMoveWindow (i.e. wxFoo::DoMoveWindow calls
-// wxWindow::DoMoveWindow; this is to preserve the behaviour
-// before this change
+// 2) call DoMoveWindow from DoSetSize, allowing controls to override it
#ifdef __VMS__
#pragma message disable nosimpint
if ( !w )
return FALSE;
- if ( domap )
- XtMapWidget(w);
- else
- XtUnmapWidget(w);
-
// Rationale: a lot of common operations (including but not
// limited to moving, resizing and appending items to a listbox)
// unmamange the widget, do their work, then manage it again.
// or that most controls are shown every time they are moved or resized!
XtSetMappedWhenManaged( w, domap );
+ // if the widget is not unmanaged, it still intercepts
+ // mouse events, even if it is not mapped (and hence invisible)
+ if ( domap )
+ {
+ XtManageChild(w);
+ // XtMapWidget(w);
+ }
+ else
+ {
+ XtUnmanageChild(w);
+ // XtUnmapWidget(w);
+ }
+
return TRUE;
}
m_needsRefresh = TRUE;
m_mainWidget = (WXWidget) 0;
- m_button1Pressed =
- m_button2Pressed =
- m_button3Pressed = FALSE;
-
m_winCaptured = FALSE;
m_isShown = TRUE;
m_scrolledWindow =
m_drawingArea = (WXWidget) 0;
- m_hScroll =
- m_vScroll = FALSE;
-
m_scrollPosX =
m_scrollPosY = 0;
m_lastTS = 0;
m_lastButton = 0;
- m_canAddEventHandler = FALSE;
}
// real construction (Init() must have been called before!)
XtAppAddActions ((XtAppContext) wxTheApp->GetAppContext(), actions, 1);
Widget parentWidget = (Widget) parent->GetClientWidget();
-
- if (style & wxSIMPLE_BORDER)
- {
- m_borderWidget = (WXWidget)XtVaCreateManagedWidget
- (
- "canvasBorder",
- xmFrameWidgetClass, parentWidget,
- XmNshadowType, XmSHADOW_IN,
- XmNshadowThickness, 1,
- NULL
- );
- } else if (style & wxSUNKEN_BORDER)
- {
- m_borderWidget = (WXWidget)XtVaCreateManagedWidget
- (
- "canvasBorder",
- xmFrameWidgetClass, parentWidget,
- XmNshadowType, XmSHADOW_IN,
- NULL
- );
- } else if (style & wxRAISED_BORDER)
- {
- m_borderWidget = (WXWidget)XtVaCreateManagedWidget
- (
- "canvasBorder",
- xmFrameWidgetClass, parentWidget,
- XmNshadowType, XmSHADOW_OUT,
- NULL
- );
- }
+ m_borderWidget = wxCreateBorderWidget( (WXWidget)parentWidget, style );
m_scrolledWindow = (WXWidget)XtVaCreateManagedWidget
(
XtAddCallback ((Widget) m_drawingArea, XmNexposeCallback, (XtCallbackProc) wxCanvasRepaintProc, (XtPointer) this);
XtAddCallback ((Widget) m_drawingArea, XmNinputCallback, (XtCallbackProc) wxCanvasInputEvent, (XtPointer) this);
- // TODO?
-#if 0
- display = XtDisplay (scrolledWindow);
- xwindow = XtWindow (drawingArea);
-#endif // 0
-
XtAddEventHandler(
(Widget)m_drawingArea,
PointerMotionHintMask | EnterWindowMask |
// 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);
- DoChangeBackgroundColour(m_scrolledWindow, backgroundColour, TRUE);
- DoChangeBackgroundColour(m_drawingArea, backgroundColour, TRUE);
+ wxDoChangeBackgroundColour(m_scrolledWindow, backgroundColour, TRUE);
+ wxDoChangeBackgroundColour(m_drawingArea, backgroundColour, TRUE);
XmScrolledWindowSetAreas(
(Widget)m_scrolledWindow,
(Widget) 0, (Widget) 0,
(Widget) m_drawingArea);
-#if 0
- if (m_hScrollBar)
- XtRealizeWidget ((Widget) m_hScrollBar);
- if (m_vScrollBar)
- XtRealizeWidget ((Widget) m_vScrollBar);
-#endif // 0
-
// Without this, the cursor may not be restored properly (e.g. in splitter
// sample).
SetCursor(*wxSTANDARD_CURSOR);
DetachWidget(wMain);
}
- ClearUpdateRects();
-
if ( m_parent )
m_parent->RemoveChild( this );
// scrollbar management
// ----------------------------------------------------------------------------
+WXWidget wxWindow::DoCreateScrollBar(WXWidget parent,
+ wxOrientation orientation,
+ void (*callback)())
+{
+ int orient = ( orientation & wxHORIZONTAL ) ? XmHORIZONTAL : XmVERTICAL;
+ Widget sb =
+ XtVaCreateManagedWidget( "scrollBarWidget",
+ xmScrollBarWidgetClass, (Widget)parent,
+ XmNorientation, orient,
+ XmNincrement, 1,
+ XmNvalue, 0,
+ NULL );
+
+ XtPointer o = (XtPointer)orientation;
+ XtCallbackProc cb = (XtCallbackProc)callback;
+
+ XtAddCallback( sb, XmNvalueChangedCallback, cb, o );
+ XtAddCallback( sb, XmNdragCallback, cb, o );
+ XtAddCallback( sb, XmNincrementCallback, cb, o );
+ XtAddCallback( sb, XmNdecrementCallback, cb, o );
+ XtAddCallback( sb, XmNpageIncrementCallback, cb, o );
+ XtAddCallback( sb, XmNpageDecrementCallback, cb, o );
+ XtAddCallback( sb, XmNtoTopCallback, cb, o );
+ XtAddCallback( sb, XmNtoBottomCallback, cb, o );
+
+ return (WXWidget)sb;
+}
+
// Helper function
void wxWindow::CreateScrollbar(wxOrientation orientation)
{
wxCHECK_RET( m_drawingArea, "this window can't have scrollbars" );
- XtVaSetValues((Widget) m_scrolledWindow, XmNresizePolicy, XmRESIZE_NONE, NULL);
+ XtVaSetValues( (Widget) m_scrolledWindow,
+ XmNresizePolicy, XmRESIZE_NONE,
+ NULL );
+ wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
// Add scrollbars if required
if (orientation == wxHORIZONTAL)
{
- Widget hScrollBar = XtVaCreateManagedWidget ("hsb",
- xmScrollBarWidgetClass, (Widget) m_scrolledWindow,
- XmNorientation, XmHORIZONTAL,
- NULL);
- XtAddCallback (hScrollBar, XmNvalueChangedCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
- XtAddCallback (hScrollBar, XmNdragCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
- XtAddCallback (hScrollBar, XmNincrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
- XtAddCallback (hScrollBar, XmNdecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
- XtAddCallback (hScrollBar, XmNpageIncrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
- XtAddCallback (hScrollBar, XmNpageDecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
- XtAddCallback (hScrollBar, XmNtoTopCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
- XtAddCallback (hScrollBar, XmNtoBottomCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
-
- XtVaSetValues (hScrollBar,
- XmNincrement, 1,
- XmNvalue, 0,
- NULL);
-
- m_hScrollBar = (WXWidget) hScrollBar;
+ m_hScrollBar = DoCreateScrollBar( m_scrolledWindow, wxHORIZONTAL,
+ (void (*)())wxScrollBarCallback );
- wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
- DoChangeBackgroundColour(m_hScrollBar, backgroundColour, TRUE);
+ wxDoChangeBackgroundColour(m_hScrollBar, backgroundColour, TRUE);
- XtRealizeWidget(hScrollBar);
+ XtRealizeWidget( (Widget)m_hScrollBar );
XtVaSetValues((Widget) m_scrolledWindow,
XmNhorizontalScrollBar, (Widget) m_hScrollBar,
NULL);
- m_hScroll = TRUE;
-
- wxAddWindowToTable( hScrollBar, this );
+ wxAddWindowToTable( (Widget)m_hScrollBar, this );
}
-
- if (orientation == wxVERTICAL)
+ else if (orientation == wxVERTICAL)
{
- Widget vScrollBar = XtVaCreateManagedWidget ("vsb",
- xmScrollBarWidgetClass, (Widget) m_scrolledWindow,
- XmNorientation, XmVERTICAL,
- NULL);
- XtAddCallback (vScrollBar, XmNvalueChangedCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
- XtAddCallback (vScrollBar, XmNdragCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
- XtAddCallback (vScrollBar, XmNincrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
- XtAddCallback (vScrollBar, XmNdecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
- XtAddCallback (vScrollBar, XmNpageIncrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
- XtAddCallback (vScrollBar, XmNpageDecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
- XtAddCallback (vScrollBar, XmNtoTopCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
- XtAddCallback (vScrollBar, XmNtoBottomCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
-
- XtVaSetValues (vScrollBar,
- XmNincrement, 1,
- XmNvalue, 0,
- NULL);
+ m_vScrollBar = DoCreateScrollBar( m_scrolledWindow, wxVERTICAL,
+ (void (*)())wxScrollBarCallback );
- m_vScrollBar = (WXWidget) vScrollBar;
- wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
- DoChangeBackgroundColour(m_vScrollBar, backgroundColour, TRUE);
+ wxDoChangeBackgroundColour(m_vScrollBar, backgroundColour, TRUE);
- XtRealizeWidget(vScrollBar);
+ XtRealizeWidget((Widget)m_vScrollBar);
XtVaSetValues((Widget) m_scrolledWindow,
XmNverticalScrollBar, (Widget) m_vScrollBar,
NULL);
- m_vScroll = TRUE;
-
- wxAddWindowToTable( vScrollBar, this );
+ wxAddWindowToTable( (Widget)m_vScrollBar, this );
}
- XtVaSetValues((Widget) m_scrolledWindow, XmNresizePolicy, XmRESIZE_ANY, NULL);
+ XtVaSetValues( (Widget) m_scrolledWindow,
+ XmNresizePolicy, XmRESIZE_ANY,
+ NULL );
}
void wxWindow::DestroyScrollbar(wxOrientation orientation)
{
wxCHECK_RET( m_drawingArea, "this window can't have scrollbars" );
- XtVaSetValues((Widget) m_scrolledWindow, XmNresizePolicy, XmRESIZE_NONE, NULL);
- // Add scrollbars if required
- if (orientation == wxHORIZONTAL)
- {
- if (m_hScrollBar)
- {
- wxDeleteWindowFromTable((Widget)m_hScrollBar);
- XtDestroyWidget((Widget) m_hScrollBar);
- }
- m_hScrollBar = (WXWidget) 0;
- m_hScroll = FALSE;
-
- XtVaSetValues((Widget) m_scrolledWindow,
- XmNhorizontalScrollBar, (Widget) 0,
- NULL);
-
- }
+ XtVaSetValues((Widget) m_scrolledWindow,
+ XmNresizePolicy, XmRESIZE_NONE,
+ NULL);
+ String stringSB = orientation == wxHORIZONTAL ?
+ XmNhorizontalScrollBar : XmNverticalScrollBar;
+ WXWidget* widgetSB = orientation == wxHORIZONTAL ?
+ &m_hScrollBar : &m_vScrollBar;
- if (orientation == wxVERTICAL)
+ if( *widgetSB )
{
- if (m_vScrollBar)
- {
- wxDeleteWindowFromTable((Widget)m_vScrollBar);
- XtDestroyWidget((Widget) m_vScrollBar);
- }
- m_vScrollBar = (WXWidget) 0;
- m_vScroll = FALSE;
+ wxDeleteWindowFromTable( (Widget)*widgetSB );
+ XtDestroyWidget( (Widget)*widgetSB );
+ *widgetSB = (WXWidget)NULL;
+ }
- XtVaSetValues((Widget) m_scrolledWindow,
- XmNverticalScrollBar, (Widget) 0,
- NULL);
+ XtVaSetValues( (Widget)m_scrolledWindow,
+ stringSB, (Widget) 0,
+ NULL );
- }
- XtVaSetValues((Widget) m_scrolledWindow, XmNresizePolicy, XmRESIZE_ANY, NULL);
+ XtVaSetValues((Widget) m_scrolledWindow,
+ XmNresizePolicy, XmRESIZE_ANY,
+ NULL);
}
// ---------------------------------------------------------------------------
if (m_borderWidget || m_scrolledWindow)
{
- MapOrUnmap(m_drawingArea, show);
MapOrUnmap(m_borderWidget ? m_borderWidget : m_scrolledWindow, show);
+ // MapOrUnmap(m_drawingArea, show);
}
else
{
MapOrUnmap(GetMainWidget(), show);
}
-#if 0
- Window xwin = (Window) GetXWindow();
- Display *xdisp = (Display*) GetXDisplay();
- if (show)
- XMapWindow(xdisp, xwin);
- else
- XUnmapWindow(xdisp, xwin);
-#endif
-
return TRUE;
}
GetClientSize(& w, & h);
}
- wxWindowList::Node *cnode = m_children.GetFirst();
- while (cnode)
- {
- wxWindow *child = cnode->GetData();
- int sx = 0;
- int sy = 0;
- child->GetSize( &sx, &sy );
- wxPoint pos( child->GetPosition() );
- child->SetSize( pos.x + dx, pos.y + dy, sx, sy, wxSIZE_ALLOW_MINUS_ONE );
- cnode = cnode->GetNext();
- }
-
int x1 = (dx >= 0) ? x : x - dx;
int y1 = (dy >= 0) ? y : y - dy;
int w1 = w - abs(dx);
wxBrush brush(GetBackgroundColour(), wxSOLID);
dc.SetBrush(brush); // FIXME: needed?
+ wxWindowList::Node *cnode = m_children.GetFirst();
+ while (cnode)
+ {
+ wxWindow *child = cnode->GetData();
+ int sx = 0;
+ int sy = 0;
+ child->GetSize( &sx, &sy );
+ wxPoint pos( child->GetPosition() );
+ child->SetSize( pos.x + dx, pos.y + dy, sx, sy, wxSIZE_ALLOW_MINUS_ONE );
+ cnode = cnode->GetNext();
+ }
+
// We'll add rectangles to the list of update rectangles according to which
// bits we've exposed.
wxList updateRects;
// Get total size
void wxWindow::DoGetSize(int *x, int *y) const
{
- if (m_drawingArea)
- {
- CanvasGetSize(x, y);
- return;
- }
-
- Widget widget = (Widget) GetTopWidget();
+ Widget widget = (Widget)( !m_drawingArea ? GetTopWidget() :
+ ( m_borderWidget ? m_borderWidget :
+ m_scrolledWindow ? m_scrolledWindow :
+ m_drawingArea ) );
Dimension xx, yy;
- XtVaGetValues(widget, XmNwidth, &xx, XmNheight, &yy, NULL);
- if(x) *x = xx; if(y) *y = yy;
+
+ XtVaGetValues( widget,
+ XmNwidth, &xx,
+ XmNheight, &yy,
+ NULL );
+ if(x) *x = xx;
+ if(y) *y = yy;
}
void wxWindow::DoGetPosition(int *x, int *y) const
{
- if (m_drawingArea)
- {
- CanvasGetPosition(x, y);
- return;
- }
- Widget widget = (Widget) GetTopWidget();
+ Widget widget = (Widget)
+ ( m_drawingArea ?
+ ( m_borderWidget ? m_borderWidget : m_scrolledWindow ) :
+ GetTopWidget() );
+
Position xx, yy;
XtVaGetValues(widget, XmNx, &xx, XmNy, &yy, NULL);
yy -= pt.y;
}
- if(x) *x = xx; if(y) *y = yy;
+ if(x) *x = xx;
+ if(y) *y = yy;
}
void wxWindow::DoScreenToClient(int *x, int *y) const
y = oldY;
}
+ wxSize size(-1, -1);
if ( width <= 0 )
- width = oldW;
- if ( height <= 0 )
- height = oldH;
-
- bool nothingChanged = (x == oldX) && (y == oldY) &&
- (width == oldW) && (height == oldH);
+ {
+ if ( ( sizeFlags & wxSIZE_AUTO_WIDTH ) && !fromCtor )
+ {
+ size = DoGetBestSize();
+ width = size.x;
+ }
+ else
+ {
+ width = oldW;
+ }
+ }
- if (!wxNoOptimize::CanOptimize())
+ if ( height == -1 )
{
- nothingChanged = FALSE;
+ if( ( sizeFlags & wxSIZE_AUTO_HEIGHT ) && !fromCtor )
+ {
+ if( size.x == -1 ) size = DoGetBestSize();
+ height = size.y;
+ }
+ else
+ {
+ height = oldH;
+ }
}
- if ( !nothingChanged )
+ if ( x != oldX || y != oldY || width != oldW || height != oldH
+ || !wxNoOptimize::CanOptimize() )
{
if (m_drawingArea)
{
- CanvasSetSizeIntr(x, y, width, height, sizeFlags, fromCtor);
- if( !fromCtor ) DoMoveWindow(x, y, width, height);
+ int flags = 0;
+
+ if (x > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+ flags |= wxMOVE_X;
+
+ if (y > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+ flags |= wxMOVE_Y;
+
+ if (width > 0)
+ flags |= wxMOVE_WIDTH;
+
+ if (height > 0)
+ flags |= wxMOVE_HEIGHT;
+
+ int xx = x; int yy = y;
+ AdjustForParentClientOrigin(xx, yy, sizeFlags);
+ if( !fromCtor )
+ DoMoveWindow( xx, yy, width, height );
+ else
+ DoMoveWindowIntr( xx, yy, width, height, flags );
+
return;
}
{
if (m_drawingArea)
{
- CanvasSetClientSize(width, height);
+ Widget drawingArea = (Widget) m_drawingArea;
+
+ XtVaSetValues(drawingArea, XmNresizePolicy, XmRESIZE_ANY, NULL);
+
+ if (width > -1)
+ XtVaSetValues(drawingArea, XmNwidth, width, NULL);
+ if (height > -1)
+ XtVaSetValues(drawingArea, XmNheight, height, NULL);
+
+ XtVaSetValues(drawingArea, XmNresizePolicy, XmRESIZE_NONE, NULL);
return;
}
XtVaSetValues(widget, XmNwidth, width, NULL);
if (height > -1)
XtVaSetValues(widget, XmNheight, height, NULL);
-
- wxSizeEvent sizeEvent(wxSize(width, height), GetId());
- sizeEvent.SetEventObject(this);
-
- GetEventHandler()->ProcessEvent(sizeEvent);
}
// For implementation purposes - sometimes decorations make the client area
return wxPoint(0, 0);
}
-void wxWindow::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW, int incH)
+void wxWindow::DoMoveWindowIntr(int xx, int yy, int w, int h,
+ int flags)
{
- m_minWidth = minW;
- m_minHeight = minH;
- m_maxWidth = maxW;
- m_maxHeight = maxH;
-
- wxFrame *frame = wxDynamicCast(this, wxFrame);
- if ( !frame )
+ if (m_drawingArea)
{
- // TODO what about dialogs?
- return;
- }
+ Widget drawingArea = (Widget) m_drawingArea;
+ Widget borderOrScrolled = m_borderWidget ?
+ (Widget) m_borderWidget :
+ (Widget) m_scrolledWindow;
- Widget widget = (Widget) frame->GetShellWidget();
+ bool managed = XtIsManaged(borderOrScrolled);
+ if (managed)
+ XtUnmanageChild (borderOrScrolled);
+ XtVaSetValues(drawingArea, XmNresizePolicy, XmRESIZE_ANY, NULL);
+
+ if (flags & wxMOVE_X)
+ XtVaSetValues (borderOrScrolled,
+ XmNx, xx,
+ NULL);
+ if (flags & wxMOVE_Y)
+ XtVaSetValues (borderOrScrolled,
+ XmNy, yy,
+ NULL);
+
+ if (flags & wxMOVE_WIDTH)
+ {
+ if (m_borderWidget)
+ {
+ XtVaSetValues ((Widget) m_borderWidget, XmNwidth, w, NULL);
+ short thick, margin;
+ XtVaGetValues ((Widget) m_borderWidget,
+ XmNshadowThickness, &thick,
+ XmNmarginWidth, &margin,
+ NULL);
+ w -= 2 * (thick + margin);
+ }
+
+ XtVaSetValues ((Widget) m_scrolledWindow, XmNwidth, w, NULL);
+ }
+
+ if (flags & wxMOVE_HEIGHT)
+ {
+ if (m_borderWidget)
+ {
+ XtVaSetValues ((Widget) m_borderWidget, XmNheight, h, NULL);
+ short thick, margin;
+ XtVaGetValues ((Widget) m_borderWidget,
+ XmNshadowThickness, &thick,
+ XmNmarginHeight, &margin,
+ NULL);
+ h -= 2 * (thick + margin);
+ }
- if (minW > -1)
- XtVaSetValues(widget, XmNminWidth, minW, NULL);
- if (minH > -1)
- XtVaSetValues(widget, XmNminHeight, minH, NULL);
- if (maxW > -1)
- XtVaSetValues(widget, XmNmaxWidth, maxW, NULL);
- if (maxH > -1)
- XtVaSetValues(widget, XmNmaxHeight, maxH, NULL);
- if (incW > -1)
- XtVaSetValues(widget, XmNwidthInc, incW, NULL);
- if (incH > -1)
- XtVaSetValues(widget, XmNheightInc, incH, NULL);
+ XtVaSetValues ((Widget) m_scrolledWindow, XmNheight, h, NULL);
+ }
+
+ if (managed)
+ XtManageChild (borderOrScrolled);
+ XtVaSetValues(drawingArea, XmNresizePolicy, XmRESIZE_NONE, NULL);
+ }
+ else
+ {
+ if( w < 1 ) w = 1;
+ if( h < 1 ) h = 1;
+
+ XtVaSetValues((Widget)GetTopWidget(),
+ XmNx, xx,
+ XmNy, yy,
+ XmNwidth, w,
+ XmNheight, h,
+ NULL);
+ }
}
void wxWindow::DoMoveWindow(int x, int y, int width, int height)
{
- // see the top of the file, near DoSetSizeIntr
- if (m_drawingArea)
- return;
-
- if (width == 0)
- width = 1;
- if (height == 0)
- height = 1;
-
- XtVaSetValues((Widget)GetTopWidget(),
- XmNx, x,
- XmNy, y,
- XmNwidth, width,
- XmNheight, height,
- NULL);
+ DoMoveWindowIntr (x, y, width, height,
+ wxMOVE_X|wxMOVE_Y|wxMOVE_WIDTH|wxMOVE_HEIGHT);
}
// ---------------------------------------------------------------------------
// painting
// ----------------------------------------------------------------------------
+void wxWindow::AddUpdateRect(int x, int y, int w, int h)
+{
+ m_updateRegion.Union( x, y, w, h );
+}
+
void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
{
m_needsRefresh = TRUE;
dc.Clear();
}
-void wxWindow::ClearUpdateRects()
-{
- wxRectList::Node* node = m_updateRects.GetFirst();
- while (node)
- {
- wxRect* rect = node->GetData();
- delete rect;
- node = node->GetNext();
- }
-
- m_updateRects.Clear();
-}
-
void wxWindow::DoPaint()
{
//TODO : make a temporary gc so we can do the XCopyArea below
}
else
{
+ wxWindowDC dc(this);
// Set an erase event first
- wxEraseEvent eraseEvent(GetId());
+ wxEraseEvent eraseEvent(GetId(), &dc);
eraseEvent.SetEventObject(this);
GetEventHandler()->ProcessEvent(eraseEvent);
{
// This calls the UI-update mechanism (querying windows for
// menu/toolbar/control state information)
- UpdateWindowUI();
+ if (wxUpdateUIEvent::CanUpdate())
+ UpdateWindowUI();
}
// ----------------------------------------------------------------------------
void wxDeleteWindowFromTable(Widget w)
{
+ wxLogTrace("widget", "Widget 0x%p", (WXWidget)w);
+
wxWidgetHashTable->Delete((long)w);
}
WXWidget formWidget, int x, int y, int width, int height)
{
wxAddWindowToTable((Widget) mainWidget, this);
- if (CanAddEventHandler())
- {
- XtAddEventHandler((Widget) mainWidget,
- ButtonPressMask | ButtonReleaseMask | PointerMotionMask, // | KeyPressMask,
- False,
- wxPanelItemEventHandler,
- (XtPointer) this);
- }
+ XtAddEventHandler( (Widget) mainWidget,
+ ButtonPressMask | ButtonReleaseMask
+ | PointerMotionMask,
+ False,
+ wxPanelItemEventHandler,
+ (XtPointer) this);
if (!formWidget)
{
// Remove event handler, remove from hash table
bool wxWindow::DetachWidget(WXWidget widget)
{
- if (CanAddEventHandler())
- {
- XtRemoveEventHandler((Widget) widget,
- ButtonPressMask | ButtonReleaseMask | PointerMotionMask, // | KeyPressMask,
- False,
- wxPanelItemEventHandler,
- (XtPointer)this);
- }
+ XtRemoveEventHandler( (Widget) widget,
+ ButtonPressMask | ButtonReleaseMask
+ | PointerMotionMask,
+ False,
+ wxPanelItemEventHandler,
+ (XtPointer)this);
wxDeleteWindowFromTable((Widget) widget);
return TRUE;
// All widgets should have this as their resize proc.
// OnSize sent to wxWindow via client data.
-void wxWidgetResizeProc(Widget w, XConfigureEvent *WXUNUSED(event), String WXUNUSED(args)[], int *WXUNUSED(num_args))
+void wxWidgetResizeProc(Widget w, XConfigureEvent *WXUNUSED(event),
+ String WXUNUSED(args)[], int *WXUNUSED(num_args))
{
wxWindow *win = wxGetWindowFromTable(w);
if (!win)
{
win->AddUpdateRect(event->xexpose.x, event->xexpose.y,
event->xexpose.width, event->xexpose.height);
-
+
if (event -> xexpose.count == 0)
{
win->DoPaint();
- win->ClearUpdateRects();
}
break;
}
}
// Fix to make it work under Motif 1.0 (!)
-static void wxCanvasMotionEvent (Widget WXUNUSED(drawingArea), XButtonEvent * WXUNUSED(event))
+static void wxCanvasMotionEvent (Widget WXUNUSED(drawingArea),
+ XButtonEvent *WXUNUSED(event))
{
#if XmVersion <= 1000
XmDrawingAreaCallbackStruct cbs;
case ButtonPress:
case ButtonRelease:
case MotionNotify:
+ {
+ wxMouseEvent wxevent;
+ if(wxTranslateMouseEvent(wxevent, canvas, drawingArea, &local_event))
{
- // FIXME: most of this mouse event code is more or less
- // duplicated in wxTranslateMouseEvent
- //
- wxEventType eventType = wxEVT_NULL;
-
- if (local_event.xany.type == EnterNotify)
- {
- //if (local_event.xcrossing.mode!=NotifyNormal)
- // return ; // Ignore grab events
- eventType = wxEVT_ENTER_WINDOW;
- // canvas->GetEventHandler()->OnSetFocus();
- }
- else if (local_event.xany.type == LeaveNotify)
- {
- //if (local_event.xcrossingr.mode!=NotifyNormal)
- // return ; // Ignore grab events
- eventType = wxEVT_LEAVE_WINDOW;
- // canvas->GetEventHandler()->OnKillFocus();
- }
- else if (local_event.xany.type == MotionNotify)
- {
- eventType = wxEVT_MOTION;
- }
-
- else if (local_event.xany.type == ButtonPress)
- {
- if (local_event.xbutton.button == Button1)
- {
- eventType = wxEVT_LEFT_DOWN;
- canvas->SetButton1(TRUE);
- }
- else if (local_event.xbutton.button == Button2)
- {
- eventType = wxEVT_MIDDLE_DOWN;
- canvas->SetButton2(TRUE);
- }
- else if (local_event.xbutton.button == Button3)
- {
- eventType = wxEVT_RIGHT_DOWN;
- canvas->SetButton3(TRUE);
- }
- }
- else if (local_event.xany.type == ButtonRelease)
- {
- if (local_event.xbutton.button == Button1)
- {
- eventType = wxEVT_LEFT_UP;
- canvas->SetButton1(FALSE);
- }
- else if (local_event.xbutton.button == Button2)
- {
- eventType = wxEVT_MIDDLE_UP;
- canvas->SetButton2(FALSE);
- }
- else if (local_event.xbutton.button == Button3)
- {
- eventType = wxEVT_RIGHT_UP;
- canvas->SetButton3(FALSE);
- }
- }
-
- wxMouseEvent wxevent (eventType);
-
- wxevent.m_leftDown = ((eventType == wxEVT_LEFT_DOWN)
- || (event_left_is_down (&local_event)
- && (eventType != wxEVT_LEFT_UP)));
- wxevent.m_middleDown = ((eventType == wxEVT_MIDDLE_DOWN)
- || (event_middle_is_down (&local_event)
- && (eventType != wxEVT_MIDDLE_UP)));
- wxevent.m_rightDown = ((eventType == wxEVT_RIGHT_DOWN)
- || (event_right_is_down (&local_event)
- && (eventType != wxEVT_RIGHT_UP)));
-
- wxevent.m_shiftDown = local_event.xbutton.state & ShiftMask;
- wxevent.m_controlDown = local_event.xbutton.state & ControlMask;
- wxevent.m_altDown = local_event.xbutton.state & Mod3Mask;
- wxevent.m_metaDown = local_event.xbutton.state & Mod1Mask;
- wxevent.SetTimestamp(local_event.xbutton.time);
-
- if ( eventType == wxEVT_MOTION )
- {
- if (local_event.xmotion.is_hint == NotifyHint)
- {
- Window root, child;
- Display *dpy = XtDisplay (drawingArea);
-
- XQueryPointer (dpy, XtWindow (drawingArea),
- &root, &child,
- &local_event.xmotion.x_root,
- &local_event.xmotion.y_root,
- &local_event.xmotion.x,
- &local_event.xmotion.y,
- &local_event.xmotion.state);
- }
- else
- {
- }
- }
-
- // Now check if we need to translate this event into a double click
- if (TRUE) // canvas->doubleClickAllowed)
- {
- if (wxevent.ButtonDown())
- {
- long dclickTime = XtGetMultiClickTime((Display*) wxGetDisplay());
-
- // get button and time-stamp
- int button = 0;
- if (wxevent.LeftDown())
- button = 1;
- else if (wxevent.MiddleDown())
- button = 2;
- else if (wxevent.RightDown())
- button = 3;
- long ts = wxevent.GetTimestamp();
-
- // check, if single or double click
- int buttonLast = canvas->GetLastClickedButton();
- long lastTS = canvas->GetLastClickTime();
- if ( buttonLast && buttonLast == button && (ts - lastTS) < dclickTime )
- {
- // I have a dclick
- canvas->SetLastClick(0, ts);
-
- wxEventType typeDouble;
- if ( eventType == wxEVT_LEFT_DOWN )
- typeDouble = wxEVT_LEFT_DCLICK;
- else if ( eventType == wxEVT_MIDDLE_DOWN )
- typeDouble = wxEVT_MIDDLE_DCLICK;
- else if ( eventType == wxEVT_RIGHT_DOWN )
- typeDouble = wxEVT_RIGHT_DCLICK;
- else
- typeDouble = wxEVT_NULL;
-
- if ( typeDouble != wxEVT_NULL )
- {
- wxevent.SetEventType(typeDouble);
- }
- }
- else
- {
- // not fast enough or different button
- canvas->SetLastClick(button, ts);
- }
- }
- }
-
- wxevent.SetId(canvas->GetId());
- wxevent.SetEventObject(canvas);
- wxevent.m_x = local_event.xbutton.x;
- wxevent.m_y = local_event.xbutton.y;
- canvas->GetEventHandler()->ProcessEvent (wxevent);
-#if 0
- if (eventType == wxEVT_ENTER_WINDOW ||
- eventType == wxEVT_LEAVE_WINDOW ||
- eventType == wxEVT_MOTION
- )
- return;
-#endif // 0
- break;
- }
+ canvas->GetEventHandler()->ProcessEvent(wxevent);
+ }
+ break;
+ }
case KeyPress:
{
wxKeyEvent event (wxEVT_CHAR);
if (wxTranslateKeyEvent (event, canvas, (Widget) 0, &local_event))
{
// Implement wxFrame::OnCharHook by checking ancestor.
- wxWindow *parent = canvas->GetParent();
- while (parent && !parent->IsKindOf(CLASSINFO(wxFrame)))
+ wxWindow *parent = canvas;
+ while (parent && !parent->IsTopLevel())
parent = parent->GetParent();
if (parent)
// Only process OnChar if OnKeyDown didn't swallow it
if (!canvas->GetEventHandler()->ProcessEvent (event))
{
- event.SetEventType(wxEVT_CHAR);
- canvas->GetEventHandler()->ProcessEvent (event);
- }
+ event.SetEventType(wxEVT_CHAR);
+ canvas->GetEventHandler()->ProcessEvent (event);
+ }
}
break;
}
XmScrollBarCallbackStruct *cbs)
{
wxWindow *win = wxGetWindowFromTable(scrollbar);
- int orientation = (int) clientData;
+ wxOrientation orientation = (wxOrientation)(int)clientData;
wxEventType eventType = wxEVT_NULL;
switch (cbs->reason)
wxScrollWinEvent event(eventType,
cbs->value,
- ((orientation == XmHORIZONTAL) ?
- wxHORIZONTAL : wxVERTICAL));
+ orientation);
event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent(event);
}
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)
{
win->DoPaint();
-
- win->ClearUpdateRects();
- }
- else
- {
- win->AddUpdateRect(event->xexpose.x, event->xexpose.y,
- event->xexpose.width, event->xexpose.height);
}
break;
}
}
-// ----------------------------------------------------------------------------
-// CanvaseXXXSize() functions
-// ----------------------------------------------------------------------------
-
-void wxWindow::CanvasSetSize(int x, int y, int w, int h, int sizeFlags)
-{
- CanvasSetSizeIntr(x, y, w, h, sizeFlags, FALSE);
-}
-
-// SetSize, but as per old wxCanvas (with drawing widget etc.)
-void wxWindow::CanvasSetSizeIntr(int x, int y, int w, int h, int sizeFlags,
- bool fromCtor)
-{
- // A bit of optimization to help sort out the flickers.
- int oldX = -1, oldY = -1, oldW = -1, oldH = -1;
- // see the top of the file, near DoSetSizeIntr
- if( !fromCtor )
- {
- GetSize(& oldW, & oldH);
- GetPosition(& oldX, & oldY);
- }
-
- bool useOldPos = FALSE;
- bool useOldSize = FALSE;
-
- if ((x == -1) && (x == -1) && ((sizeFlags & wxSIZE_ALLOW_MINUS_ONE) == 0))
- useOldPos = TRUE;
- else if (x == oldX && y == oldY)
- useOldPos = TRUE;
-
- if ((w == -1) && (h == -1))
- useOldSize = TRUE;
- else if (w == oldW && h == oldH)
- useOldSize = TRUE;
-
- if (!wxNoOptimize::CanOptimize())
- {
- useOldSize = FALSE; useOldPos = FALSE;
- }
-
- if (useOldPos && useOldSize)
- return;
-
- Widget drawingArea = (Widget) m_drawingArea;
- bool managed = XtIsManaged(m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow);
-
- if (managed)
- XtUnmanageChild (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow);
- XtVaSetValues(drawingArea, XmNresizePolicy, XmRESIZE_ANY, NULL);
-
- int xx = x; int yy = y;
- AdjustForParentClientOrigin(xx, yy, sizeFlags);
-
- if (!useOldPos)
- {
- if (x > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
- {
- XtVaSetValues (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow,
- XmNx, xx, NULL);
- }
-
- if (y > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
- {
- XtVaSetValues (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow,
- XmNy, yy, NULL);
- }
- }
-
- if (!useOldSize)
- {
-
- if (w > -1)
- {
- if (m_borderWidget)
- {
- XtVaSetValues ((Widget) m_borderWidget, XmNwidth, w, NULL);
- short thick, margin;
- XtVaGetValues ((Widget) m_borderWidget,
- XmNshadowThickness, &thick,
- XmNmarginWidth, &margin,
- NULL);
- w -= 2 * (thick + margin);
- }
-
- XtVaSetValues ((Widget) m_scrolledWindow, XmNwidth, w, NULL);
-
- Dimension spacing;
- Widget sbar;
- XtVaGetValues ((Widget) m_scrolledWindow,
- XmNspacing, &spacing,
- XmNverticalScrollBar, &sbar,
- NULL);
- Dimension wsbar;
- if (sbar)
- XtVaGetValues (sbar, XmNwidth, &wsbar, NULL);
- else
- wsbar = 0;
-
- w -= (spacing + wsbar);
-
-#if 0
- XtVaSetValues(drawingArea, XmNwidth, w, NULL);
-#endif // 0
- }
- if (h > -1)
- {
- if (m_borderWidget)
- {
- XtVaSetValues ((Widget) m_borderWidget, XmNheight, h, NULL);
- short thick, margin;
- XtVaGetValues ((Widget) m_borderWidget,
- XmNshadowThickness, &thick,
- XmNmarginHeight, &margin,
- NULL);
- h -= 2 * (thick + margin);
- }
-
- XtVaSetValues ((Widget) m_scrolledWindow, XmNheight, h, NULL);
-
- Dimension spacing;
- Widget sbar;
- XtVaGetValues ((Widget) m_scrolledWindow,
- XmNspacing, &spacing,
- XmNhorizontalScrollBar, &sbar,
- NULL);
- Dimension wsbar;
- if (sbar)
- XtVaGetValues (sbar, XmNheight, &wsbar, NULL);
- else
- wsbar = 0;
-
- h -= (spacing + wsbar);
-
-#if 0
- XtVaSetValues(drawingArea, XmNheight, h, NULL);
-#endif // 0
- }
- }
-
- if (managed)
- XtManageChild (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow);
- XtVaSetValues(drawingArea, XmNresizePolicy, XmRESIZE_NONE, NULL);
-
-#if 0
- int ww, hh;
- GetClientSize (&ww, &hh);
- wxSizeEvent sizeEvent(wxSize(ww, hh), GetId());
- sizeEvent.SetEventObject(this);
-
- GetEventHandler()->ProcessEvent(sizeEvent);
-#endif // 0
-}
-
-void wxWindow::CanvasSetClientSize (int w, int h)
-{
- Widget drawingArea = (Widget) m_drawingArea;
-
- XtVaSetValues(drawingArea, XmNresizePolicy, XmRESIZE_ANY, NULL);
-
- if (w > -1)
- XtVaSetValues(drawingArea, XmNwidth, w, NULL);
- if (h > -1)
- XtVaSetValues(drawingArea, XmNheight, h, NULL);
-
-#if 0
- // TODO: is this necessary?
- allowRepainting = FALSE;
-
- XSync (XtDisplay (drawingArea), FALSE);
- XEvent event;
- while (XtAppPending (wxTheApp->appContext))
- {
- XFlush (XtDisplay (drawingArea));
- XtAppNextEvent (wxTheApp->appContext, &event);
- XtDispatchEvent (&event);
- }
-#endif // 0
-
- XtVaSetValues(drawingArea, XmNresizePolicy, XmRESIZE_NONE, NULL);
-
-#if 0
- allowRepainting = TRUE;
- DoRefresh ();
-
- wxSizeEvent sizeEvent(wxSize(w, h), GetId());
- sizeEvent.SetEventObject(this);
-
- GetEventHandler()->ProcessEvent(sizeEvent);
-#endif // 0
-}
-
-void wxWindow::CanvasGetClientSize (int *w, int *h) const
-{
- // Must return the same thing that was set via SetClientSize
- Dimension xx, yy;
- XtVaGetValues ((Widget) m_drawingArea, XmNwidth, &xx, XmNheight, &yy, NULL);
- *w = xx;
- *h = yy;
-}
-
-void wxWindow::CanvasGetSize (int *w, int *h) const
-{
- Dimension xx, yy;
- if ((Widget) m_borderWidget)
- XtVaGetValues ((Widget) m_borderWidget, XmNwidth, &xx, XmNheight, &yy, NULL);
- else if ((Widget) m_scrolledWindow)
- XtVaGetValues ((Widget) m_scrolledWindow, XmNwidth, &xx, XmNheight, &yy, NULL);
- else
- XtVaGetValues ((Widget) m_drawingArea, XmNwidth, &xx, XmNheight, &yy, NULL);
-
- *w = xx;
- *h = yy;
-}
-
-void wxWindow::CanvasGetPosition (int *x, int *y) const
-{
- Position xx, yy;
- XtVaGetValues (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow, XmNx, &xx, XmNy, &yy, NULL);
-
- // We may be faking the client origin.
- // So a window that's really at (0, 30) may appear
- // (to wxWin apps) to be at (0, 0).
- if (GetParent())
- {
- wxPoint pt(GetParent()->GetClientAreaOrigin());
- xx -= pt.x;
- yy -= pt.y;
- }
-
- *x = xx;
- *y = yy;
-}
-
// ----------------------------------------------------------------------------
// TranslateXXXEvent() functions
// ----------------------------------------------------------------------------
-bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Widget widget, XEvent *xevent)
+bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win,
+ Widget widget, XEvent *xevent)
{
switch (xevent->xany.type)
{
- case EnterNotify: // never received here - yes ? MB
- case LeaveNotify: // never received here - yes ? MB
+ case EnterNotify:
+ case LeaveNotify:
+#if 0
+ fprintf(stderr, "Widget 0x%p <-> window %p (%s), %s\n",
+ (WXWidget)widget, win, win->GetClassInfo()->GetClassName(),
+ (xevent->xany.type == EnterNotify ? "ENTER" : "LEAVE"));
+#endif
case ButtonPress:
case ButtonRelease:
case MotionNotify:
{
wxEventType eventType = wxEVT_NULL;
- // FIXME: this is never true I think - MB
- //
if (xevent->xany.type == LeaveNotify)
{
- win->SetButton1(FALSE);
- win->SetButton2(FALSE);
- win->SetButton3(FALSE);
- return FALSE;
+ eventType = wxEVT_LEAVE_WINDOW;
+ }
+ if (xevent->xany.type == EnterNotify)
+ {
+ eventType = wxEVT_ENTER_WINDOW;
}
else if (xevent->xany.type == MotionNotify)
{
if (xevent->xbutton.button == Button1)
{
eventType = wxEVT_LEFT_DOWN;
- win->SetButton1(TRUE);
button = 1;
}
else if (xevent->xbutton.button == Button2)
{
eventType = wxEVT_MIDDLE_DOWN;
- win->SetButton2(TRUE);
button = 2;
}
else if (xevent->xbutton.button == Button3)
{
eventType = wxEVT_RIGHT_DOWN;
- win->SetButton3(TRUE);
button = 3;
}
// check for a double click
//
- long dclickTime = XtGetMultiClickTime((Display*) wxGetDisplay());
+ long dclickTime = XtGetMultiClickTime(xevent->xany.display);
long ts = wxevent.GetTimestamp();
int buttonLast = win->GetLastClickedButton();
long lastTS = win->GetLastClickTime();
- if ( buttonLast && buttonLast == button && (ts - lastTS) < dclickTime )
+ if ( buttonLast && buttonLast == button &&
+ (ts - lastTS) < dclickTime )
{
// I have a dclick
win->SetLastClick(0, ts);
if (xevent->xbutton.button == Button1)
{
eventType = wxEVT_LEFT_UP;
- win->SetButton1(FALSE);
}
else if (xevent->xbutton.button == Button2)
{
eventType = wxEVT_MIDDLE_UP;
- win->SetButton2(FALSE);
}
else if (xevent->xbutton.button == Button3)
{
eventType = wxEVT_RIGHT_UP;
- win->SetButton3(FALSE);
}
- else return FALSE;
+ else
+ return FALSE;
}
else
{
return FALSE;
}
-bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Widget WXUNUSED(widget), XEvent *xevent)
+bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win,
+ Widget WXUNUSED(widget), XEvent *xevent)
{
switch (xevent->xany.type)
{
char buf[20];
KeySym keySym;
-#if 0
- XComposeStatus compose;
- (void) XLookupString ((XKeyEvent *) xevent, buf, 20, &keySym, &compose);
-#endif // 0
- (void) XLookupString ((XKeyEvent *) xevent, buf, 20, &keySym, NULL);
+ (void) XLookupString((XKeyEvent *)xevent, buf, 20, &keySym, NULL);
int id = wxCharCodeXToWX (keySym);
// id may be WXK_xxx code - these are outside ASCII range, so we
// can't just use toupper() on id
result = wxNO_COLORS;
}
- return (result);
-
+ return result;
}
// Changes the foreground and background colours to be derived from the current
{
WXWidget mainWidget = GetMainWidget();
if ( mainWidget )
- DoChangeBackgroundColour(mainWidget, m_backgroundColour);
-
- // This not necessary
-#if 0
-
- if (m_scrolledWindow && (GetMainWidget() != m_scrolledWindow))
- {
- DoChangeBackgroundColour(m_scrolledWindow, m_backgroundColour);
- // Have to set the scrollbar colours back since
- // the scrolled window seemed to change them
- wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
-
- if (m_hScrollBar)
- DoChangeBackgroundColour(m_hScrollBar, backgroundColour);
- if (m_vScrollBar)
- DoChangeBackgroundColour(m_vScrollBar, backgroundColour);
- }
-#endif
+ wxDoChangeBackgroundColour(mainWidget, m_backgroundColour);
}
void wxWindow::ChangeForegroundColour()
{
WXWidget mainWidget = GetMainWidget();
if ( mainWidget )
- DoChangeForegroundColour(mainWidget, m_foregroundColour);
+ wxDoChangeForegroundColour(mainWidget, m_foregroundColour);
if ( m_scrolledWindow && mainWidget != m_scrolledWindow )
- DoChangeForegroundColour(m_scrolledWindow, m_foregroundColour);
-}
-
-// Change a widget's foreground and background colours.
-void wxWindow::DoChangeForegroundColour(WXWidget widget,
- wxColour& foregroundColour)
-{
- wxDoChangeForegroundColour( widget, foregroundColour );
-}
-
-void wxWindow::DoChangeBackgroundColour(WXWidget widget,
- wxColour& backgroundColour,
- bool changeArmColour)
-{
- wxDoChangeBackgroundColour( widget, backgroundColour, changeArmColour );
+ wxDoChangeForegroundColour(m_scrolledWindow, m_foregroundColour);
}
bool wxWindow::SetBackgroundColour(const wxColour& col)
// Get the current mouse position.
wxPoint wxGetMousePosition()
{
- Display *display = (Display*) wxGetDisplay();
+ Display *display = wxGlobalDisplay();
Window rootWindow = RootWindowOfScreen (DefaultScreenOfDisplay(display));
Window rootReturn, childReturn;
int rootX, rootY, winX, winY;
projects / wxWidgets.git / blobdiff