AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

simplify Refresh() and Update()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58585 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett 2009-02-01 07:52:39 +00:00
parent a56a99abe8
commit 6cab4fcac7
2 changed files with 18 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/gtk/window.h
View File

@ -129,9 +129,6 @@ public:
// regularly // regularly
virtual void OnInternalIdle(); virtual void OnInternalIdle();
// Internal represention of Update()
void GtkUpdate();
// For compatibility across platforms (not in event table) // For compatibility across platforms (not in event table)
void OnIdle(wxIdleEvent& WXUNUSED(event)) {} void OnIdle(wxIdleEvent& WXUNUSED(event)) {}

64
src/gtk/window.cpp
View File

@ -3537,75 +3537,47 @@ bool wxWindowGTK::ScrollPages(int pages)
void wxWindowGTK::Refresh(bool WXUNUSED(eraseBackground), void wxWindowGTK::Refresh(bool WXUNUSED(eraseBackground),
const wxRect *rect) const wxRect *rect)
{ {
if (!m_widget) GtkWidget* widget;
return;
if (!m_widget->window)
return;
if (m_wxwindow) if (m_wxwindow)
widget = m_wxwindow;
else if (m_widget)
widget = m_widget;
else
return;
if (rect == NULL)
gtk_widget_queue_draw(widget);
else
{ {
if (m_wxwindow->window == NULL) return; int x = rect->x;
if (GetLayoutDirection() == wxLayout_RightToLeft)
x = GetClientSize().x - x - rect->width;
GdkRectangle gdk_rect, gtk_widget_queue_draw_area(widget, x, rect->y, rect->width, rect->height);
*p;
if (rect)
{
gdk_rect.x = rect->x;
gdk_rect.y = rect->y;
gdk_rect.width = rect->width;
gdk_rect.height = rect->height;
if (GetLayoutDirection() == wxLayout_RightToLeft)
gdk_rect.x = GetClientSize().x - gdk_rect.x - gdk_rect.width;
p = &gdk_rect;
}
else // invalidate everything
{
p = NULL;
}
gdk_window_invalidate_rect(m_wxwindow->window, p, true);
} }
} }
void wxWindowGTK::Update() void wxWindowGTK::Update()
{ {
if (m_widget) if (m_widget && m_widget->window)
{ {
GdkDisplay* display = gtk_widget_get_display(m_widget); GdkDisplay* display = gtk_widget_get_display(m_widget);
// Flush everything out to the server, and wait for it to finish. // Flush everything out to the server, and wait for it to finish.
// This ensures nothing will overwrite the drawing we are about to do. // This ensures nothing will overwrite the drawing we are about to do.
gdk_display_sync(display); gdk_display_sync(display);
GtkUpdate();
gdk_window_process_updates(m_widget->window, true);
// Flush again, but no need to wait for it to finish // Flush again, but no need to wait for it to finish
gdk_display_flush(display); gdk_display_flush(display);
} }
} }
void wxWindowGTK::GtkUpdate()
{
if (m_wxwindow && m_wxwindow->window)
gdk_window_process_updates(m_wxwindow->window, false);
if (m_widget && m_widget->window && (m_wxwindow != m_widget))
gdk_window_process_updates( m_widget->window, FALSE );
// for consistency with other platforms (and also because it's convenient
// to be able to update an entire TLW by calling Update() only once), we
// should also update all our children here
for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
node;
node = node->GetNext() )
{
node->GetData()->GtkUpdate();
}
}
bool wxWindowGTK::DoIsExposed( int x, int y ) const bool wxWindowGTK::DoIsExposed( int x, int y ) const
{ {
return m_updateRegion.Contains(x, y) != wxOutRegion; return m_updateRegion.Contains(x, y) != wxOutRegion;
} }
bool wxWindowGTK::DoIsExposed( int x, int y, int w, int h ) const bool wxWindowGTK::DoIsExposed( int x, int y, int w, int h ) const
{ {
if (GetLayoutDirection() == wxLayout_RightToLeft) if (GetLayoutDirection() == wxLayout_RightToLeft)