From 993b016d6cd6661918ab25475953862f97bac746 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 7 Apr 2007 13:25:34 +0000 Subject: [PATCH] use smaller icons, it looks better (patch 1695225) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/widgets/widgets.cpp | 7 ++++--- samples/widgets/widgets.h | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp index fde4f53272..31d4763cce 100644 --- a/samples/widgets/widgets.cpp +++ b/samples/widgets/widgets.cpp @@ -458,9 +458,10 @@ WidgetsFrame::WidgetsFrame(const wxString& title) void WidgetsFrame::InitBook() { #if USE_ICONS_IN_BOOK - wxImageList *imageList = new wxImageList(32, 32); + wxImageList *imageList = new wxImageList(ICON_SIZE, ICON_SIZE); - imageList->Add(wxBitmap(sample_xpm)); + wxImage img(sample_xpm); + imageList->Add(wxBitmap(img.Scale(ICON_SIZE, ICON_SIZE))); #else wxImageList *imageList = NULL; #endif @@ -929,7 +930,7 @@ WidgetsPage::WidgetsPage(WidgetsBookCtrl *book, wxTAB_TRAVERSAL) { #if USE_ICONS_IN_BOOK - imaglist->Add(wxBitmap(icon)); + imaglist->Add(wxBitmap(wxImage(icon).Scale(ICON_SIZE, ICON_SIZE))); #else wxUnusedVar(imaglist); wxUnusedVar(icon); diff --git a/samples/widgets/widgets.h b/samples/widgets/widgets.h index 7f077cfb54..e717e5ad08 100644 --- a/samples/widgets/widgets.h +++ b/samples/widgets/widgets.h @@ -40,6 +40,7 @@ #define USE_ICONS_IN_BOOK 0 #else #define USE_ICONS_IN_BOOK 1 + #define ICON_SIZE 16 #endif class WXDLLEXPORT wxCheckBox; -- 2.47.2