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

More changes for better redraw flow under X11.

Browse Source 
Probably fixed problem with TLW appearing wrong.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2002-03-28 18:57:50 +00:00
parent 5b8b5075fe
commit c2c0dabfa6
9 changed files with 285 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
src/x11/window.cpp
View File

@@ -62,6 +62,7 @@
extern wxHashTable *wxWidgetHashTable;
extern wxHashTable *wxClientWidgetHashTable;
static wxWindow* g_captureWindow = NULL;
static GC g_eraseGC;
// ----------------------------------------------------------------------------
// macros
@@ -816,12 +817,6 @@ void wxWindowX11::DoSetSize(int x, int y, int width, int height, int sizeFlags)
}
DoMoveWindow( new_x, new_y, new_w, new_h );
#if 0
wxSizeEvent event(wxSize(new_w, new_h), GetId());
event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event);
#endif
}
void wxWindowX11::DoSetClientSize(int width, int height)
@@ -1105,21 +1100,19 @@ void wxWindowX11::SendEraseEvents()
wxEraseEvent erase_event( GetId(), &dc );
erase_event.SetEventObject( this );
if (!GetEventHandler()->ProcessEvent(erase_event))
if (!GetEventHandler()->ProcessEvent(erase_event) )
{
Window xwindow = (Window) m_clientWindow;
Display *xdisplay = wxGlobalDisplay();
GC xgc = XCreateGC( xdisplay, xwindow, 0, NULL );
XSetFillStyle( xdisplay, xgc, FillSolid );
XSetForeground( xdisplay, xgc, m_backgroundColour.GetPixel() );
Window xwindow = (Window) GetClientWindow();
XSetForeground( xdisplay, g_eraseGC, m_backgroundColour.GetPixel() );
wxRegionIterator upd( m_clearRegion );
while (upd)
{
XFillRectangle( xdisplay, xwindow, xgc,
XFillRectangle( xdisplay, xwindow, g_eraseGC,
upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight() );
upd ++;
}
XFreeGC( xdisplay, xgc );
}
m_clearRegion.Clear();
@@ -1449,19 +1442,10 @@ bool wxWindowX11::SetBackgroundColour(const wxColour& col)
m_backgroundColour.CalcPixel( (WXColormap) cm );
if (!GetMainWindow())
return FALSE;
/*
XSetWindowAttributes attrib;
attrib.background_pixel = colour.GetPixel();
XChangeWindowAttributes(wxGlobalDisplay(),
(Window) GetMainWindow(),
CWBackPixel,
& attrib);
*/
// We don't set the background colour as we paint
// the background ourselves.
// XSetWindowBackground( xdisplay, (Window) m_clientWindow, m_backgroundColour.GetPixel() );
return TRUE;
}
@@ -1527,3 +1511,38 @@ wxPoint wxGetMousePosition()
int wxNoOptimize::ms_count = 0;
// ----------------------------------------------------------------------------
// wxDCModule
// ----------------------------------------------------------------------------
class wxWinModule : public wxModule
{
public:
bool OnInit();
void OnExit();
private:
DECLARE_DYNAMIC_CLASS(wxWinModule)
};
IMPLEMENT_DYNAMIC_CLASS(wxWinModule, wxModule)
bool wxWinModule::OnInit()
{
Display *xdisplay = wxGlobalDisplay();
int xscreen = DefaultScreen( xdisplay );
Window xroot = RootWindow( xdisplay, xscreen );
g_eraseGC = XCreateGC( xdisplay, xroot, 0, NULL );
XSetFillStyle( xdisplay, g_eraseGC, FillSolid );
return TRUE;
}
void wxWinModule::OnExit()
{
Display *xdisplay = wxGlobalDisplay();
XFreeGC( xdisplay, g_eraseGC );
}