From 7529250b88f61580d60a3241a8a7fe339928e9a5 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Fri, 27 May 2005 09:14:58 +0000 Subject: [PATCH] Removed ugly separators toolbars again git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34370 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/changes.txt | 3 --- src/msw/tbar95.cpp | 4 +++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index 1527fe6172..ccafeed035 100644 --- 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 3510019626..5744077dfa 100644 --- 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