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

Ported stable-tree refresh code to devel tree.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2000-11-26 10:20:11 +00:00
parent af88eefff2
commit e22454beda
2 changed files with 54 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/gtk/window.cpp
View File

@@ -700,6 +700,8 @@ static int gtk_window_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_ev
if (gdk_event->count == 0) if (gdk_event->count == 0)
{ {
win->m_clipPaintRegion = TRUE;
wxEraseEvent eevent( win->GetId() ); wxEraseEvent eevent( win->GetId() );
eevent.SetEventObject( win ); eevent.SetEventObject( win );
win->GetEventHandler()->ProcessEvent(eevent); win->GetEventHandler()->ProcessEvent(eevent);
@@ -709,6 +711,8 @@ static int gtk_window_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_ev
win->GetEventHandler()->ProcessEvent( event ); win->GetEventHandler()->ProcessEvent( event );
win->GetUpdateRegion().Clear(); win->GetUpdateRegion().Clear();
win->m_clipPaintRegion = FALSE;
} }
/* The following code will result in all window-less widgets /* The following code will result in all window-less widgets
@@ -774,9 +778,11 @@ static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxW
if (g_isIdle) if (g_isIdle)
wxapp_install_idle_handler(); wxapp_install_idle_handler();
// this is supposed to take care of extra (and unneeded) frame repaints if ((win->HasFlag(wxNO_FULL_REPAINT_ON_RESIZE)) &&
if (win->GetChildren().GetCount() == 0) (win->GetChildren().GetCount() == 0))
{
return; return;
}
/* /*
if (win->GetName() == wxT("panel")) if (win->GetName() == wxT("panel"))
@@ -817,22 +823,22 @@ static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxW
win->m_clipPaintRegion = TRUE; win->m_clipPaintRegion = TRUE;
wxEraseEvent eevent( win->GetId() ); wxEraseEvent eevent( win->GetId() );
eevent.SetEventObject( win ); eevent.SetEventObject( win );
win->GetEventHandler()->ProcessEvent(eevent); win->GetEventHandler()->ProcessEvent(eevent);
wxPaintEvent event( win->GetId() ); wxPaintEvent event( win->GetId() );
event.SetEventObject( win ); event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( event ); win->GetEventHandler()->ProcessEvent( event );
win->GetUpdateRegion().Clear(); win->GetUpdateRegion().Clear();
win->m_clipPaintRegion = FALSE; win->m_clipPaintRegion = FALSE;
GList *children = pizza->children; GList *children = pizza->children;
while (children) while (children)
{ {
GtkPizzaChild *child = (GtkPizzaChild*) children->data; GtkPizzaChild *child = (GtkPizzaChild*) children->data;
children = children->next; children = children->next;
@@ -841,7 +847,7 @@ static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxW
{ {
gtk_widget_draw (child->widget, &child_area /* (GdkRectangle*) NULL*/ ); gtk_widget_draw (child->widget, &child_area /* (GdkRectangle*) NULL*/ );
} }
} }
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -2394,14 +2400,17 @@ void wxWindow::PostCreation()
gtk_pizza_set_external( GTK_PIZZA(m_wxwindow), TRUE ); gtk_pizza_set_external( GTK_PIZZA(m_wxwindow), TRUE );
gtk_signal_connect( GTK_OBJECT(m_wxwindow), "event",
GTK_SIGNAL_FUNC(gtk_window_event_event_callback), (gpointer)this );
gtk_signal_connect( GTK_OBJECT(m_wxwindow), "expose_event", gtk_signal_connect( GTK_OBJECT(m_wxwindow), "expose_event",
GTK_SIGNAL_FUNC(gtk_window_expose_callback), (gpointer)this ); GTK_SIGNAL_FUNC(gtk_window_expose_callback), (gpointer)this );
gtk_signal_connect( GTK_OBJECT(m_wxwindow), "draw", gtk_signal_connect( GTK_OBJECT(m_wxwindow), "draw",
GTK_SIGNAL_FUNC(gtk_window_draw_callback), (gpointer)this ); GTK_SIGNAL_FUNC(gtk_window_draw_callback), (gpointer)this );
if (HasFlag(wxNO_FULL_REPAINT_ON_RESIZE))
{
gtk_signal_connect( GTK_OBJECT(m_wxwindow), "event",
GTK_SIGNAL_FUNC(gtk_window_event_event_callback), (gpointer)this );
}
} }
#if (GTK_MINOR_VERSION > 0) #if (GTK_MINOR_VERSION > 0)

