updated project file

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

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 8777634b70cb8feb5e266af94240c5b1d317d1bd..23c0d42f768f7fb931c1922c84c6a5dd433af0f3 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

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


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "tbar95.h"
 #endif
 
     #pragma implementation "tbar95.h"
 #endif
 


@@ -39,45 +39,27 @@
     #include "wx/control.h"
 #endif
 
     #include "wx/control.h"
 #endif
 

-#if wxUSE_TOOLBAR && defined(__WIN95__) && wxUSE_TOOLBAR_NATIVE
+#if wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE && (!defined(_WIN32_WCE) || (_WIN32_WCE >= 400 && !defined(__POCKETPC__) && !defined(__SMARTPHONE__)))

 
 #include "wx/toolbar.h"
 
 #include "wx/toolbar.h"

-
-#if !defined(__GNUWIN32__) && !defined(__SALFORDC__)
-    #include "malloc.h"
-#endif
+#include "wx/sysopt.h"

 
 #include "wx/msw/private.h"
 
 
 #include "wx/msw/private.h"
 

-#ifndef __TWIN32__
-
-#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
-    #include <commctrl.h>
-#else
-    #include "wx/msw/gnuwin32/extra.h"
+#if wxUSE_UXTHEME
+#include "wx/msw/uxtheme.h"

 #endif
 
 #endif
 

-#endif // __TWIN32__
+// include <commctrl.h> "properly"
+#include "wx/msw/wrapcctl.h"

 
 

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

 #include "wx/app.h"         // for GetComCtl32Version
 
 #include "wx/app.h"         // for GetComCtl32Version
 

-#if defined(__MWERKS__) && defined(__WXMSW__)
-// including <windef.h> for max definition doesn't seem
-// to work using CodeWarrior 6 Windows. So we define it
-// here. (Otherwise we get a undefined identifier 'max'
-// later on in this file.) (Added by dimitri@shortcut.nl)
-#   ifndef max
-#       define max(a,b)            (((a) > (b)) ? (a) : (b))
-#   endif
-
-#endif
-

 // ----------------------------------------------------------------------------
 // conditional compilation
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // conditional compilation
 // ----------------------------------------------------------------------------
 

-// wxWindows previously always considered that toolbar buttons have light grey
+// wxWidgets previously always considered that toolbar buttons have light grey

 // (0xc0c0c0) background and so ignored any bitmap masks - however, this
 // doesn't work with XPMs which then appear to have black background. To make
 // this work, we must respect the bitmap masks - which we do now. This should
 // (0xc0c0c0) background and so ignored any bitmap masks - however, this
 // doesn't work with XPMs which then appear to have black background. To make
 // this work, we must respect the bitmap masks - which we do now. This should


@@ -126,7 +108,26 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
 // wxWin macros
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
+IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
+
+/*
+    TOOLBAR PROPERTIES
+        tool
+            bitmap
+            bitmap2
+            tooltip
+            longhelp
+            radio (bool)
+            toggle (bool)
+        separator
+        style ( wxNO_BORDER | wxTB_HORIZONTAL)
+        bitmapsize
+        margins
+        packing
+        separation
+
+        dontattachtoframe
+*/

 
 BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
     EVT_MOUSE_EVENTS(wxToolBar::OnMouseEvent)
 
 BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
     EVT_MOUSE_EVENTS(wxToolBar::OnMouseEvent)


@@ -181,6 +182,8 @@ public:
 
 private:
     size_t m_nSepCount;
 
 private:
     size_t m_nSepCount;

+
+    DECLARE_NO_COPY_CLASS(wxToolBarTool)

 };
 
 
 };
 
 


@@ -235,30 +238,50 @@ bool wxToolBar::Create(wxWindow *parent,
 {
     // common initialisation
     if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
 {
     // common initialisation
     if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )

-        return FALSE;
+        return false;

 
     // MSW-specific initialisation
 
     // MSW-specific initialisation

-    if ( !MSWCreateToolbar(pos, size, style) )
-        return FALSE;
+    if ( !MSWCreateToolbar(pos, size) )
+        return false;
+
+    wxSetCCUnicodeFormat(GetHwnd());

 
     // set up the colors and fonts
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR));
     SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 
 
     // set up the colors and fonts
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR));
     SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 

