reformatted to fit in the page width

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

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 004af499a59c84bc5b2f6316ed7ea246df30af20..7c6515ff121ade578094738c8e1286391acfa22e 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -262,6 +262,10 @@ bool wxToolBar::Create(wxWindow *parent,
             msflags |= TBSTYLE_FLAT | TBSTYLE_TRANSPARENT;
         }
     }
             msflags |= TBSTYLE_FLAT | TBSTYLE_TRANSPARENT;
         }
     }

+    if (style & wxTB_NODIVIDER)
+        msflags |= CCS_NODIVIDER;
+    if (style & wxTB_NOALIGN)
+        msflags |= CCS_NOPARENTALIGN;

 
     // MSW-specific initialisation
     if ( !wxControl::MSWCreateControl(TOOLBARCLASSNAME, msflags) )
 
     // MSW-specific initialisation
     if ( !wxControl::MSWCreateControl(TOOLBARCLASSNAME, msflags) )


@@ -1184,7 +1188,11 @@ bool wxToolBar::HandleSize(WXWPARAM wParam, WXLPARAM lParam)
             if ( m_maxRows )
             {
                 // FIXME: 6 is hardcoded separator line height...
             if ( m_maxRows )
             {
                 // FIXME: 6 is hardcoded separator line height...

-                h += 6;
+                //h += 6;
+                if (HasFlag(wxTB_NODIVIDER))
+                    h += 3;
+                else
+                    h += 6;

                 h *= m_maxRows;
             }
         }
                 h *= m_maxRows;
             }
         }