Compilaton fixes.

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

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 836a79ee2f6ead96bc210745ed5c7c3c319fea73..a1d6e9d48457589a7e6a01158658494bb773c814 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -49,17 +49,14 @@
 
 #include "wx/msw/private.h"
 
 
 #include "wx/msw/private.h"
 

-#ifndef __TWIN32__
-
-#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
+#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))

     #include <commctrl.h>
 #else
     #include "wx/msw/gnuwin32/extra.h"
 #endif
 
     #include <commctrl.h>
 #else
     #include "wx/msw/gnuwin32/extra.h"
 #endif
 

-#endif // __TWIN32__
+#include "wx/msw/missing.h"

 
 

-#include "wx/msw/dib.h"

 #include "wx/app.h"         // for GetComCtl32Version
 
 #if defined(__MWERKS__) && defined(__WXMSW__)
 #include "wx/app.h"         // for GetComCtl32Version
 
 #if defined(__MWERKS__) && defined(__WXMSW__)


@@ -238,7 +235,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 +245,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, wxEmptyString, pos, size) )

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


@@ -276,7 +271,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") );


@@ -285,7 +280,7 @@ void wxToolBar::Recreate()
     }
 
     // reparent all our children under the new toolbar
     }
 
     // reparent all our children under the new toolbar

-    for ( wxWindowList::Node *node = m_children.GetFirst();
+    for ( wxWindowList::compatibility_iterator node = m_children.GetFirst();

           node;
           node = node->GetNext() )
     {
           node;
           node = node->GetNext() )
     {


@@ -347,7 +342,7 @@ WXDWORD wxToolBar::MSWGetStyle(long style, WXDWORD *exstyle) const
     // do have tooltips wouldn't work
     msStyle |= TBSTYLE_TOOLTIPS;
 
     // do have tooltips wouldn't work
     msStyle |= TBSTYLE_TOOLTIPS;
 

-    if ( style & wxTB_FLAT )
+    if ( style & (wxTB_FLAT | wxTB_HORZ_LAYOUT) )

     {
         // static as it doesn't change during the program lifetime
         static int s_verComCtl = wxTheApp->GetComCtl32Version();
     {
         // static as it doesn't change during the program lifetime
         static int s_verComCtl = wxTheApp->GetComCtl32Version();


@@ -360,6 +355,11 @@ WXDWORD wxToolBar::MSWGetStyle(long style, WXDWORD *exstyle) const
         {
             msStyle |= TBSTYLE_FLAT | TBSTYLE_TRANSPARENT;
         }
         {
             msStyle |= TBSTYLE_FLAT | TBSTYLE_TRANSPARENT;
         }

+
+        if ( s_verComCtl >= 470 && style & wxTB_HORZ_LAYOUT )
+        {
+            msStyle |= TBSTYLE_LIST;
+        }

     }
 
     if ( style & wxTB_NODIVIDER )
     }
 
     if ( style & wxTB_NODIVIDER )


@@ -368,6 +368,9 @@ WXDWORD wxToolBar::MSWGetStyle(long style, WXDWORD *exstyle) const
     if ( style & wxTB_NOALIGN )
         msStyle |= CCS_NOPARENTALIGN;
 
     if ( style & wxTB_NOALIGN )
         msStyle |= CCS_NOPARENTALIGN;
 

+    if ( style & wxTB_VERTICAL )
+        msStyle |= CCS_VERT;
+

     return msStyle;
 }
 
     return msStyle;
 }
 


@@ -393,7 +396,7 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
     // first determine the position of the first button to delete: it may be
     // different from pos if we use several separators to cover the space used
     // by a control
     // first determine the position of the first button to delete: it may be
     // different from pos if we use several separators to cover the space used
     // by a control

