Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Motif bug fixes; dialog OnPaint works now; wxColourDialog tweaking

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@989 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-11-11 14:39:42 +00:00
parent fb1585ae85
commit 55acd85e71
19 changed files with 183 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/motif/dialog.cpp
View File

@@ -617,86 +617,42 @@ static void wxCloseDialogCallback( Widget WXUNUSED(widget), XtPointer client_dat
// TODO: Preferably, we should have a universal repaint proc.
// Meanwhile, use a special one for dialogs.
static void wxDialogBoxRepaintProc(Widget w, XtPointer WXUNUSED(c_data), XEvent *event, char *)
{
{
Window window;
Display *display;
/*
static XRectangle *xrect;
GC gc;
int llp = 0;
static int last_count = 0;
static int draw_count = 0;
*/
wxWindow* win = (wxWindow *)wxWidgetHashTable->Get((long)w);
if (!win)
return;
switch(event -> type)
{
{
case Expose :
{
window = (Window) win -> GetXWindow();
display = (Display *) win -> GetXDisplay();
/* TODO
gc = (GC) panel -> GetDC() -> gc;
llp = event -> xexpose.count;
if ((last_count == 0) && (llp == 0))
{
xrect = new XRectangle[1];
xrect[0].x = event -> xexpose.x;
xrect[0].y = event -> xexpose.y;
xrect[0].width = event -> xexpose.width;
xrect[0].height = event -> xexpose.height;
XSetClipRectangles(display,gc,0,0,xrect,1,Unsorted);
// panel->DoPaint(xrect, 1);
panel->GetEventHandler()->OnPaint();
delete xrect;
}
wxRect* rect = new wxRect(event->xexpose.x, event->xexpose.y,
event->xexpose.width, event->xexpose.height);
win->m_updateRects.Append((wxObject*) rect);
if ((last_count == 0) && (llp != 0))
{
xrect = new XRectangle[llp + 1];
draw_count = llp + 1;
xrect[draw_count - llp - 1].x = event -> xexpose.x;
xrect[draw_count - llp - 1].y = event -> xexpose.y;
xrect[draw_count - llp - 1].width = event -> xexpose.width;
xrect[draw_count - llp - 1].height = event -> xexpose.height;
}
if (event -> xexpose.count == 0)
{
wxPaintEvent event(win->GetId());
event.SetEventObject(win);
win->GetEventHandler()->ProcessEvent(event);
if ((last_count != 0) && (llp != 0))
{
xrect[draw_count - llp - 1].x = event -> xexpose.x;
xrect[draw_count - llp - 1].y = event -> xexpose.y;
xrect[draw_count - llp - 1].width = event -> xexpose.width;
xrect[draw_count - llp - 1].height = event -> xexpose.height;
}
if ((last_count != 0) && (llp == 0))
{
xrect[draw_count - llp - 1].x = event -> xexpose.x;
xrect[draw_count - llp - 1].y = event -> xexpose.y;
xrect[draw_count - llp - 1].width = event -> xexpose.width;
xrect[draw_count - llp - 1].height = event -> xexpose.height;
XSetClipRectangles(display,gc,0,0,xrect,draw_count,Unsorted);
// panel->DoPaint(xrect,draw_count);
panel->GetEventHandler()->OnPaint();
delete xrect;
}
last_count = event -> xexpose.count;
*/
win->ClearUpdateRects();
}
break;
default :
}
default :
{
cout << "\n\nNew Event ! is = " << event -> type << "\n";
break;
}
}
}
}
}
static void wxDialogBoxEventHandler (Widget wid,
XtPointer WXUNUSED(client_data),