void wxCanvasInputEvent (Widget drawingArea, XtPointer data, XmDrawingAreaCallbackStruct * cbs);
void wxCanvasMotionEvent (Widget, XButtonEvent * event);
void wxCanvasEnterLeave (Widget drawingArea, XtPointer clientData, XCrossingEvent * event);
-void wxScrollBarCallback(Widget widget, XtPointer clientData,
+static void wxScrollBarCallback(Widget widget, XtPointer clientData,
XmScaleCallbackStruct *cbs);
void wxPanelItemEventHandler (Widget wid,
XtPointer client_data,
#if wxUSE_DRAG_AND_DROP
m_pDropTarget = NULL;
#endif
+ m_clientObject = (wxClientData*) NULL;
+ m_clientData = NULL;
/// Motif-specific
m_mainWidget = (WXWidget) 0;
m_canAddEventHandler = FALSE;
m_scrollPosX = 0;
m_scrollPosY = 0;
- m_paintRegion = (WXRegion) 0;
}
// Destructor
{
//// Motif-specific
- if (m_paintRegion)
- XDestroyRegion ((Region) m_paintRegion);
- m_paintRegion = (WXRegion) 0;
-
if (GetMainWidget())
DetachWidget(GetMainWidget()); // Removes event handlers
// dangling pointers.
wxPendingDelete.DeleteObject(this);
- if ( m_windowValidator )
- delete m_windowValidator;
+ if ( m_windowValidator ) delete m_windowValidator;
+ if (m_clientObject) delete m_clientObject;
+
+ ClearUpdateRects();
}
// Destroy the window (delayed, if a managed window)
m_maxSizeY = -1;
m_defaultItem = NULL;
m_windowParent = NULL;
+ m_clientObject = (wxClientData*) NULL;
+ m_clientData = NULL;
// Motif-specific
m_canAddEventHandler = FALSE;
m_pixmapOffsetY = 0;
m_scrollPosX = 0;
m_scrollPosY = 0;
- m_paintRegion = (WXRegion) 0;
if (!parent)
return FALSE;
m_scrolledWindow = (WXWidget) XtVaCreateManagedWidget ("scrolledWindow",
xmScrolledWindowWidgetClass, m_borderWidget ? (Widget) m_borderWidget : parentWidget,
+ XmNresizePolicy, XmRESIZE_NONE,
XmNspacing, 0,
XmNscrollingPolicy, XmAPPLICATION_DEFINED,
+ // XmNscrollBarDisplayPolicy, XmAS_NEEDED,
NULL);
XtTranslations ptr;
XtAddEventHandler ((Widget) m_drawingArea, PointerMotionHintMask | EnterWindowMask | LeaveWindowMask | FocusChangeMask,
False, (XtEventHandler) wxCanvasEnterLeave, (XtPointer) this);
+ // Scrolled widget needs to have its colour changed or we get
+ // a little blue square where the scrollbars abutt
+ wxColour backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+ DoChangeBackgroundColour(m_scrolledWindow, backgroundColour, TRUE);
+ DoChangeBackgroundColour(m_drawingArea, backgroundColour, TRUE);
+
+ XmScrolledWindowSetAreas ((Widget) m_scrolledWindow, (Widget) 0, (Widget) 0, (Widget) m_drawingArea);
+
+ /*
+ if (m_hScrollBar)
+ XtRealizeWidget ((Widget) m_hScrollBar);
+ if (m_vScrollBar)
+ XtRealizeWidget ((Widget) m_vScrollBar);
+ */
+
+ // Without this, the cursor may not be restored properly
+ // (e.g. in splitter sample).
+ SetCursor(*wxSTANDARD_CURSOR);
+ SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ SetSize(pos.x, pos.y, size.x, size.y);
+
+ return TRUE;
+}
+
+// Helper function
+void wxWindow::CreateScrollbar(int orientation)
+{
+ if (!m_drawingArea)
+ return;
+
+ XtVaSetValues((Widget) m_scrolledWindow, XmNresizePolicy, XmRESIZE_NONE, NULL);
+
// Add scrollbars if required
- if (m_windowStyle & wxHSCROLL)
+ if (orientation == wxHORIZONTAL)
{
Widget hScrollBar = XtVaCreateManagedWidget ("hsb",
xmScrollBarWidgetClass, (Widget) m_scrolledWindow,
NULL);
m_hScrollBar = (WXWidget) hScrollBar;
+
+ wxColour backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+ DoChangeBackgroundColour(m_hScrollBar, backgroundColour, TRUE);
+
+ XtRealizeWidget(hScrollBar);
+
+ XtVaSetValues((Widget) m_scrolledWindow,
+ XmNhorizontalScrollBar, (Widget) m_hScrollBar,
+ NULL);
+
m_hScroll = TRUE;
}
- if (m_windowStyle & wxVSCROLL)
+
+ if (orientation == wxVERTICAL)
{
Widget vScrollBar = XtVaCreateManagedWidget ("vsb",
xmScrollBarWidgetClass, (Widget) m_scrolledWindow,
NULL);
m_vScrollBar = (WXWidget) vScrollBar;
+ wxColour backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+ DoChangeBackgroundColour(m_vScrollBar, backgroundColour, TRUE);
+
+ XtRealizeWidget(vScrollBar);
+
+ XtVaSetValues((Widget) m_scrolledWindow,
+ XmNverticalScrollBar, (Widget) m_vScrollBar,
+ NULL);
+
m_vScroll = TRUE;
}
- if (m_hScrollBar || m_vScrollBar)
- XmScrolledWindowSetAreas ((Widget) m_scrolledWindow, (Widget) m_hScrollBar, (Widget) m_vScrollBar, (Widget) m_drawingArea);
+ XtVaSetValues((Widget) m_scrolledWindow, XmNresizePolicy, XmRESIZE_ANY, NULL);
+}
+void wxWindow::DestroyScrollbar(int orientation)
+{
+ if (!m_drawingArea)
+ return;
- if (m_hScrollBar)
- XtRealizeWidget ((Widget) m_hScrollBar);
- if (m_vScrollBar)
- XtRealizeWidget ((Widget) m_vScrollBar);
+ XtVaSetValues((Widget) m_scrolledWindow, XmNresizePolicy, XmRESIZE_NONE, NULL);
+ // Add scrollbars if required
+ if (orientation == wxHORIZONTAL)
+ {
+ if (m_hScrollBar)
+ {
+ XtDestroyWidget((Widget) m_hScrollBar);
+ }
+ m_hScrollBar = (WXWidget) 0;
+ m_hScroll = FALSE;
- SetSize(pos.x, pos.y, size.x, size.y);
+ XtVaSetValues((Widget) m_scrolledWindow,
+ XmNhorizontalScrollBar, (Widget) 0,
+ NULL);
- return TRUE;
+ }
+
+ if (orientation == wxVERTICAL)
+ {
+ if (m_vScrollBar)
+ {
+ XtDestroyWidget((Widget) m_vScrollBar);
+ }
+ m_vScrollBar = (WXWidget) 0;
+ m_vScroll = TRUE;
+
+ XtVaSetValues((Widget) m_scrolledWindow,
+ XmNverticalScrollBar, (Widget) 0,
+ NULL);
+
+ }
+ XtVaSetValues((Widget) m_scrolledWindow, XmNresizePolicy, XmRESIZE_ANY, NULL);
}
void wxWindow::SetFocus()
void wxWindow::GetPosition(int *x, int *y) const
{
- if (m_drawingArea)
- {
- CanvasGetPosition(x, y);
- return;
- }
- Widget widget = (Widget) GetTopWidget();
- Position xx, yy;
- XtVaGetValues(widget, XmNx, &xx, XmNy, &yy, NULL);
- *x = xx; *y = yy;
+ if (m_drawingArea)
+ {
+ CanvasGetPosition(x, y);
+ return;
+ }
+ Widget widget = (Widget) GetTopWidget();
+ Position xx, yy;
+ XtVaGetValues(widget, 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;
}
void wxWindow::ScreenToClient(int *x, int *y) const
void wxWindow::SetSize(int x, int y, int width, int height, int sizeFlags)
{
+ // A bit of optimization to help sort out the flickers.
+ int oldX, oldY, oldW, oldH;
+ 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 ((width == -1) && (height == -1))
+ useOldSize = TRUE;
+ else if (width == oldW && height == oldH)
+ useOldSize = TRUE;
+
+ if (!wxNoOptimize::CanOptimize())
+ {
+ useOldSize = FALSE; useOldPos = FALSE;
+ }
+
+ if (useOldPos && useOldSize)
+ return;
+
if (m_drawingArea)
{
CanvasSetSize(x, y, width, height, sizeFlags);
if (managed)
XtUnmanageChild(widget);
- if (x > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
- XtVaSetValues(widget, XmNx, x, NULL);
- if (y > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
- XtVaSetValues(widget, XmNy, y, NULL);
- if (width > -1)
- XtVaSetValues(widget, XmNwidth, width, NULL);
- if (height > -1)
- XtVaSetValues(widget, XmNheight, height, NULL);
+ int xx = x; int yy = y;
+ AdjustForParentClientOrigin(xx, yy, sizeFlags);
+
+ if (!useOldPos)
+ {
+ if (x > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+ XtVaSetValues(widget, XmNx, xx, NULL);
+ if (y > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+ XtVaSetValues(widget, XmNy, yy, NULL);
+ }
+ if (!useOldSize)
+ {
+ if (width > -1)
+ XtVaSetValues(widget, XmNwidth, width, NULL);
+ if (height > -1)
+ XtVaSetValues(widget, XmNheight, height, NULL);
+ }
if (managed)
XtManageChild(widget);
+ // How about this bit. Maybe we don't need to generate size events
+ // all the time -- they'll be generated when the window is sized anyway.
+ /*
wxSizeEvent sizeEvent(wxSize(width, height), GetId());
sizeEvent.SetEventObject(this);
GetEventHandler()->ProcessEvent(sizeEvent);
+ */
}
void wxWindow::SetClientSize(int width, int height)
{
if (m_borderWidget || m_scrolledWindow)
{
+ if (m_drawingArea)
+ XtMapWidget((Widget) m_drawingArea);
XtMapWidget(m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow);
}
else
{
- XtMapWidget((Widget) GetTopWidget());
+ WXWidget topWidget = GetTopWidget();
+ if (GetTopWidget())
+ XtMapWidget((Widget) GetTopWidget());
+ else if (GetMainWidget())
+ XtMapWidget((Widget) GetMainWidget());
}
}
else
{
if (m_borderWidget || m_scrolledWindow)
{
+ if (m_drawingArea)
+ XtUnmapWidget((Widget) m_drawingArea);
XtUnmapWidget(m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow);
}
else
{
- XtUnmapWidget((Widget) GetTopWidget());
+ if (GetTopWidget())
+ XtUnmapWidget((Widget) GetTopWidget());
+ else if (GetMainWidget())
+ XtUnmapWidget((Widget) GetMainWidget());
}
}
*externalLeading = 0;
}
-void wxWindow::Refresh(bool eraseBack, const wxRectangle *rect)
+void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
{
Display *display = XtDisplay((Widget) GetMainWidget());
Window thisWindow = XtWindow((Widget) GetMainWidget());
wxClientDC dc(this);
wxBrush backgroundBrush(GetBackgroundColour(), wxSOLID);
dc.SetBackground(backgroundBrush);
- dc.Clear();
+ if (rect)
+ dc.Clear(*rect);
+ else
+ dc.Clear();
}
XSendEvent(display, thisWindow, False, ExposureMask, (XEvent *)&dummyEvent);
// Responds to colour changes: passes event on to children.
void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event)
{
- wxNode *node = GetChildren()->First();
+ wxNode *node = GetChildren().First();
while ( node )
{
// Only propagate to non-top-level windows
void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
int range, bool WXUNUSED(refresh))
{
- Widget scrollBar = (Widget) ((orient == wxHORIZONTAL) ? m_hScrollBar : m_vScrollBar );
- if (!scrollBar)
- return;
+ int oldW, oldH;
+ GetSize(& oldW, & oldH);
if (range == 0)
range = 1;
if (thumbVisible == 0)
thumbVisible = 1;
- XtVaSetValues(scrollBar,
+ if (thumbVisible > range)
+ thumbVisible = range;
+
+ // Save the old state to see if it changed
+ WXWidget oldScrollBar = ((orient == wxHORIZONTAL) ? m_hScrollBar : m_vScrollBar );
+
+ if (orient == wxHORIZONTAL)
+ {
+ if (thumbVisible == range)
+ {
+ if (m_hScrollBar)
+ DestroyScrollbar(wxHORIZONTAL);
+ }
+ else
+ {
+ if (!m_hScrollBar)
+ CreateScrollbar(wxHORIZONTAL);
+ }
+ }
+ if (orient == wxVERTICAL)
+ {
+ if (thumbVisible == range)
+ {
+ if (m_vScrollBar)
+ DestroyScrollbar(wxVERTICAL);
+ }
+ else
+ {
+ if (!m_vScrollBar)
+ CreateScrollbar(wxVERTICAL);
+ }
+ }
+ WXWidget newScrollBar = ((orient == wxHORIZONTAL) ? m_hScrollBar : m_vScrollBar );
+
+ if (oldScrollBar != newScrollBar)
+ {
+ // This is important! Without it, scrollbars misbehave
+ // badly.
+ XtUnrealizeWidget((Widget) m_scrolledWindow);
+ XmScrolledWindowSetAreas ((Widget) m_scrolledWindow, (Widget) m_hScrollBar, (Widget) m_vScrollBar, (Widget) m_drawingArea);
+ XtRealizeWidget((Widget) m_scrolledWindow);
+ XtManageChild((Widget) m_scrolledWindow);
+ }
+
+ if (newScrollBar)
+ XtVaSetValues((Widget) newScrollBar,
XmNvalue, pos,
XmNminimum, 0,
XmNmaximum, range,
m_scrollPosX = pos;
else
m_scrollPosY = pos;
+
+ int newW, newH;
+ GetSize(& newW, & newH);
+
+ // Adjusting scrollbars can resize the canvas accidentally
+ if (newW != oldW || newH != oldH)
+ SetSize(-1, -1, oldW, oldH);
}
// Does a physical scroll
-void wxWindow::ScrollWindow(int dx, int dy, const wxRectangle *rect)
+void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
{
// cerr << "Scrolling. delta = " << dx << ", " << dy << endl;
int x, y, w, h;
node = node->Next();
}
-}
-void wxWindow::SetFont(const wxFont& font)
-{
- m_windowFont = font;
+ // Delete the update rects
+ node = updateRects.First();
+ while (node)
+ {
+ wxRect* rect = (wxRect*) node->Data();
+ delete rect;
+ node = node->Next();
+ }
- Widget w = (Widget) GetLabelWidget(); // Usually the main widget
- if (w && m_windowFont.Ok())
- {
- XtVaSetValues (w,
- XmNfontList, (XmFontList) m_windowFont.GetFontList(1.0, XtDisplay(w)),
- NULL);
- }
}
void wxWindow::OnChar(wxKeyEvent& event)
// it's an application error (pops up a dialog)
bool wxWindow::TransferDataToWindow()
{
- wxNode *node = GetChildren()->First();
+ wxNode *node = GetChildren().First();
while ( node )
{
wxWindow *child = (wxWindow *)node->Data();
// validation failed: don't quit
bool wxWindow::TransferDataFromWindow()
{
- wxNode *node = GetChildren()->First();
+ wxNode *node = GetChildren().First();
while ( node )
{
wxWindow *child = (wxWindow *)node->Data();
bool wxWindow::Validate()
{
- wxNode *node = GetChildren()->First();
+ wxNode *node = GetChildren().First();
while ( node )
{
wxWindow *child = (wxWindow *)node->Data();
void wxWindow::AddChild(wxWindow *child)
{
- GetChildren()->Append(child);
+ GetChildren().Append(child);
child->m_windowParent = this;
}
void wxWindow::RemoveChild(wxWindow *child)
{
- if (GetChildren())
- GetChildren()->DeleteObject(child);
+ GetChildren().DeleteObject(child);
child->m_windowParent = NULL;
}
+// Reparents this window to have the new parent.
+bool wxWindow::Reparent(wxWindow* WXUNUSED(parent))
+{
+ // For now, we indicate that this isn't implemented.
+ return FALSE;
+}
+
void wxWindow::DestroyChildren()
{
- if (GetChildren()) {
+ wxNode *node = GetChildren().First();
+ while (node)
+ {
+ wxNode* next = node->Next();
+ wxWindow* child = (wxWindow*) node->Data();
+ delete child;
+ node = next;
+ }
+ GetChildren().Clear();
+#if 0
wxNode *node;
- while ((node = GetChildren()->First()) != (wxNode *)NULL) {
+ while ((node = GetChildren().First()) != (wxNode *)NULL) {
wxWindow *child;
if ((child = (wxWindow *)node->Data()) != (wxWindow *)NULL) {
delete child;
- if ( GetChildren()->Member(child) )
+ if ( GetChildren().Member(child) )
delete node;
}
} /* while */
- }
+#endif
}
void wxWindow::MakeModal(bool modal)
{
noChanges = 0;
noFailures = 0;
- wxNode *node = GetChildren()->First();
+ wxNode *node = GetChildren().First();
while (node)
{
wxWindow *child = (wxWindow *)node->Data();
constr->centreX.SetDone(FALSE);
constr->centreY.SetDone(FALSE);
}
- wxNode *node = GetChildren()->First();
+ wxNode *node = GetChildren().First();
while (node)
{
wxWindow *win = (wxWindow *)node->Data();
if (recurse)
{
- wxNode *node = GetChildren()->First();
+ wxNode *node = GetChildren().First();
while (node)
{
wxWindow *win = (wxWindow *)node->Data();
wxObject* wxWindow::GetChild(int number) const
{
// Return a pointer to the Nth object in the window
- if (!GetChildren())
- return(NULL) ;
- wxNode *node = GetChildren()->First();
+ wxNode *node = GetChildren().First();
int n = number;
while (node && n--)
node = node->Next() ;
{
int maxX = 0;
int maxY = 0;
- wxNode *node = GetChildren()->First();
+ wxNode *node = GetChildren().First();
while ( node )
{
wxWindow *win = (wxWindow *)node->Data();
m_windowValidator->SetWindow(this) ;
}
+void wxWindow::SetClientObject( wxClientData *data )
+{
+ if (m_clientObject) delete m_clientObject;
+ m_clientObject = data;
+}
+
+wxClientData *wxWindow::GetClientObject()
+{
+ return m_clientObject;
+}
+
+void wxWindow::SetClientData( void *data )
+{
+ m_clientData = data;
+}
+
+void *wxWindow::GetClientData()
+{
+ return m_clientData;
+}
+
// Find a window by id or name
wxWindow *wxWindow::FindWindow(long id)
{
if ( GetId() == id)
return this;
- wxNode *node = GetChildren()->First();
+ wxNode *node = GetChildren().First();
while ( node )
{
wxWindow *child = (wxWindow *)node->Data();
if ( GetName() == name)
return this;
- wxNode *node = GetChildren()->First();
+ wxNode *node = GetChildren().First();
while ( node )
{
wxWindow *child = (wxWindow *)node->Data();
void wxWindow::OnIdle(wxIdleEvent& event)
{
-/* TODO: you may need to do something like this
- * if your GUI doesn't generate enter/leave events
-
- // Check if we need to send a LEAVE event
- if (m_mouseInWindow)
- {
- POINT pt;
- ::GetCursorPos(&pt);
- if (::WindowFromPoint(pt) != (HWND) GetHWND())
- {
- // Generate a LEAVE event
- m_mouseInWindow = FALSE;
- MSWOnMouseLeave(pt.x, pt.y, 0);
- }
- }
-*/
-
// This calls the UI-update mechanism (querying windows for
// menu/toolbar/control state information)
- UpdateWindowUI();
+ UpdateWindowUI();
}
// Raise the window to the top of the Z order
}
// Update region access
-wxRegion wxWindow::GetUpdateRegion() const
+wxRegion& wxWindow::GetUpdateRegion() const
{
- return m_updateRegion;
+ return (wxRegion&) m_updateRegion;
}
bool wxWindow::IsExposed(int x, int y, int w, int h) const
bool wxAddWindowToTable(Widget w, wxWindow *win)
{
wxWindow *oldItem = NULL;
-#if DEBUG
// printf("Adding widget %ld, name = %s\n", w, win->GetClassInfo()->GetClassName());
-#endif
if ((oldItem = (wxWindow *)wxWidgetHashTable->Get ((long) w)))
{
- char buf[300];
- sprintf(buf, "Widget table clash: new widget is %ld, %s", (long)w, win->GetClassInfo()->GetClassName());
- wxError (buf);
- fflush(stderr);
- sprintf(buf, "Old widget was %s", oldItem->GetClassInfo()->GetClassName());
- wxError (buf);
+ wxLogError("Widget table clash: new widget is %ld, %s", (long)w, win->GetClassInfo()->GetClassName());
return FALSE;
}
XmDrawingAreaCallbackStruct * cbs)
{
if (!wxWidgetHashTable->Get ((long) (Widget) drawingArea))
- return;
+ return;
XEvent * event = cbs->event;
- wxWindow * canvas = (wxWindow *) clientData;
- Display * display = (Display *) canvas->GetXDisplay();
- // GC gc = (GC) canvas->GetDC()->gc;
+ wxWindow * win = (wxWindow *) clientData;
+ Display * display = (Display *) win->GetXDisplay();
switch (event->type)
{
- case Expose:
- {
- /* TODO
- wxCanvasDC* canvasDC = canvas->GetDC();
- if (canvasDC)
- {
- if (canvasDC->onpaint_reg)
- XDestroyRegion(canvasDC->onpaint_reg);
- canvasDC->onpaint_reg = XCreateRegion();
-
- }
- */
-
- int n = canvas->m_updateRects.Number();
- XRectangle* xrects = new XRectangle[n];
- int i;
- for (i = 0; i < canvas->m_updateRects.Number(); i++)
- {
- wxRect* rect = (wxRect*) canvas->m_updateRects.Nth(i)->Data();
- xrects[i].x = rect->x;
- xrects[i].y = rect->y;
- xrects[i].width = rect->width;
- xrects[i].height = rect->height;
- /* TODO (?) Actually ignore it I think.
- if (canvasDC)
- XUnionRectWithRegion(&(xrects[i]), canvasDC->onpaint_reg,
- canvasDC->onpaint_reg);
- */
- }
- /* TODO must clip the area being repainted. So we need a gc.
- * Alternatively, wxPaintDC must do the clipping
- * when it's created.
- XSetClipRectangles(display, gc, 0, 0, xrects, n, Unsorted);
- */
-
- canvas->DoPaint() ; // xrects, n);
- delete[] xrects;
-
- canvas->m_updateRects.Clear();
+ case Expose:
+ {
+ wxRect* rect = new wxRect(event->xexpose.x, event->xexpose.y,
+ event->xexpose.width, event->xexpose.height);
+ /*
+ cout << "Expose proc. wxRect: " << rect->x << ", " << rect->y << ", ";
+ cout << rect->width << ", " << rect->height << "\n\n";
+ */
- /*
- if (canvasDC)
- {
- XDestroyRegion(canvasDC->onpaint_reg);
- canvasDC->onpaint_reg = NULL;
- }
+ win->m_updateRects.Append((wxObject*) rect);
- XGCValues gc_val;
- gc_val.clip_mask = None;
- XChangeGC(display, gc, GCClipMask, &gc_val);
- */
+ if (event -> xexpose.count == 0)
+ {
+ wxPaintEvent event(win->GetId());
+ event.SetEventObject(win);
+ win->GetEventHandler()->ProcessEvent(event);
- break;
- }
- default:
- {
- cout << "\n\nNew Event ! is = " << event -> type << "\n";
- break;
+ win->ClearUpdateRects();
+ }
+ break;
+ }
+ default:
+ {
+ cout << "\n\nNew Event ! is = " << event -> type << "\n";
+ break;
+ }
}
- }
}
// Unable to deal with Enter/Leave without a separate EventHandler (Motif 1.1.4)
local_event = *(cbs->event); // We must keep a copy!
+ /*
+ switch (local_event.xany.type)
+ {
+ case EnterNotify:
+ cout << "EnterNotify\n";
+ break;
+ case LeaveNotify:
+ cout << "LeaveNotify\n";
+ break;
+ case ButtonPress:
+ cout << "ButtonPress\n";
+ break;
+ case ButtonRelease:
+ cout << "ButtonRelease\n";
+ break;
+ case MotionNotify:
+ cout << "MotionNotify\n";
+ break;
+ default:
+ cout << "Something else\n";
+ break;
+ }
+ */
+
switch (local_event.xany.type)
{
case EnterNotify:
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 (eventType == wxEVT_ENTER_WINDOW ||
// SetSize, but as per old wxCanvas (with drawing widget etc.)
void wxWindow::CanvasSetSize (int x, int y, int w, int h, int sizeFlags)
{
+ // A bit of optimization to help sort out the flickers.
+ int oldX, oldY, oldW, oldH;
+ 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);
XtUnmanageChild (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow);
XtVaSetValues((Widget) m_drawingArea, XmNresizePolicy, XmRESIZE_ANY, NULL);
- if (x > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+ 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, x, NULL);
+ XmNx, xx, NULL);
}
- if (y > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+ if (y > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
{
XtVaSetValues (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow,
- XmNy, y, NULL);
+ XmNy, yy, NULL);
}
+ }
- if (w > -1)
+ if (!useOldSize)
+ {
+
+ if (w > -1)
{
if (m_borderWidget)
{
w -= (spacing + wsbar);
- XtVaSetValues ((Widget) m_drawingArea, XmNwidth, w, NULL);
+ // XtVaSetValues ((Widget) m_drawingArea, XmNwidth, w, NULL);
}
if (h > -1)
{
h -= (spacing + wsbar);
- XtVaSetValues ((Widget) m_drawingArea, XmNheight, h, NULL);
+ // XtVaSetValues ((Widget) m_drawingArea, XmNheight, h, NULL);
+
}
+ }
+
if (managed)
XtManageChild (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow);
XtVaSetValues((Widget) m_drawingArea, XmNresizePolicy, XmRESIZE_NONE, NULL);
+ /*
int ww, hh;
GetClientSize (&ww, &hh);
wxSizeEvent sizeEvent(wxSize(ww, hh), GetId());
sizeEvent.SetEventObject(this);
GetEventHandler()->ProcessEvent(sizeEvent);
+ */
+
}
void wxWindow::CanvasSetClientSize (int w, int h)
DoRefresh ();
*/
+ /*
wxSizeEvent sizeEvent(wxSize(w, h), GetId());
sizeEvent.SetEventObject(this);
GetEventHandler()->ProcessEvent(sizeEvent);
+ */
}
void wxWindow::CanvasGetClientSize (int *w, int *h) const
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);
- *x = xx;
- *y = yy;
+ 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;
}
// Add to hash table, add event handler
*continueToDispatch = True;
}
-void wxScrollBarCallback(Widget scrollbar, XtPointer clientData,
+static void wxScrollBarCallback(Widget scrollbar, XtPointer clientData,
XmScaleCallbackStruct *cbs)
{
Widget scrolledWindow = XtParent (scrollbar);
return FALSE;
}
-// TODO From wxWin 1.68. What does it do exactly?
#define YAllocColor XAllocColor
-
-XColor itemColors[5];
-int wxComputeColors (Display *display, wxColour * back, wxColour * fore)
+XColor g_itemColors[5];
+int wxComputeColours (Display *display, wxColour * back, wxColour * fore)
{
int result;
static XmColorProc colorProc;
if (back)
{
- itemColors[0].red = (((long) back->Red ()) << 8);
- itemColors[0].green = (((long) back->Green ()) << 8);
- itemColors[0].blue = (((long) back->Blue ()) << 8);
- itemColors[0].flags = DoRed | DoGreen | DoBlue;
+ 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].flags = DoRed | DoGreen | DoBlue;
if (colorProc == (XmColorProc) NULL)
{
// Get a ptr to the actual function
// And set it back to motif.
XmSetColorCalculation (colorProc);
}
- (*colorProc) (&itemColors[wxBACK_INDEX],
- &itemColors[wxFORE_INDEX],
- &itemColors[wxSELE_INDEX],
- &itemColors[wxTOPS_INDEX],
- &itemColors[wxBOTS_INDEX]);
+ (*colorProc) (&g_itemColors[wxBACK_INDEX],
+ &g_itemColors[wxFORE_INDEX],
+ &g_itemColors[wxSELE_INDEX],
+ &g_itemColors[wxTOPS_INDEX],
+ &g_itemColors[wxBOTS_INDEX]);
result = wxBACK_COLORS;
}
if (fore)
{
- itemColors[wxFORE_INDEX].red = (((long) fore->Red ()) << 8);
- itemColors[wxFORE_INDEX].green = (((long) fore->Green ()) << 8);
- itemColors[wxFORE_INDEX].blue = (((long) fore->Blue ()) << 8);
- itemColors[wxFORE_INDEX].flags = DoRed | DoGreen | DoBlue;
+ 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].flags = DoRed | DoGreen | DoBlue;
if (result == wxNO_COLORS)
result = wxFORE_COLORS;
}
{
/* 5 Colours to allocate */
for (int i = 0; i < 5; i++)
- if (!YAllocColor (dpy, cmap, &itemColors[i]))
+ if (!YAllocColor (dpy, cmap, &g_itemColors[i]))
result = wxNO_COLORS;
}
else if (fore)
{
/* Only 1 colour to allocate */
- if (!YAllocColor (dpy, cmap, &itemColors[wxFORE_INDEX]))
+ if (!YAllocColor (dpy, cmap, &g_itemColors[wxFORE_INDEX]))
result = wxNO_COLORS;
}
}
-void wxWindow::ChangeColour(WXWidget widget)
+// Changes the foreground and background colours to be derived
+// from the current background colour.
+// To change the foreground colour, you must call SetForegroundColour
+// explicitly.
+void wxWindow::ChangeBackgroundColour()
{
- // TODO
+ if (GetMainWidget())
+ DoChangeBackgroundColour(GetMainWidget(), m_backgroundColour);
+
+ // This not necessary
#if 0
- int change;
- // TODO: how to determine whether we can change this item's colours?
- // We used to have wxUSER_COLOURS. Now perhaps we assume we always
- // can change it.
- // if (!(parent->GetWindowStyleFlag() & wxUSER_COLOURS))
- // return;
+ 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::GetSystemColour(wxSYS_COLOUR_3DFACE) ;
- change = wxComputeColors (XtDisplay((Widget)widget), panel->GetBackgroundColour(),
- panel->GetLabelColour());
- if (change == wxBACK_COLORS)
- XtVaSetValues ((Widget) widget,
- XmNbackground, itemColors[wxBACK_INDEX].pixel,
- XmNtopShadowColor, itemColors[wxTOPS_INDEX].pixel,
- XmNbottomShadowColor, itemColors[wxBOTS_INDEX].pixel,
- XmNforeground, itemColors[wxFORE_INDEX].pixel,
- NULL);
- else if (change == wxFORE_COLORS)
- XtVaSetValues (formWidget,
- XmNforeground, itemColors[wxFORE_INDEX].pixel,
+ if (m_hScrollBar)
+ DoChangeBackgroundColour(m_hScrollBar, backgroundColour);
+ if (m_vScrollBar)
+ DoChangeBackgroundColour(m_vScrollBar, backgroundColour);
+ }
+#endif
+}
+
+void wxWindow::ChangeForegroundColour()
+{
+ if (GetMainWidget())
+ DoChangeForegroundColour(GetMainWidget(), m_foregroundColour);
+ if (m_scrolledWindow && (GetMainWidget() != m_scrolledWindow))
+ DoChangeForegroundColour(m_scrolledWindow, m_foregroundColour);
+}
+
+// Change a widget's foreground and background colours.
+
+void wxWindow::DoChangeForegroundColour(WXWidget widget, wxColour& foregroundColour)
+{
+ // When should we specify the foreground, if it's calculated
+ // by wxComputeColours?
+ // Solution: say we start with the default (computed) foreground colour.
+ // If we call SetForegroundColour explicitly for a control or window,
+ // then the foreground is changed.
+ // Therefore SetBackgroundColour computes the foreground colour, and
+ // SetForegroundColour changes the foreground colour. The ordering is
+ // important.
+
+ XtVaSetValues ((Widget) widget,
+ XmNforeground, foregroundColour.AllocColour(XtDisplay((Widget) widget)),
NULL);
+}
+
+void wxWindow::DoChangeBackgroundColour(WXWidget widget, wxColour& backgroundColour, bool changeArmColour)
+{
+ wxComputeColours (XtDisplay((Widget) widget), & backgroundColour,
+ (wxColour*) NULL);
- change = wxComputeColors (XtDisplay((Widget)formWidget), GetBackgroundColour(), GetLabelColour());
- if (change == wxBACK_COLORS)
- XtVaSetValues (labelWidget,
- XmNbackground, itemColors[wxBACK_INDEX].pixel,
- XmNtopShadowColor, itemColors[wxTOPS_INDEX].pixel,
- XmNbottomShadowColor, itemColors[wxBOTS_INDEX].pixel,
- XmNarmColor, itemColors[wxSELE_INDEX].pixel,
- XmNforeground, itemColors[wxFORE_INDEX].pixel,
+ XtVaSetValues ((Widget) widget,
+ XmNbackground, g_itemColors[wxBACK_INDEX].pixel,
+ XmNtopShadowColor, g_itemColors[wxTOPS_INDEX].pixel,
+ XmNbottomShadowColor, g_itemColors[wxBOTS_INDEX].pixel,
+ XmNforeground, g_itemColors[wxFORE_INDEX].pixel,
NULL);
- else if (change == wxFORE_COLORS)
- XtVaSetValues (labelWidget,
- XmNforeground, itemColors[wxFORE_INDEX].pixel,
+
+ if (changeArmColour)
+ XtVaSetValues ((Widget) widget,
+ XmNarmColor, g_itemColors[wxSELE_INDEX].pixel,
+ NULL);
+}
+
+void wxWindow::SetBackgroundColour(const wxColour& col)
+{
+ m_backgroundColour = col;
+ ChangeBackgroundColour();
+}
+
+void wxWindow::SetForegroundColour(const wxColour& col)
+{
+ m_foregroundColour = col;
+ ChangeForegroundColour();
+}
+
+void wxWindow::ChangeFont(bool keepOriginalSize)
+{
+ // Note that this causes the widget to be resized back
+ // to its original size! We therefore have to set the size
+ // back again. TODO: a better way in Motif?
+ Widget w = (Widget) GetLabelWidget(); // Usually the main widget
+ if (w && m_windowFont.Ok())
+ {
+ int width, height, width1, height1;
+ GetSize(& width, & height);
+
+// lesstif 0.87 hangs here
+#ifndef LESSTIF_VERSION
+ XtVaSetValues (w,
+ XmNfontList, (XmFontList) m_windowFont.GetFontList(1.0, XtDisplay(w)),
NULL);
#endif
+
+ GetSize(& width1, & height1);
+ if (keepOriginalSize && (width != width1 || height != height1))
+ {
+ SetSize(-1, -1, width, height);
+ }
+ }
}
-void wxWindow::ChangeFont(WXWidget widget)
+void wxWindow::SetFont(const wxFont& font)
{
- if (widget && GetFont() && GetFont()->Ok())
- {
- XmFontList fontList = (XmFontList) GetFont()->GetFontList(1.0, GetXDisplay());
- if (fontList)
- XtVaSetValues ((Widget) widget,
- XmNfontList, fontList,
- NULL);
- }
+ m_windowFont = font;
+ ChangeFont();
+}
+
+void wxWindow::ClearUpdateRects()
+{
+ wxNode* node = m_updateRects.First();
+ while (node)
+ {
+ wxRect* rect = (wxRect*) node->Data();
+ delete rect;
+ node = node->Next();
+ }
+ m_updateRects.Clear();
+}
+
+bool wxWindow::ProcessAccelerator(wxKeyEvent& event)
+{
+ if (!m_acceleratorTable.Ok())
+ return FALSE;
+
+ int count = m_acceleratorTable.GetCount();
+ wxAcceleratorEntry* entries = m_acceleratorTable.GetEntries();
+ int i;
+ for (i = 0; i < count; i++)
+ {
+ wxAcceleratorEntry* entry = & (entries[i]);
+ if (entry->MatchesEvent(event))
+ {
+ // Bingo, we have a match. Now find a control
+ // that matches the entry command id.
+
+ // Need to go up to the top of the window hierarchy,
+ // since it might be e.g. a menu item
+ wxWindow* parent = this;
+ while (parent && !parent->IsKindOf(CLASSINFO(wxFrame)) && !parent->IsKindOf(CLASSINFO(wxDialog)))
+ parent = parent->GetParent();
+
+ if (!parent)
+ return FALSE;
+
+ if (parent->IsKindOf(CLASSINFO(wxFrame)))
+ {
+ // Try for a menu command
+ wxFrame* frame = (wxFrame*) parent;
+ if (frame->GetMenuBar())
+ {
+ wxMenuItem* item = frame->GetMenuBar()->FindItemForId(entry->GetCommand());
+ if (item)
+ {
+ wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, entry->GetCommand());
+ commandEvent.SetEventObject(frame);
+
+ // If ProcessEvent returns TRUE (it was handled), then
+ // the calling code will skip the event handling.
+ return frame->GetEventHandler()->ProcessEvent(commandEvent);
+ }
+ }
+ }
+
+ // Find a child matching the command id
+ wxWindow* child = parent->FindWindow(entry->GetCommand());
+
+ // No such child
+ if (!child)
+ return FALSE;
+
+ // Now we process those kinds of windows that we can.
+ // For now, only buttons.
+ if (child->IsKindOf(CLASSINFO(wxButton)))
+ {
+ wxCommandEvent commandEvent (wxEVT_COMMAND_BUTTON_CLICKED, child->GetId());
+ commandEvent.SetEventObject(child);
+ return child->GetEventHandler()->ProcessEvent(commandEvent);
+ }
+
+ return FALSE;
+ } // matches event
+ }// for
+
+ // We didn't match the key event against an accelerator.
+ return FALSE;
+}
+
+/*
+ * wxNoOptimize: switch off size optimization
+ */
+
+int wxNoOptimize::m_count = 0;
+
+wxNoOptimize::wxNoOptimize()
+{
+ m_count ++;
+}
+
+wxNoOptimize::~wxNoOptimize()
+{
+ m_count --;
}
+
+bool wxNoOptimize::CanOptimize()
+{
+ return (m_count == 0);
+}
+
projects / wxWidgets.git / blobdiff