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

Temporary fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34474 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-05-31 21:56:38 +00:00
parent 26ee3a06e2
commit 34a246df34
2 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gtk/artgtk.cpp
View File

@@ -160,10 +160,26 @@ static GtkIconSize FindClosestIconSize(const wxSize& size)
s_sizes[5].icon = GTK_ICON_SIZE_DIALOG; s_sizes[5].icon = GTK_ICON_SIZE_DIALOG;
for (size_t i = 0; i < NUM_SIZES; i++) for (size_t i = 0; i < NUM_SIZES; i++)
{ {
gtk_icon_size_lookup_for_settings( #if !defined(GDK_MULTITHREAD_SAFE)
gtk_icon_size_lookup(
s_sizes[i].icon,
&s_sizes[i].x, &s_sizes[i].y);
#else
#if GTK_VERSION_CHECK(2,2,0)
if (!gtk_verson_check(2,2,0))
gtk_icon_size_lookup_for_settings(
gtk_settings_get_for_screen(gdk_screen_get_default()), gtk_settings_get_for_screen(gdk_screen_get_default()),
s_sizes[i].icon, s_sizes[i].icon,
&s_sizes[i].x, &s_sizes[i].y); &s_sizes[i].x, &s_sizes[i].y);
else
#else // pre-GTK 2.2
{
// FIXME
gtk_icon_size_lookup(s_sizes[i].icon,
&s_sizes[i].x, &s_sizes[i].y);
}
#endif
#endif
} }
s_sizesInitialized = true; s_sizesInitialized = true;
} }

18
src/gtk1/artgtk.cpp
View File

@@ -160,10 +160,26 @@ static GtkIconSize FindClosestIconSize(const wxSize& size)
s_sizes[5].icon = GTK_ICON_SIZE_DIALOG; s_sizes[5].icon = GTK_ICON_SIZE_DIALOG;
for (size_t i = 0; i < NUM_SIZES; i++) for (size_t i = 0; i < NUM_SIZES; i++)
{ {
gtk_icon_size_lookup_for_settings( #if !defined(GDK_MULTITHREAD_SAFE)
gtk_icon_size_lookup(
s_sizes[i].icon,
&s_sizes[i].x, &s_sizes[i].y);
#else
#if GTK_VERSION_CHECK(2,2,0)
if (!gtk_verson_check(2,2,0))
gtk_icon_size_lookup_for_settings(
gtk_settings_get_for_screen(gdk_screen_get_default()), gtk_settings_get_for_screen(gdk_screen_get_default()),
s_sizes[i].icon, s_sizes[i].icon,
&s_sizes[i].x, &s_sizes[i].y); &s_sizes[i].x, &s_sizes[i].y);
else
#else // pre-GTK 2.2
{
// FIXME
gtk_icon_size_lookup(s_sizes[i].icon,
&s_sizes[i].x, &s_sizes[i].y);
}
#endif
#endif
} }
s_sizesInitialized = true; s_sizesInitialized = true;
} }