Multicharacter fix for MinGW and OW, semicolon fix for Borland.

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

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 7ea83bd343b65db73824bd93083091830e1092d1..3510019626eae55666f05da477a13a9df9975015 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -249,8 +249,12 @@ 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.
+#if 0
         wxUxThemeEngine *p = wxUxThemeEngine::Get();
         if ( !p || !p->IsThemeActive() )
+#endif            
         {
             DWORD dwToolbarStyle;
 
@@ -378,6 +382,7 @@ wxSize wxToolBar::DoGetBestSize() const
         sizeBest.y = size.cy;
     }
 
+    CacheBestSize(sizeBest);
     return sizeBest;
 }