From 8fdf4221dc0587ec1f4284b4f16661ebdf92e03f Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <artwik@wp.pl>
Date: Mon, 14 Dec 2015 22:03:24 +0100
Subject: [PATCH] Fix setting tool spacing.

Don't set orthogonal padding value to zero but preserve its current value (using MSWSetPadding method).
This way vertical padding is not zeroed when horizontal padding is set and horizontal padding is not zeroed when vertical padding is set.
---
 src/msw/toolbar.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/msw/toolbar.cpp b/src/msw/toolbar.cpp
index 71d2367dd3..3b444317a5 100644
--- a/src/msw/toolbar.cpp
+++ b/src/msw/toolbar.cpp
@@ -1630,14 +1630,14 @@ void wxToolBar::SetToolDisabledBitmap( int id, const wxBitmap& bitmap )
 
 void wxToolBar::SetToolPacking(int packing)
 {
-    m_toolPacking = packing;
-    if (m_toolPacking > 0 && GetHWND())
+    if ( packing > 0 && packing != m_toolPacking )
     {
-        if (IsVertical())
-            ::SendMessage(GetHWND(), TB_SETPADDING, 0, MAKELPARAM(0, m_toolPacking));
-        else
-            ::SendMessage(GetHWND(), TB_SETPADDING, 0, MAKELPARAM(m_toolPacking, 0));
-        Realize();
+        m_toolPacking = packing;
+        if ( GetHwnd() )
+        {
+            MSWSetPadding(packing);
+            Realize();
+        }
     }
 }