-    wxToolBarToolsList::Node *node;
+    wxToolBarToolsList::compatibility_iterator node;

     for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
     {
         wxToolBarToolBase *tool2 = node->GetData();
     for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
     {
         wxToolBarToolBase *tool2 = node->GetData();


@@ -472,9 +475,19 @@ bool wxToolBar::Realize()
 
     const bool isVertical = HasFlag(wxTB_VERTICAL);
 
 
     const bool isVertical = HasFlag(wxTB_VERTICAL);
 

+    // delete all old buttons, if any
+    for ( size_t pos = 0; pos < m_nButtons; pos++ )
+    {
+        if ( !::SendMessage(GetHwnd(), TB_DELETEBUTTON, 0, 0) )
+        {
+            wxLogDebug(wxT("TB_DELETEBUTTON failed"));
+        }
+    }
+

     // First, add the bitmap: we use one bitmap for all toolbar buttons
     // ----------------------------------------------------------------
 
     // First, add the bitmap: we use one bitmap for all toolbar buttons
     // ----------------------------------------------------------------
 

+    wxToolBarToolsList::compatibility_iterator node;

     int bitmapId = 0;
 
     wxSize sizeBmp;
     int bitmapId = 0;
 
     wxSize sizeBmp;


@@ -531,9 +544,7 @@ bool wxToolBar::Realize()
         // the number of buttons (not separators)
         int nButtons = 0;
 
         // the number of buttons (not separators)
         int nButtons = 0;
 

-        for ( wxToolBarToolsList::Node *node = m_tools.GetFirst();
-              node;
-              node = node->GetNext() )
+        for ( node = m_tools.GetFirst(); node; node = node->GetNext() )

         {
             wxToolBarToolBase *tool = node->GetData();
             if ( tool->IsButton() )
         {
             wxToolBarToolBase *tool = node->GetData();
             if ( tool->IsButton() )


@@ -613,15 +624,6 @@ bool wxToolBar::Realize()
 
                 bitmapId = m_nButtons;
             }
 
                 bitmapId = m_nButtons;
             }

-
-            // Now delete all the buttons
-            for ( size_t pos = 0; pos < m_nButtons; pos++ )
-            {
-                if ( !::SendMessage(GetHwnd(), TB_DELETEBUTTON, 0, 0) )
-                {
-                    wxLogDebug(wxT("TB_DELETEBUTTON failed"));
-                }
-            }

         }
 
         if ( addBitmap ) // no old bitmap or we can't replace it
         }
 
         if ( addBitmap ) // no old bitmap or we can't replace it


@@ -655,15 +657,18 @@ bool wxToolBar::Realize()
 
     bool lastWasRadio = FALSE;
     int i = 0;
 
     bool lastWasRadio = FALSE;
     int i = 0;

-    for ( wxToolBarToolsList::Node *node = m_tools.GetFirst();
-          node;
-          node = node->GetNext() )
+    for ( node = m_tools.GetFirst(); node; node = node->GetNext() )

     {
         wxToolBarToolBase *tool = node->GetData();
 
     {
         wxToolBarToolBase *tool = node->GetData();
 

-        // don't add separators to the vertical toolbar - looks ugly
-        if ( isVertical && tool->IsSeparator() )
+        // don't add separators to the vertical toolbar with old comctl32.dll
+        // versions as they didn't handle this properly
+        if ( isVertical && tool->IsSeparator() &&
+                wxTheApp->GetComCtl32Version() <= 472 )
+        {

             continue;
             continue;

+        }
+

 
         TBBUTTON& button = buttons[i];
 
 
         TBBUTTON& button = buttons[i];
 


@@ -1018,7 +1023,7 @@ static
 wxToolBarToolBase *GetItemSkippingDummySpacers(const wxToolBarToolsList& tools,
                                                size_t index )
 {
 wxToolBarToolBase *GetItemSkippingDummySpacers(const wxToolBarToolsList& tools,
                                                size_t index )
 {

-    wxToolBarToolsList::Node* current = tools.GetFirst();
+    wxToolBarToolsList::compatibility_iterator current = tools.GetFirst();

 
     for ( ; current != 0; current = current->GetNext() )
     {
 
     for ( ; current != 0; current = current->GetNext() )
     {


@@ -1172,7 +1177,7 @@ void wxToolBar::OnMouseEvent(wxMouseEvent& event)
 
 bool wxToolBar::HandleSize(WXWPARAM wParam, WXLPARAM lParam)
 {
 
 bool wxToolBar::HandleSize(WXWPARAM wParam, WXLPARAM lParam)
 {

-    // calculate our minor dimenstion ourselves - we're confusing the standard
+    // calculate our minor dimension ourselves - we're confusing the standard

     // logic (TB_AUTOSIZE) with our horizontal toolbars and other hacks
     RECT r;
     if ( ::SendMessage(GetHwnd(), TB_GETITEMRECT, 0, (LPARAM)&r) )
     // logic (TB_AUTOSIZE) with our horizontal toolbars and other hacks
     RECT r;
     if ( ::SendMessage(GetHwnd(), TB_GETITEMRECT, 0, (LPARAM)&r) )


@@ -1197,12 +1202,8 @@ bool wxToolBar::HandleSize(WXWPARAM wParam, WXLPARAM lParam)
                 h = r.bottom - r.top;
             if ( m_maxRows )
             {
                 h = r.bottom - r.top;
             if ( m_maxRows )
             {

-                // FIXME: 6 is hardcoded separator line height...
-                //h += 6;
-                if (HasFlag(wxTB_NODIVIDER))
-                    h += 3;
-                else
-                    h += 6;
+                // FIXME: hardcoded separator line height...
+                h += HasFlag(wxTB_NODIVIDER) ? 4 : 6;

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


@@ -1226,7 +1227,7 @@ bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
     // any here
 
     // first of all, do we have any controls at all?
     // any here
 
     // first of all, do we have any controls at all?

-    wxToolBarToolsList::Node *node;
+    wxToolBarToolsList::compatibility_iterator node;

     for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
     {
         if ( node->GetData()->IsControl() )
     for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
     {
         if ( node->GetData()->IsControl() )