-    return TRUE;
+    // workaround for flat toolbar on Windows XP classic style
+#if wxUSE_UXTHEME
+    if ( style & wxTB_FLAT )
+    {
+        wxUxThemeEngine *p = wxUxThemeEngine::Get();
+        if ( !p || !p->IsThemeActive() )
+        {
+            DWORD dwToolbarStyle;
+
+            dwToolbarStyle = (DWORD)::SendMessage(GetHwnd(), TB_GETSTYLE, 0, 0L );
+
+            if ((dwToolbarStyle & TBSTYLE_FLAT) == 0)
+            {
+                dwToolbarStyle |= TBSTYLE_FLAT;
+                ::SendMessage(GetHwnd(), TB_SETSTYLE, 0, (LPARAM)dwToolbarStyle );
+            }
+        }
+    }
+#endif
+
+    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) )
-        return FALSE;
+    if ( !MSWCreateControl(TOOLBARCLASSNAME, wxEmptyString, pos, size) )
+        return false;

 
     // toolbar-specific post initialisation
     ::SendMessage(GetHwnd(), TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0);
 
 
     // toolbar-specific post initialisation
     ::SendMessage(GetHwnd(), TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0);
 

-    return TRUE;
+    return true;

 }
 
 void wxToolBar::Recreate()
 }
 
 void wxToolBar::Recreate()


@@ -276,7 +299,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 +308,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 +370,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 +383,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 +396,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;
 }
 


@@ -381,7 +412,8 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *tool)
     // Realize() later
     tool->Attach(this);
 
     // Realize() later
     tool->Attach(this);
 

-    return TRUE;
+    InvalidateBestSize();
+    return true;

 }
 
 bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
 }
 
 bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)


@@ -393,7 +425,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();


@@ -438,7 +470,7 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
         {
             wxLogLastError(wxT("TB_DELETEBUTTON"));
 
         {
             wxLogLastError(wxT("TB_DELETEBUTTON"));
 

-            return FALSE;
+            return false;

         }
     }
 
         }
     }
 


@@ -454,11 +486,12 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
             int x;
             wxControl *control = tool2->GetControl();
             control->GetPosition(&x, NULL);
             int x;
             wxControl *control = tool2->GetControl();
             control->GetPosition(&x, NULL);

-            control->Move(x - width, -1);
+            control->Move(x - width, wxDefaultCoord);

         }
     }
 
         }
     }
 

-    return TRUE;
+    InvalidateBestSize();
+    return true;

 }
 
 bool wxToolBar::Realize()
 }
 
 bool wxToolBar::Realize()


@@ -467,15 +500,37 @@ bool wxToolBar::Realize()
     if ( nTools == 0 )
     {
         // nothing to do
     if ( nTools == 0 )
     {
         // nothing to do

-        return TRUE;
+        return true;

     }
 
     const bool isVertical = HasFlag(wxTB_VERTICAL);
 
     }
 
     const bool isVertical = HasFlag(wxTB_VERTICAL);
 

+    bool doRemap, doRemapBg, doTransparent;
+    if (wxSystemOptions::GetOptionInt(wxT("msw.remap")) == 2)
+    {
+        doRemapBg = doRemap = false;
+        doTransparent = true;
+    }
+    else
+    {   doRemap = !wxSystemOptions::HasOption(wxT("msw.remap"))
+            || wxSystemOptions::GetOptionInt(wxT("msw.remap")) == 1;
+        doRemapBg = !doRemap;
+        doTransparent = false;
+    }
+
+    // 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::Node *node;
+    wxToolBarToolsList::compatibility_iterator node;

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


@@ -502,6 +557,9 @@ bool wxToolBar::Realize()
         wxMemoryDC dcAllButtons;
         wxBitmap bitmap(totalBitmapWidth, totalBitmapHeight);
         dcAllButtons.SelectObject(bitmap);
         wxMemoryDC dcAllButtons;
         wxBitmap bitmap(totalBitmapWidth, totalBitmapHeight);
         dcAllButtons.SelectObject(bitmap);

