Removed ugly separators toolbars again

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34370 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index 1527fe617209a95d9c2e9739072b7a394599864e..ccafeed035f9d750263c10e110036ac2ef9d3d5c 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -35,10 +35,7 @@ wxMSW:
 - Setting foreground colour for wxCheckBox now works when using XP themes too.
 - Now uses newer font MS Shell Dlg 2 if possible.
 - Compiles again with WIN64.
-- Restored separators on toolbars under XP themes.
 - Winelib compilation now works.
-- When converting a wxIcon to a bitmap check if the icon has an alpha
-  channel and set the bitmap to use it.
 
 wxGTK:
 

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 3510019626eae55666f05da477a13a9df9975015..5744077dfa83aa4290ab84e608568403610af116 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -251,7 +251,9 @@ bool wxToolBar::Create(wxWindow *parent,
     {
         // Testing for an active theme appears to be unnecessary (see comments in patch 1204217).
         // Disabling the test brings back separator lines.
-#if 0
+        // However, the separators can look ugly and distracting, especially between controls,
+        // so I'm restoring the test and removing the separators again - JACS
+#if 1
         wxUxThemeEngine *p = wxUxThemeEngine::Get();
         if ( !p || !p->IsThemeActive() )
 #endif