VC6 (harmless) warning fix

[wxWidgets.git] / src / msw / tbar95.cpp

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 7ea83bd343b65db73824bd93083091830e1092d1..5744077dfa83aa4290ab84e608568403610af116 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -249,8 +249,14 @@ bool wxToolBar::Create(wxWindow *parent,
 #if wxUSE_UXTHEME
     if ( style & wxTB_FLAT )
     {
+        // Testing for an active theme appears to be unnecessary (see comments in patch 1204217).
+        // Disabling the test brings back separator lines.
+        // 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            
         {
             DWORD dwToolbarStyle;
 
@@ -378,6 +384,7 @@ wxSize wxToolBar::DoGetBestSize() const
         sizeBest.y = size.cy;
     }
 
+    CacheBestSize(sizeBest);
     return sizeBest;
 }