+        if (doTransparent)
+            dcAllButtons.SetBackground(*wxTRANSPARENT_BRUSH);
+        else

         dcAllButtons.SetBackground(*wxLIGHT_GREY_BRUSH);
         dcAllButtons.Clear();
 
         dcAllButtons.SetBackground(*wxLIGHT_GREY_BRUSH);
         dcAllButtons.Clear();
 


@@ -515,7 +573,7 @@ bool wxToolBar::Realize()
         {
             wxLogLastError(_T("CreateCompatibleBitmap"));
 
         {
             wxLogLastError(_T("CreateCompatibleBitmap"));
 

-            return FALSE;
+            return false;

         }
 
         m_hBitmap = (WXHBITMAP)hBitmap;
         }
 
         m_hBitmap = (WXHBITMAP)hBitmap;


@@ -526,6 +584,22 @@ bool wxToolBar::Realize()
         MemoryHDC memoryDC2;
 #endif // USE_BITMAP_MASKS/!USE_BITMAP_MASKS
 
         MemoryHDC memoryDC2;
 #endif // USE_BITMAP_MASKS/!USE_BITMAP_MASKS
 

+        if (doRemapBg)
+        {
+#if USE_BITMAP_MASKS
+            dcAllButtons.SelectObject(wxNullBitmap);
+#endif
+
+            // Even if we're not remapping the bitmap
+            // content, we still have to remap the background.
+            hBitmap = (HBITMAP)MapBitmap((WXHBITMAP) hBitmap,
+                totalBitmapWidth, totalBitmapHeight);
+
+#if USE_BITMAP_MASKS
+            dcAllButtons.SelectObject(bitmap);
+#endif
+        }
+

         // the button position
         wxCoord x = 0;
 
         // the button position
         wxCoord x = 0;
 


