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

Updated makefile for mobile sample.

Browse Source 
Updated changes.txt.
  Moved contents of ::Update() to ::GtkUpdate()
  Moved internal idle functions in wxApp to
    its own function.
  Tried to fix themed background redraw problem
    (probably same bug in wxNotebook and in
     wxStatusBar and others).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15204 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2002-04-19 17:39:49 +00:00
parent 129223d68e
commit 010afced51
11 changed files with 170 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/gtk1/window.cpp
View File

@@ -551,35 +551,13 @@ static int gtk_window_expose_callback( GtkWidget *widget,
}
#endif
#ifndef __WXUNIVERSAL__
GtkPizza *pizza = GTK_PIZZA (widget);
if (win->GetThemeEnabled())
{
wxWindow *parent = win->GetParent();
while (parent && !parent->IsTopLevel())
parent = parent->GetParent();
if (!parent)
parent = win;
gtk_paint_flat_box (parent->m_widget->style,
pizza->bin_window,
GTK_STATE_NORMAL,
GTK_SHADOW_NONE,
&gdk_event->area,
parent->m_widget,
(char *)"base",
0, 0, -1, -1);
}
#endif
win->GetUpdateRegion().Union( gdk_event->area.x,
gdk_event->area.y,
gdk_event->area.width,
gdk_event->area.height );
// Actual redrawing takes place in idle time.
win->Update();
win->GtkUpdate();
#ifdef __WXGTK20__
@@ -686,7 +664,7 @@ static void gtk_window_draw_callback( GtkWidget *widget,
// Actual redrawing takes place in idle time.
win->Update();
win->GtkUpdate();
#ifndef __WXUNIVERSAL__
// Redraw child widgets
@@ -2902,7 +2880,7 @@ void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags
void wxWindowGTK::OnInternalIdle()
{
// Update invalidated regions.
Update();
GtkUpdate();
// Synthetize activate events.
if ( g_sendActivateEvent != -1 )
@@ -3500,6 +3478,11 @@ void wxWindowGTK::Refresh( bool eraseBackground, const wxRect *rect )
}
void wxWindowGTK::Update()
{
GtkUpdate();
}
void wxWindowGTK::GtkUpdate()
{
#ifdef __WXGTK20__
if (m_wxwindow && GTK_PIZZA(m_wxwindow)->bin_window)
@@ -3538,11 +3521,41 @@ void wxWindowGTK::GtkSendPaintEvents()
}
gdk_gc_set_foreground( g_eraseGC, m_backgroundColour.GetColor() );
// widget to draw on
GtkPizza *pizza = GTK_PIZZA (m_wxwindow);
// find ancestor from which to steal background
wxWindow *parent = GetParent();
while (parent && !parent->IsTopLevel())
parent = parent->GetParent();
if (!parent)
parent = this;
wxRegionIterator upd( m_clearRegion );
while (upd)
{
gdk_draw_rectangle( GTK_PIZZA(m_wxwindow)->bin_window, g_eraseGC, 1,
upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight() );
if (GetThemeEnabled())
{
GdkRectangle rect;
rect.x = upd.GetX();
rect.y = upd.GetY();
rect.width = upd.GetWidth();
rect.height = upd.GetHeight();
gtk_paint_flat_box( parent->m_widget->style,
pizza->bin_window,
GTK_STATE_NORMAL,
GTK_SHADOW_NONE,
&rect,
parent->m_widget,
(char *)"base",
0, 0, -1, -1 );
}
else
{
gdk_draw_rectangle( pizza->bin_window, g_eraseGC, 1,
upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight() );
}
upd ++;
}
}
@@ -3619,7 +3632,7 @@ void wxWindowGTK::Clear()
m_clearRegion.Union( 0,0,size.x,size.y );
// Better do this in idle?
Update();
GtkUpdate();
}
}