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

fix building with GTK+ < 2.8

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2012-03-22 18:09:43 +00:00
parent b9e52a19e6
commit 8e98dabce4
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gtk/dcclient.cpp
View File

@@ -379,13 +379,18 @@ void wxWindowDCImpl::SetUpDC( bool isMemDC )
m_textGC = wxGetPoolGC( m_gdkwindow, wxTEXT_SCREEN ); m_textGC = wxGetPoolGC( m_gdkwindow, wxTEXT_SCREEN );
m_bgGC = wxGetPoolGC( m_gdkwindow, wxBG_SCREEN ); m_bgGC = wxGetPoolGC( m_gdkwindow, wxBG_SCREEN );
} }
else if (m_cmap == gdk_screen_get_rgba_colormap(gdk_colormap_get_screen(m_cmap))) #if GTK_CHECK_VERSION(2,12,0)
// gdk_screen_get_rgba_colormap was added in 2.8, but this code is for
// compositing which requires 2.12
else if (gtk_check_version(2,12,0) == NULL &&
m_cmap == gdk_screen_get_rgba_colormap(gdk_colormap_get_screen(m_cmap)))
{ {
m_penGC = wxGetPoolGC( m_gdkwindow, wxPEN_COLOUR_ALPHA ); m_penGC = wxGetPoolGC( m_gdkwindow, wxPEN_COLOUR_ALPHA );
m_brushGC = wxGetPoolGC( m_gdkwindow, wxBRUSH_COLOUR_ALPHA ); m_brushGC = wxGetPoolGC( m_gdkwindow, wxBRUSH_COLOUR_ALPHA );
m_textGC = wxGetPoolGC( m_gdkwindow, wxTEXT_COLOUR_ALPHA ); m_textGC = wxGetPoolGC( m_gdkwindow, wxTEXT_COLOUR_ALPHA );
m_bgGC = wxGetPoolGC( m_gdkwindow, wxBG_COLOUR_ALPHA ); m_bgGC = wxGetPoolGC( m_gdkwindow, wxBG_COLOUR_ALPHA );
} }
#endif
else else
{ {
m_penGC = wxGetPoolGC( m_gdkwindow, wxPEN_COLOUR ); m_penGC = wxGetPoolGC( m_gdkwindow, wxPEN_COLOUR );