@@ -540,13 +614,15 @@ bool wxToolBar::Realize()
                 const wxBitmap& bmp = tool->GetNormalBitmap();
                 if ( bmp.Ok() )
                 {
                 const wxBitmap& bmp = tool->GetNormalBitmap();
                 if ( bmp.Ok() )
                 {

+                    int xOffset = wxMax(0, (m_defaultWidth - bmp.GetWidth())/2);
+                    int yOffset = wxMax(0, (m_defaultHeight - bmp.GetHeight())/2);

 #if USE_BITMAP_MASKS
                     // notice the last parameter: do use mask
 #if USE_BITMAP_MASKS
                     // notice the last parameter: do use mask

-                    dcAllButtons.DrawBitmap(bmp, x, 0, TRUE);
+                    dcAllButtons.DrawBitmap(bmp, x+xOffset, yOffset, true);

 #else // !USE_BITMAP_MASKS
                     SelectInHDC hdcSelector2(memoryDC2, GetHbitmapOf(bmp));
                     if ( !BitBlt(memoryDC,
 #else // !USE_BITMAP_MASKS
                     SelectInHDC hdcSelector2(memoryDC2, GetHbitmapOf(bmp));
                     if ( !BitBlt(memoryDC,

-                                 x, 0,  m_defaultWidth, m_defaultHeight,
+                                 x+xOffset, yOffset,  m_defaultWidth, m_defaultHeight,

                                  memoryDC2,
                                  0, 0, SRCCOPY) )
                     {
                                  memoryDC2,
                                  0, 0, SRCCOPY) )
                     {


@@ -574,11 +650,14 @@ bool wxToolBar::Realize()
         bitmap.SetHBITMAP(0);
 #endif // USE_BITMAP_MASKS/!USE_BITMAP_MASKS
 
         bitmap.SetHBITMAP(0);
 #endif // USE_BITMAP_MASKS/!USE_BITMAP_MASKS
 

-        // Map to system colours
-        hBitmap = (HBITMAP)MapBitmap((WXHBITMAP) hBitmap,
-                                     totalBitmapWidth, totalBitmapHeight);
+        if (doRemap)
+        {
+            // Map to system colours
+            hBitmap = (HBITMAP)MapBitmap((WXHBITMAP) hBitmap,
+                totalBitmapWidth, totalBitmapHeight);
+        }

 
 

-        bool addBitmap = TRUE;
+        bool addBitmap = true;

 
         if ( oldToolBarBitmap )
         {
 
         if ( oldToolBarBitmap )
         {


@@ -600,7 +679,7 @@ bool wxToolBar::Realize()
                 ::DeleteObject(oldToolBarBitmap);
 
                 // already done
                 ::DeleteObject(oldToolBarBitmap);
 
                 // already done

-                addBitmap = FALSE;
+                addBitmap = false;

             }
             else
 #endif // TB_REPLACEBITMAP
             }
             else
 #endif // TB_REPLACEBITMAP


@@ -608,19 +687,10 @@ bool wxToolBar::Realize()
                 // we can't replace the old bitmap, so we will add another one
                 // (awfully inefficient, but what else to do?) and shift the bitmap
                 // indices accordingly
                 // we can't replace the old bitmap, so we will add another one
                 // (awfully inefficient, but what else to do?) and shift the bitmap
                 // indices accordingly

-                addBitmap = TRUE;
+                addBitmap = true;

 
                 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


@@ -652,21 +722,26 @@ bool wxToolBar::Realize()
     // this array will hold the indices of all controls in the toolbar
     wxArrayInt controlIds;
 
     // this array will hold the indices of all controls in the toolbar
     wxArrayInt controlIds;
 

-    bool lastWasRadio = FALSE;
+    bool lastWasRadio = false;

     int i = 0;
     for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
     {
         wxToolBarToolBase *tool = node->GetData();
 
     int i = 0;
     for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
     {
         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];
 
         wxZeroMemory(button);
 
 
         TBBUTTON& button = buttons[i];
 
         wxZeroMemory(button);
 

-        bool isRadio = FALSE;
+        bool isRadio = false;

         switch ( tool->GetStyle() )
         {
             case wxTOOL_STYLE_CONTROL:
         switch ( tool->GetStyle() )
         {
             case wxTOOL_STYLE_CONTROL:


@@ -710,10 +785,10 @@ bool wxToolBar::Realize()
                             // radio items
                             button.fsState |= TBSTATE_CHECKED;
 
                             // radio items
                             button.fsState |= TBSTATE_CHECKED;
 

-                            tool->Toggle(TRUE);
+                            tool->Toggle(true);

                         }
 
                         }
 

-                        isRadio = TRUE;
+                        isRadio = true;

                         break;
 
                     case wxITEM_CHECK:
                         break;
 
                     case wxITEM_CHECK:


@@ -764,8 +839,8 @@ bool wxToolBar::Realize()
         // note that we use TB_GETITEMRECT and not TB_GETRECT because the
         // latter only appeared in v4.70 of comctl32.dll
         RECT r;
         // note that we use TB_GETITEMRECT and not TB_GETRECT because the
         // latter only appeared in v4.70 of comctl32.dll
         RECT r;

-        if ( !SendMessage(GetHwnd(), TB_GETITEMRECT,
-                          index, (LPARAM)(LPRECT)&r) )
+        if ( !::SendMessage(GetHwnd(), TB_GETITEMRECT,
+                            index, (LPARAM)(LPRECT)&r) )

         {
             wxLogLastError(wxT("TB_GETITEMRECT"));
         }
         {
             wxLogLastError(wxT("TB_GETITEMRECT"));
         }


@@ -783,10 +858,10 @@ bool wxToolBar::Realize()
         wxSize size = control->GetSize();
 
         // the position of the leftmost controls corner
         wxSize size = control->GetSize();
 
         // the position of the leftmost controls corner

-        int left = -1;
+        int left = wxDefaultCoord;

 
         // TB_SETBUTTONINFO message is only supported by comctl32.dll 4.71+
 
         // TB_SETBUTTONINFO message is only supported by comctl32.dll 4.71+

-#if defined(_WIN32_IE) && (_WIN32_IE >= 0x400 )
+#ifdef TB_SETBUTTONINFO

         // available in headers, now check whether it is available now
         // (during run-time)
         if ( wxTheApp->GetComCtl32Version() >= 471 )
         // available in headers, now check whether it is available now
         // (during run-time)
         if ( wxTheApp->GetComCtl32Version() >= 471 )


@@ -797,8 +872,8 @@ bool wxToolBar::Realize()
             tbbi.cbSize = sizeof(tbbi);
             tbbi.dwMask = TBIF_SIZE;
             tbbi.cx = size.x;
             tbbi.cbSize = sizeof(tbbi);
             tbbi.dwMask = TBIF_SIZE;
             tbbi.cx = size.x;

-            if ( !SendMessage(GetHwnd(), TB_SETBUTTONINFO,
-                              tool->GetId(), (LPARAM)&tbbi) )
+            if ( !::SendMessage(GetHwnd(), TB_SETBUTTONINFO,
+                                tool->GetId(), (LPARAM)&tbbi) )

             {
                 // the id is probably invalid?
                 wxLogLastError(wxT("TB_SETBUTTONINFO"));
             {
                 // the id is probably invalid?
                 wxLogLastError(wxT("TB_SETBUTTONINFO"));


@@ -821,8 +896,8 @@ bool wxToolBar::Realize()
             size_t nSeparators = size.x / widthSep;
             for ( size_t nSep = 0; nSep < nSeparators; nSep++ )
             {
             size_t nSeparators = size.x / widthSep;
             for ( size_t nSep = 0; nSep < nSeparators; nSep++ )
             {

-                if ( !SendMessage(GetHwnd(), TB_INSERTBUTTON,
-                                  index, (LPARAM)&tbb) )
+                if ( !::SendMessage(GetHwnd(), TB_INSERTBUTTON,
+                                    index, (LPARAM)&tbb) )

                 {
                     wxLogLastError(wxT("TB_INSERTBUTTON"));
                 }
                 {
                     wxLogLastError(wxT("TB_INSERTBUTTON"));
                 }


@@ -835,7 +910,7 @@ bool wxToolBar::Realize()
             ((wxToolBarTool *)tool)->SetSeparatorsCount(nSeparators);
 
             // adjust the controls width to exactly cover the separators
             ((wxToolBarTool *)tool)->SetSeparatorsCount(nSeparators);
 
             // adjust the controls width to exactly cover the separators

-            control->SetSize((nSeparators + 1)*widthSep, -1);
+            control->SetSize((nSeparators + 1)*widthSep, wxDefaultCoord);

         }
 
         // position the control itself correctly vertically
         }
 
         // position the control itself correctly vertically


@@ -844,7 +919,7 @@ bool wxToolBar::Realize()
         if ( diff < 0 )
         {
             // the control is too high, resize to fit
         if ( diff < 0 )
         {
             // the control is too high, resize to fit

-            control->SetSize(-1, height - 2);
+            control->SetSize(wxDefaultCoord, height - 2);

 
             diff = 2;
         }
 
             diff = 2;
         }


@@ -859,7 +934,7 @@ bool wxToolBar::Realize()
         }
         else // horizontal toolbar
         {
         }
         else // horizontal toolbar
         {

-            if ( left == -1 )
+            if ( left == wxDefaultCoord )

                 left = r.left;
 
             top = r.top;
                 left = r.left;
 
             top = r.top;


@@ -889,7 +964,8 @@ bool wxToolBar::Realize()
         }
     }
 
         }
     }
 

-    return TRUE;
+    InvalidateBestSize();
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -900,33 +976,35 @@ bool wxToolBar::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD id)
 {
     wxToolBarToolBase *tool = FindById((int)id);
     if ( !tool )
 {
     wxToolBarToolBase *tool = FindById((int)id);
     if ( !tool )

-        return FALSE;
+        return false;
+
+    bool toggled = false; // just to suppress warnings

 
     if ( tool->CanBeToggled() )
     {
         LRESULT state = ::SendMessage(GetHwnd(), TB_GETSTATE, id, 0);
 
     if ( tool->CanBeToggled() )
     {
         LRESULT state = ::SendMessage(GetHwnd(), TB_GETSTATE, id, 0);

-        tool->Toggle((state & TBSTATE_CHECKED) != 0);
-    }
+        toggled = (state & TBSTATE_CHECKED) != 0;

 
 

-    bool toggled = tool->IsToggled();
+        // ignore the event when a radio button is released, as this doesn't seem to
+        // happen at all, and is handled otherwise
+        if ( tool->GetKind() == wxITEM_RADIO && !toggled )
+            return true;
+
+        tool->Toggle(toggled);
+        UnToggleRadioGroup(tool);
+    }

 
 

-    // avoid sending the event when a radio button is released, this is not
-    // interesting
-    if ( !tool->CanBeToggled() || tool->GetKind() != wxITEM_RADIO || toggled )
+    // OnLeftClick() can veto the button state change - for buttons which
+    // may be toggled only, of couse
+    if ( !OnLeftClick((int)id, toggled) && tool->CanBeToggled() )

     {
     {

-        // OnLeftClick() can veto the button state change - for buttons which
-        // may be toggled only, of couse
-        if ( !OnLeftClick((int)id, toggled) && tool->CanBeToggled() )
-        {
-            // revert back
-            toggled = !toggled;
-            tool->SetToggle(toggled);
+        // revert back
+        tool->Toggle(!toggled);

 
 

-            ::SendMessage(GetHwnd(), TB_CHECKBUTTON, id, MAKELONG(toggled, 0));
-        }
+        ::SendMessage(GetHwnd(), TB_CHECKBUTTON, id, MAKELONG(toggled, 0));

     }
 
     }
 

-    return TRUE;
+    return true;

 }
 
 bool wxToolBar::MSWOnNotify(int WXUNUSED(idCtrl),
 }
 
 bool wxToolBar::MSWOnNotify(int WXUNUSED(idCtrl),


@@ -941,22 +1019,22 @@ bool wxToolBar::MSWOnNotify(int WXUNUSED(idCtrl),
     // in an ANSI application - this seems to be a bug in comctl32.dll v5
     UINT code = hdr->code;
     if ( (code != (UINT) TTN_NEEDTEXTA) && (code != (UINT) TTN_NEEDTEXTW) )
     // in an ANSI application - this seems to be a bug in comctl32.dll v5
     UINT code = hdr->code;
     if ( (code != (UINT) TTN_NEEDTEXTA) && (code != (UINT) TTN_NEEDTEXTW) )

-        return FALSE;
+        return false;

 
     HWND toolTipWnd = (HWND)::SendMessage((HWND)GetHWND(), TB_GETTOOLTIPS, 0, 0);
     if ( toolTipWnd != hdr->hwndFrom )
 
     HWND toolTipWnd = (HWND)::SendMessage((HWND)GetHWND(), TB_GETTOOLTIPS, 0, 0);
     if ( toolTipWnd != hdr->hwndFrom )

-        return FALSE;
+        return false;

 
     LPTOOLTIPTEXT ttText = (LPTOOLTIPTEXT)lParam;
     int id = (int)ttText->hdr.idFrom;
 
     wxToolBarToolBase *tool = FindById(id);
     if ( !tool )
 
     LPTOOLTIPTEXT ttText = (LPTOOLTIPTEXT)lParam;
     int id = (int)ttText->hdr.idFrom;
 
     wxToolBarToolBase *tool = FindById(id);
     if ( !tool )

-        return FALSE;
+        return false;

 
     return HandleTooltipNotify(code, lParam, tool->GetShortHelp());
 #else
 
     return HandleTooltipNotify(code, lParam, tool->GetShortHelp());
 #else

-    return FALSE;
+    return false;

 #endif
 }
 
 #endif
 }
 


@@ -996,7 +1074,8 @@ wxSize wxToolBar::GetToolSize() const
 {
     // TB_GETBUTTONSIZE is supported from version 4.70
 #if defined(_WIN32_IE) && (_WIN32_IE >= 0x300 ) \
 {
     // TB_GETBUTTONSIZE is supported from version 4.70
 #if defined(_WIN32_IE) && (_WIN32_IE >= 0x300 ) \

-    && !( defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 1, 0 ) )
+    && !( defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 1, 0 ) ) \
+    && !defined (__DIGITALMARS__)

     if ( wxTheApp->GetComCtl32Version() >= 470 )
     {
         DWORD dw = ::SendMessage(GetHwnd(), TB_GETBUTTONSIZE, 0, 0);
     if ( wxTheApp->GetComCtl32Version() >= 470 )
     {
         DWORD dw = ::SendMessage(GetHwnd(), TB_GETBUTTONSIZE, 0, 0);


@@ -1015,7 +1094,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() )
     {


@@ -1064,7 +1143,7 @@ wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
 void wxToolBar::UpdateSize()
 {
     // the toolbar size changed
 void wxToolBar::UpdateSize()
 {
     // the toolbar size changed

-    SendMessage(GetHwnd(), TB_AUTOSIZE, 0, 0);
+    ::SendMessage(GetHwnd(), TB_AUTOSIZE, 0, 0);

 
     // we must also refresh the frame after the toolbar size (possibly) changed
     wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
 
     // we must also refresh the frame after the toolbar size (possibly) changed
     wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);


@@ -1167,9 +1246,9 @@ void wxToolBar::OnMouseEvent(wxMouseEvent& event)
     }
 }
 
     }
 }
 

-bool wxToolBar::HandleSize(WXWPARAM wParam, WXLPARAM lParam)
+bool wxToolBar::HandleSize(WXWPARAM WXUNUSED(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) )


@@ -1194,12 +1273,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;
             }
         }


