From 2d8b540af81653546896e1d188c4d8b21ef7825b Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Mon, 26 Jan 2009 23:16:51 +0000 Subject: [PATCH] changed wxMSW's default toolbar bitmaps size from obsolete 16x15 to 24x24 used by modern apps git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58441 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/changes.txt | 2 ++ src/msw/toolbar.cpp | 10 ++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index d104efc8d4..d5184eecd2 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -487,6 +487,8 @@ wxMSW: should be used. - Implement wxFileName::SetTimes() for directories (Steve Lamerton). - Added wxToolTip::SetMaxWidth() and improved default wrapping (Joachim Hönig). +- Changed default toolbar bitmaps size from obsolete 16x15 to 24x24 used + by modern apps. wxX11: diff --git a/src/msw/toolbar.cpp b/src/msw/toolbar.cpp index bdece22880..13d0789116 100644 --- a/src/msw/toolbar.cpp +++ b/src/msw/toolbar.cpp @@ -43,6 +43,7 @@ #include "wx/stattext.h" #endif +#include "wx/artprov.h" #include "wx/sysopt.h" #include "wx/dcclient.h" @@ -96,10 +97,6 @@ #define TB_GETMAXSIZE (WM_USER + 83) #endif -// these values correspond to those used by comctl32.dll -#define DEFAULTBITMAPX 16 -#define DEFAULTBITMAPY 15 - // ---------------------------------------------------------------------------- // wxWin macros // ---------------------------------------------------------------------------- @@ -284,8 +281,9 @@ void wxToolBar::Init() m_nButtons = 0; - m_defaultWidth = DEFAULTBITMAPX; - m_defaultHeight = DEFAULTBITMAPY; + const wxSize size = wxArtProvider::GetNativeSizeHint(wxART_TOOLBAR); + m_defaultWidth = size.x; + m_defaultHeight = size.y; m_pInTool = NULL; } -- 2.45.2