compilation fix for WXWIN_COMPATIBILITY_2 == 1

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

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 9fd39ade694fbb64471bd5b39dc6f45aab1ba0f6..b0c059dd89606e080b7070523dd90fdda0ae4911 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -238,7 +238,7 @@ bool wxToolBar::Create(wxWindow *parent,
         return FALSE;
 
     // MSW-specific initialisation
         return FALSE;
 
     // MSW-specific initialisation

-    if ( !MSWCreateToolbar(pos, size, style) )
+    if ( !MSWCreateToolbar(pos, size) )

         return FALSE;
 
     // set up the colors and fonts
         return FALSE;
 
     // set up the colors and fonts


@@ -248,11 +248,9 @@ bool wxToolBar::Create(wxWindow *parent,
     return TRUE;
 }
 
     return TRUE;
 }
 

-bool wxToolBar::MSWCreateToolbar(const wxPoint& pos,
-                                 const wxSize& size,
-                                 long style)
+bool wxToolBar::MSWCreateToolbar(const wxPoint& pos, const wxSize& size)

 {
 {

-    if ( !MSWCreateControl(TOOLBARCLASSNAME, _T(""), pos, size, style) )
+    if ( !MSWCreateControl(TOOLBARCLASSNAME, _T(""), pos, size) )

         return FALSE;
 
     // toolbar-specific post initialisation
         return FALSE;
 
     // toolbar-specific post initialisation


@@ -276,7 +274,7 @@ void wxToolBar::Recreate()
 
     UnsubclassWin();
 
 
     UnsubclassWin();
 

-    if ( !MSWCreateToolbar(pos, size, GetWindowStyle()) )
+    if ( !MSWCreateToolbar(pos, size) )

     {
         // what can we do?
         wxFAIL_MSG( _T("recreating the toolbar failed") );
     {
         // what can we do?
         wxFAIL_MSG( _T("recreating the toolbar failed") );


@@ -1197,7 +1195,7 @@ bool wxToolBar::HandleSize(WXWPARAM wParam, WXLPARAM lParam)
                 // FIXME: 6 is hardcoded separator line height...
                 //h += 6;
                 if (HasFlag(wxTB_NODIVIDER))
                 // FIXME: 6 is hardcoded separator line height...
                 //h += 6;
                 if (HasFlag(wxTB_NODIVIDER))

-                    h += 3;
+                    h += 4;

                 else
                     h += 6;
                 h *= m_maxRows;
                 else
                     h += 6;
                 h *= m_maxRows;