@@ -1211,10 +1286,10 @@ bool wxToolBar::HandleSize(WXWPARAM wParam, WXLPARAM lParam)
         }
 
         // message processed
         }
 
         // message processed

-        return TRUE;
+        return true;

     }
 
     }
 

-    return FALSE;
+    return false;

 }
 
 bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
 }
 
 bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)


@@ -1223,7 +1298,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() )


@@ -1233,7 +1308,7 @@ bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
     if ( !node )
     {
         // no controls, nothing to erase
     if ( !node )
     {
         // no controls, nothing to erase

-        return FALSE;
+        return false;

     }
 
     // prepare the DC on which we'll be drawing
     }
 
     // prepare the DC on which we'll be drawing


@@ -1242,10 +1317,10 @@ bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
     dc.SetPen(*wxTRANSPARENT_PEN);
 
     RECT r;
     dc.SetPen(*wxTRANSPARENT_PEN);
 
     RECT r;

-    if ( !GetUpdateRect(GetHwnd(), &r, FALSE) )
+    if ( !::GetUpdateRect(GetHwnd(), &r, FALSE) )

     {
         // nothing to redraw anyhow
     {
         // nothing to redraw anyhow

-        return FALSE;
+        return false;

     }
 
     wxRect rectUpdate;
     }
 
     wxRect rectUpdate;


@@ -1305,15 +1380,19 @@ bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
                 {
                     // yes, do erase it!
                     dc.DrawRectangle(rectItem);
                 {
                     // yes, do erase it!
                     dc.DrawRectangle(rectItem);

+
+                    // Necessary in case we use a no-paint-on-size
+                    // style in the parent: the controls can disappear
+                    control->Refresh(false);

                 }
             }
         }
     }
 
                 }
             }
         }
     }
 

-    return TRUE;
+    return true;

 }
 
 }
 

-void wxToolBar::HandleMouseMove(WXWPARAM wParam, WXLPARAM lParam)
+void wxToolBar::HandleMouseMove(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam)

 {
     wxCoord x = GET_X_LPARAM(lParam),
             y = GET_Y_LPARAM(lParam);
 {
     wxCoord x = GET_X_LPARAM(lParam),
             y = GET_Y_LPARAM(lParam);


@@ -1334,7 +1413,7 @@ void wxToolBar::HandleMouseMove(WXWPARAM wParam, WXLPARAM lParam)
     }
 }
 
     }
 }
 

-long wxToolBar::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+WXLRESULT wxToolBar::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)

 {
     switch ( nMsg )
     {
 {
     switch ( nMsg )
     {