Remove stray whitespaces
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -61,12 +61,12 @@ static const char *wxArtIDToStock(const wxArtID& id)
|
||||
{
|
||||
#define ART(wxid, gtkid) \
|
||||
if (id == wxid) return gtkid;
|
||||
|
||||
|
||||
ART(wxART_ERROR, GTK_STOCK_DIALOG_ERROR)
|
||||
ART(wxART_INFORMATION, GTK_STOCK_DIALOG_INFO)
|
||||
ART(wxART_WARNING, GTK_STOCK_DIALOG_WARNING)
|
||||
ART(wxART_QUESTION, GTK_STOCK_DIALOG_QUESTION)
|
||||
|
||||
|
||||
//ART(wxART_HELP_SIDE_PANEL, )
|
||||
ART(wxART_HELP_SETTINGS, GTK_STOCK_SELECT_FONT)
|
||||
//ART(wxART_HELP_BOOK, )
|
||||
@@ -121,9 +121,9 @@ static const char *wxArtIDToStock(const wxArtID& id)
|
||||
ART(wxART_FIND, GTK_STOCK_FIND)
|
||||
ART(wxART_FIND_AND_REPLACE, GTK_STOCK_FIND_AND_REPLACE)
|
||||
#endif
|
||||
|
||||
|
||||
return NULL;
|
||||
|
||||
|
||||
#undef ART
|
||||
}
|
||||
|
||||
@@ -174,7 +174,7 @@ static GtkIconSize FindClosestIconSize(const wxSize& size)
|
||||
// only use larger bitmaps, scaling down looks better than scaling up:
|
||||
if (size.x > s_sizes[i].x || size.y > s_sizes[i].y)
|
||||
continue;
|
||||
|
||||
|
||||
unsigned dist = (size.x - s_sizes[i].x) * (size.x - s_sizes[i].x) +
|
||||
(size.y - s_sizes[i].y) * (size.y - s_sizes[i].y);
|
||||
if (dist == 0)
|
||||
@@ -183,7 +183,7 @@ static GtkIconSize FindClosestIconSize(const wxSize& size)
|
||||
{
|
||||
distance = dist;
|
||||
best = s_sizes[i].icon;
|
||||
}
|
||||
}
|
||||
}
|
||||
return best;
|
||||
}
|
||||
@@ -196,11 +196,11 @@ static GdkPixbuf *CreateStockIcon(const char *stockid, GtkIconSize size)
|
||||
// FIXME: This code is not 100% correct, because stock pixmap are
|
||||
// context-dependent and may be affected by theme engine, the
|
||||
// correct value can only be obtained for given GtkWidget object.
|
||||
//
|
||||
//
|
||||
// Fool-proof implementation of stock bitmaps would extend wxBitmap
|
||||
// with "stock-id" representation (in addition to pixmap and pixbuf
|
||||
// ones) and would convert it to pixbuf when rendered.
|
||||
|
||||
|
||||
if (gs_gtkStyle == NULL)
|
||||
{
|
||||
GtkWidget *widget = gtk_button_new();
|
||||
@@ -229,7 +229,7 @@ static GdkPixbuf *CreateThemeIcon(const char *iconname,
|
||||
{
|
||||
gtk_icon_size_lookup(iconsize, &size.x, &size.y);
|
||||
}
|
||||
|
||||
|
||||
return gtk_icon_theme_load_icon(
|
||||
gtk_icon_theme_get_default(),
|
||||
iconname,
|
||||
@@ -244,7 +244,7 @@ wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id,
|
||||
{
|
||||
wxCharBuffer stockid = wxArtIDToStock(id);
|
||||
GtkIconSize stocksize = (size == wxDefaultSize) ?
|
||||
wxArtClientToIconSize(client) :
|
||||
wxArtClientToIconSize(client) :
|
||||
FindClosestIconSize(size);
|
||||
|
||||
// we must have some size, this is arbitrary
|
||||
@@ -277,7 +277,7 @@ wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id,
|
||||
pixbuf = p2;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (!pixbuf)
|
||||
return wxNullBitmap;
|
||||
|
||||
|
Reference in New Issue
Block a user