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

Font crash and timer fix as per 2_4.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2003-06-19 19:06:06 +00:00
parent 8eabf55943
commit 7b14c561d9
4 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gtk/timer.cpp
View File

@@ -30,17 +30,25 @@ extern "C" gint timeout_callback( gpointer data )
{ {
wxTimer *timer = (wxTimer*)data; wxTimer *timer = (wxTimer*)data;
/* when getting called from GDK's timer handler we // Don't change the order of anything in this callback!
are no longer within GDK's grab on the GUI
thread so we must lock it here ourselves */ if (timer->IsOneShot())
{
// This sets m_tag to -1
timer->Stop();
}
// When getting called from GDK's timer handler we
// are no longer within GDK's grab on the GUI
// thread so we must lock it here ourselves.
gdk_threads_enter(); gdk_threads_enter();
timer->Notify(); timer->Notify();
/* release lock again */ // Release lock again.
gdk_threads_leave(); gdk_threads_leave();
if ( timer->IsOneShot() ) if (timer->IsOneShot())
return FALSE; return FALSE;
return TRUE; return TRUE;

2
src/gtk/window.cpp
View File

@@ -4047,7 +4047,7 @@ void wxWindowGTK::SetWidgetStyle()
{ {
#ifdef __WXGTK20__ #ifdef __WXGTK20__
pango_font_description_free( style->font_desc ); pango_font_description_free( style->font_desc );
pango_font_description_copy( m_font.GetNativeFontInfo()->description ); style->font_desc = pango_font_description_copy( m_font.GetNativeFontInfo()->description );
#else #else
gdk_font_unref( style->font ); gdk_font_unref( style->font );
style->font = gdk_font_ref( m_font.GetInternalFont( 1.0 ) ); style->font = gdk_font_ref( m_font.GetInternalFont( 1.0 ) );

18
src/gtk1/timer.cpp
View File

@@ -30,17 +30,25 @@ extern "C" gint timeout_callback( gpointer data )
{ {
wxTimer *timer = (wxTimer*)data; wxTimer *timer = (wxTimer*)data;
/* when getting called from GDK's timer handler we // Don't change the order of anything in this callback!
are no longer within GDK's grab on the GUI
thread so we must lock it here ourselves */ if (timer->IsOneShot())
{
// This sets m_tag to -1
timer->Stop();
}
// When getting called from GDK's timer handler we
// are no longer within GDK's grab on the GUI
// thread so we must lock it here ourselves.
gdk_threads_enter(); gdk_threads_enter();
timer->Notify(); timer->Notify();
/* release lock again */ // Release lock again.
gdk_threads_leave(); gdk_threads_leave();
if ( timer->IsOneShot() ) if (timer->IsOneShot())
return FALSE; return FALSE;
return TRUE; return TRUE;

2
src/gtk1/window.cpp
View File

@@ -4047,7 +4047,7 @@ void wxWindowGTK::SetWidgetStyle()
{ {
#ifdef __WXGTK20__ #ifdef __WXGTK20__
pango_font_description_free( style->font_desc ); pango_font_description_free( style->font_desc );
pango_font_description_copy( m_font.GetNativeFontInfo()->description ); style->font_desc = pango_font_description_copy( m_font.GetNativeFontInfo()->description );
#else #else
gdk_font_unref( style->font ); gdk_font_unref( style->font );
style->font = gdk_font_ref( m_font.GetInternalFont( 1.0 ) ); style->font = gdk_font_ref( m_font.GetInternalFont( 1.0 ) );