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

(blind) GTK1 compilation fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32622 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-03-05 23:36:07 +00:00
parent 9802983f15
commit f6d43eda3e
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/common/artprov.cpp
View File

@@ -175,7 +175,7 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL;
int bmp_w = bmp.GetWidth(); int bmp_w = bmp.GetWidth();
int bmp_h = bmp.GetHeight(); int bmp_h = bmp.GetHeight();
// want default size but it's smaller, paste into transparent image // want default size but it's smaller, paste into transparent image
if ((reqSize == wxDefaultSize) && if ((reqSize == wxDefaultSize) &&
(bmp_h < bestSize.x) && (bmp_w < bestSize.y)) (bmp_h < bestSize.x) && (bmp_w < bestSize.y))
{ {
wxPoint offset((bestSize.x - bmp_w)/2, (bestSize.y - bmp_h)/2); wxPoint offset((bestSize.x - bmp_w)/2, (bestSize.y - bmp_h)/2);
@@ -215,12 +215,12 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL;
return icon; return icon;
} }
#ifdef __WXGTK__ #if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
#include <gtk/gtk.h> #include <gtk/gtk.h>
extern GtkIconSize wxArtClientToIconSize(const wxArtClient& client); extern GtkIconSize wxArtClientToIconSize(const wxArtClient& client);
#endif // __WXGTK__ #endif // __WXGTK__
/*static*/ wxSize wxArtProvider::GetSize(const wxArtClient& client, /*static*/ wxSize wxArtProvider::GetSize(const wxArtClient& client,
bool platform_dependent) bool platform_dependent)
{ {
if (!platform_dependent) if (!platform_dependent)
@@ -228,16 +228,16 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL;
wxArtProvidersList::compatibility_iterator node = sm_providers->GetFirst(); wxArtProvidersList::compatibility_iterator node = sm_providers->GetFirst();
if (node) if (node)
return node->GetData()->DoGetSize(client); return node->GetData()->DoGetSize(client);
// else return platform dependent size // else return platform dependent size
} }
#ifdef __WXGTK__ #if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
GtkIconSize gtk_size = wxArtClientToIconSize(client); GtkIconSize gtk_size = wxArtClientToIconSize(client);
gint width, height; gint width, height;
gtk_icon_size_lookup( gtk_size, &width, &height); gtk_icon_size_lookup( gtk_size, &width, &height);
return wxSize(width, height); return wxSize(width, height);
#else #else // !GTK+ 2
if (client == wxART_TOOLBAR) if (client == wxART_TOOLBAR)
return wxSize(32, 32); return wxSize(32, 32);
else if (client == wxART_MENU) else if (client == wxART_MENU)
@@ -247,8 +247,8 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL;
else if (client == wxART_BUTTON) else if (client == wxART_BUTTON)
return wxSize(16, 15); return wxSize(16, 15);
else else
return wxSize(16, 15); // this is arbitrary return wxSize(16, 15); // this is arbitrary
#endif #endif // GTK+ 2/else
} }