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

hack to fix crash when creating a DC for a widgetless window

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6105 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-02-17 08:47:12 +00:00
parent 81ef7f0818
commit b7f1f77f82
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gtk/dcclient.cpp
View File

@@ -126,6 +126,15 @@ wxWindowDC::wxWindowDC( wxWindow *window )
GtkWidget *widget = window->m_wxwindow; GtkWidget *widget = window->m_wxwindow;
// some controls don't have m_wxwindow - like wxStaticBox, but the user
// code should still be able to create wxClientDCs for them, so we will
// use the parent window here then
if ( !widget )
{
window = window->GetParent();
widget = window->m_wxwindow;
}
wxASSERT_MSG( widget, wxT("DC needs a widget") ); wxASSERT_MSG( widget, wxT("DC needs a widget") );
GtkPizza *pizza = GTK_PIZZA( widget ); GtkPizza *pizza = GTK_PIZZA( widget );
@@ -140,10 +149,7 @@ wxWindowDC::wxWindowDC( wxWindow *window )
return; return;
} }
if (window->m_wxwindow) m_cmap = gtk_widget_get_colormap( widget ? widget : window->m_widget );
m_cmap = gtk_widget_get_colormap( window->m_wxwindow );
else
m_cmap = gtk_widget_get_colormap( window->m_widget );
SetUpDC(); SetUpDC();

14
src/gtk1/dcclient.cpp
View File

@@ -126,6 +126,15 @@ wxWindowDC::wxWindowDC( wxWindow *window )
GtkWidget *widget = window->m_wxwindow; GtkWidget *widget = window->m_wxwindow;
// some controls don't have m_wxwindow - like wxStaticBox, but the user
// code should still be able to create wxClientDCs for them, so we will
// use the parent window here then
if ( !widget )
{
window = window->GetParent();
widget = window->m_wxwindow;
}
wxASSERT_MSG( widget, wxT("DC needs a widget") ); wxASSERT_MSG( widget, wxT("DC needs a widget") );
GtkPizza *pizza = GTK_PIZZA( widget ); GtkPizza *pizza = GTK_PIZZA( widget );
@@ -140,10 +149,7 @@ wxWindowDC::wxWindowDC( wxWindow *window )
return; return;
} }
if (window->m_wxwindow) m_cmap = gtk_widget_get_colormap( widget ? widget : window->m_widget );
m_cmap = gtk_widget_get_colormap( window->m_wxwindow );
else
m_cmap = gtk_widget_get_colormap( window->m_widget );
SetUpDC(); SetUpDC();