43
src/gtk1/window.cpp
View File

@@ -700,6 +700,8 @@ static int gtk_window_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_ev
if (gdk_event->count == 0) if (gdk_event->count == 0)
{ {
win->m_clipPaintRegion = TRUE;
wxEraseEvent eevent( win->GetId() ); wxEraseEvent eevent( win->GetId() );
eevent.SetEventObject( win ); eevent.SetEventObject( win );
win->GetEventHandler()->ProcessEvent(eevent); win->GetEventHandler()->ProcessEvent(eevent);
@@ -709,6 +711,8 @@ static int gtk_window_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_ev
win->GetEventHandler()->ProcessEvent( event ); win->GetEventHandler()->ProcessEvent( event );
win->GetUpdateRegion().Clear(); win->GetUpdateRegion().Clear();
win->m_clipPaintRegion = FALSE;
} }
/* The following code will result in all window-less widgets /* The following code will result in all window-less widgets
@@ -774,9 +778,11 @@ static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxW
if (g_isIdle) if (g_isIdle)
wxapp_install_idle_handler(); wxapp_install_idle_handler();
// this is supposed to take care of extra (and unneeded) frame repaints if ((win->HasFlag(wxNO_FULL_REPAINT_ON_RESIZE)) &&
if (win->GetChildren().GetCount() == 0) (win->GetChildren().GetCount() == 0))
{
return; return;
}
/* /*
if (win->GetName() == wxT("panel")) if (win->GetName() == wxT("panel"))
@@ -817,22 +823,22 @@ static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxW
win->m_clipPaintRegion = TRUE; win->m_clipPaintRegion = TRUE;
wxEraseEvent eevent( win->GetId() ); wxEraseEvent eevent( win->GetId() );
eevent.SetEventObject( win ); eevent.SetEventObject( win );
win->GetEventHandler()->ProcessEvent(eevent); win->GetEventHandler()->ProcessEvent(eevent);
wxPaintEvent event( win->GetId() ); wxPaintEvent event( win->GetId() );
event.SetEventObject( win ); event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( event ); win->GetEventHandler()->ProcessEvent( event );
win->GetUpdateRegion().Clear(); win->GetUpdateRegion().Clear();
win->m_clipPaintRegion = FALSE; win->m_clipPaintRegion = FALSE;
GList *children = pizza->children; GList *children = pizza->children;
while (children) while (children)
{ {
GtkPizzaChild *child = (GtkPizzaChild*) children->data; GtkPizzaChild *child = (GtkPizzaChild*) children->data;
children = children->next; children = children->next;
@@ -841,7 +847,7 @@ static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxW
{ {
gtk_widget_draw (child->widget, &child_area /* (GdkRectangle*) NULL*/ ); gtk_widget_draw (child->widget, &child_area /* (GdkRectangle*) NULL*/ );
} }
} }
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -2394,14 +2400,17 @@ void wxWindow::PostCreation()
gtk_pizza_set_external( GTK_PIZZA(m_wxwindow), TRUE ); gtk_pizza_set_external( GTK_PIZZA(m_wxwindow), TRUE );
gtk_signal_connect( GTK_OBJECT(m_wxwindow), "event",
GTK_SIGNAL_FUNC(gtk_window_event_event_callback), (gpointer)this );
gtk_signal_connect( GTK_OBJECT(m_wxwindow), "expose_event", gtk_signal_connect( GTK_OBJECT(m_wxwindow), "expose_event",
GTK_SIGNAL_FUNC(gtk_window_expose_callback), (gpointer)this ); GTK_SIGNAL_FUNC(gtk_window_expose_callback), (gpointer)this );
gtk_signal_connect( GTK_OBJECT(m_wxwindow), "draw", gtk_signal_connect( GTK_OBJECT(m_wxwindow), "draw",
GTK_SIGNAL_FUNC(gtk_window_draw_callback), (gpointer)this ); GTK_SIGNAL_FUNC(gtk_window_draw_callback), (gpointer)this );
if (HasFlag(wxNO_FULL_REPAINT_ON_RESIZE))
{
gtk_signal_connect( GTK_OBJECT(m_wxwindow), "event",
GTK_SIGNAL_FUNC(gtk_window_event_event_callback), (gpointer)this );
}
} }
#if (GTK_MINOR_VERSION > 0) #if (GTK_MINOR_VERSION > 0)