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

wxX11:

Browse Source 
Rewrote wxRegion.
     Killed backing store Pixmap.
     Killed wxRectList.
     Adapted wxWindow to the above.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14105 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2002-02-10 16:42:42 +00:00
parent c3e44503cf
commit 1934d291cd
7 changed files with 542 additions and 890 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/x11/window.cpp
View File

@@ -103,10 +103,6 @@ void wxWindowX11::Init()
m_needsRefresh = TRUE;
m_mainWidget = (WXWindow) 0;
m_button1Pressed =
m_button2Pressed =
m_button3Pressed = FALSE;
m_winCaptured = FALSE;
m_isShown = TRUE;
@@ -124,13 +120,6 @@ void wxWindowX11::Init()
m_scrollPosX =
m_scrollPosY = 0;
m_backingPixmap = (WXPixmap) 0;
m_pixmapWidth =
m_pixmapHeight = 0;
m_pixmapOffsetX =
m_pixmapOffsetY = 0;
m_lastTS = 0;
m_lastButton = 0;
m_canAddEventHandler = FALSE;
@@ -231,8 +220,6 @@ wxWindowX11::~wxWindowX11()
//DetachWidget(wMain);
}
ClearUpdateRects();
if ( m_parent )
m_parent->RemoveChild( this );
@@ -1280,31 +1267,39 @@ void wxWindowX11::Clear()
dc.Clear();
}
void wxWindowX11::ClearUpdateRects()
void wxWindowX11::X11SendPaintEvents()
{
wxRectList::Node* node = m_updateRects.GetFirst();
while (node)
m_clipPaintRegion = TRUE;
if (!m_clearRegion.IsEmpty())
{
wxRect* rect = node->GetData();
delete rect;
node = node->GetNext();
wxWindowDC dc( (wxWindow*)this );
dc.SetClippingRegion( m_clearRegion );
wxEraseEvent erase_event( GetId(), &dc );
erase_event.SetEventObject( this );
if (!GetEventHandler()->ProcessEvent(erase_event))
{
wxRegionIterator upd( m_clearRegion );
while (upd)
{
// XClearArea( ... , upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight() );
upd ++;
}
}
m_clearRegion.Clear();
}
m_updateRects.Clear();
}
wxNcPaintEvent nc_paint_event( GetId() );
nc_paint_event.SetEventObject( this );
GetEventHandler()->ProcessEvent( nc_paint_event );
void wxWindowX11::DoPaint()
{
// Set an erase event first
wxEraseEvent eraseEvent(GetId());
eraseEvent.SetEventObject(this);
GetEventHandler()->ProcessEvent(eraseEvent);
wxPaintEvent event(GetId());
event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event);
m_needsRefresh = FALSE;
wxPaintEvent paint_event( GetId() );
paint_event.SetEventObject( this );
GetEventHandler()->ProcessEvent( paint_event );
m_clipPaintRegion = FALSE;
}
// ----------------------------------------------------------------------------
@@ -1600,19 +1595,16 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Window window,
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;
}
@@ -1646,17 +1638,14 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Window window,
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;
}