Checkable items in wxToolMenuBarTool supported.

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

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 7ec5232a1726dc54876ddf7dcfe858b41bae64ee..1b69f1db05b3ac85a5093ca42d09c32dc05080df 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,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "tbar95.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -39,52 +35,23 @@
     #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(__SMARTPHONE__)

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

-
-#if !defined(__GNUWIN32__) && !defined(__SALFORDC__)
-    #include "malloc.h"
-#endif
+#include "wx/sysopt.h"
+#include "wx/image.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
-// ----------------------------------------------------------------------------
-
-// wxWindows 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
-// be ok in any case, but to restore 100% compatible with the old version
-// behaviour, you can set this to 0.
-#define USE_BITMAP_MASKS 1
-

 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------


@@ -101,6 +68,10 @@
     #define TBSTYLE_TRANSPARENT     0x8000
 #endif
 
     #define TBSTYLE_TRANSPARENT     0x8000
 #endif
 

+#ifndef TBSTYLE_TOOLTIPS
+    #define TBSTYLE_TOOLTIPS        0x0100
+#endif
+

 // Messages
 #ifndef TB_GETSTYLE
     #define TB_SETSTYLE             (WM_USER + 56)
 // Messages
 #ifndef TB_GETSTYLE
     #define TB_SETSTYLE             (WM_USER + 56)


@@ -111,22 +82,43 @@
     #define TB_HITTEST              (WM_USER + 69)
 #endif
 
     #define TB_HITTEST              (WM_USER + 69)
 #endif
 

+#ifndef TB_GETMAXSIZE
+    #define TB_GETMAXSIZE           (WM_USER + 83)
+#endif
+

 // these values correspond to those used by comctl32.dll
 #define DEFAULTBITMAPX   16
 #define DEFAULTBITMAPY   15
 // these values correspond to those used by comctl32.dll
 #define DEFAULTBITMAPX   16
 #define DEFAULTBITMAPY   15

-#define DEFAULTBUTTONX   24
-#define DEFAULTBUTTONY   24
-#define DEFAULTBARHEIGHT 27

 
 // ----------------------------------------------------------------------------
 // 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)
     EVT_SYS_COLOUR_CHANGED(wxToolBar::OnSysColourChanged)
 
 BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
     EVT_MOUSE_EVENTS(wxToolBar::OnMouseEvent)
     EVT_SYS_COLOUR_CHANGED(wxToolBar::OnSysColourChanged)

+    EVT_ERASE_BACKGROUND(wxToolBar::OnEraseBackground)

 END_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------
 END_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------


@@ -138,14 +130,15 @@ class wxToolBarTool : public wxToolBarToolBase
 public:
     wxToolBarTool(wxToolBar *tbar,
                   int id,
 public:
     wxToolBarTool(wxToolBar *tbar,
                   int id,

-                  const wxBitmap& bitmap1,
-                  const wxBitmap& bitmap2,
-                  bool toggle,
+                  const wxString& label,
+                  const wxBitmap& bmpNormal,
+                  const wxBitmap& bmpDisabled,
+                  wxItemKind kind,

                   wxObject *clientData,
                   wxObject *clientData,

-                  const wxString& shortHelpString,
-                  const wxString& longHelpString)
-        : wxToolBarToolBase(tbar, id, bitmap1, bitmap2, toggle,
-                            clientData, shortHelpString, longHelpString)
+                  const wxString& shortHelp,
+                  const wxString& longHelp)
+        : wxToolBarToolBase(tbar, id, label, bmpNormal, bmpDisabled, kind,
+                            clientData, shortHelp, longHelp)

     {
         m_nSepCount = 0;
     }
     {
         m_nSepCount = 0;
     }


@@ -156,6 +149,19 @@ public:
         m_nSepCount = 1;
     }
 
         m_nSepCount = 1;
     }
 

+    virtual void SetLabel(const wxString& label)
+    {
+        if ( label == m_label )
+            return;
+
+        wxToolBarToolBase::SetLabel(label);
+
+        // we need to update the label shown in the toolbar because it has a
+        // pointer to the internal buffer of the old label
+        //
+        // TODO: use TB_SETBUTTONINFO
+    }
+

     // set/get the number of separators which we use to cover the space used by
     // a control in the toolbar
     void SetSeparatorsCount(size_t count) { m_nSepCount = count; }
     // set/get the number of separators which we use to cover the space used by
     // a control in the toolbar
     void SetSeparatorsCount(size_t count) { m_nSepCount = count; }


@@ -163,6 +169,8 @@ public:
 
 private:
     size_t m_nSepCount;
 
 private:
     size_t m_nSepCount;

+
+    DECLARE_NO_COPY_CLASS(wxToolBarTool)

 };
 
 
 };
 
 


@@ -175,15 +183,16 @@ private:
 // ----------------------------------------------------------------------------
 
 wxToolBarToolBase *wxToolBar::CreateTool(int id,
 // ----------------------------------------------------------------------------
 
 wxToolBarToolBase *wxToolBar::CreateTool(int id,

-                                         const wxBitmap& bitmap1,
-                                         const wxBitmap& bitmap2,
-                                         bool toggle,
+                                         const wxString& label,
+                                         const wxBitmap& bmpNormal,
+                                         const wxBitmap& bmpDisabled,
+                                         wxItemKind kind,

                                          wxObject *clientData,
                                          wxObject *clientData,

-                                         const wxString& shortHelpString,
-                                         const wxString& longHelpString)
+                                         const wxString& shortHelp,
+                                         const wxString& longHelp)

 {
 {

-    return new wxToolBarTool(this, id, bitmap1, bitmap2, toggle,
-                             clientData, shortHelpString, longHelpString);
+    return new wxToolBarTool(this, id, label, bmpNormal, bmpDisabled, kind,
+                             clientData, shortHelp, longHelp);

 }
 
 wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)
 }
 
 wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)


@@ -198,6 +207,7 @@ wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)
 void wxToolBar::Init()
 {
     m_hBitmap = 0;
 void wxToolBar::Init()
 {
     m_hBitmap = 0;

+    m_disabledImgList = NULL;

 
     m_nButtons = 0;
 
 
     m_nButtons = 0;
 


@@ -214,69 +224,97 @@ bool wxToolBar::Create(wxWindow *parent,
                        long style,
                        const wxString& name)
 {
                        long style,
                        const wxString& name)
 {

-    // toolbars never have border, giving one to them results in broken
-    // appearance
-    style &= ~wxBORDER_MASK;
-    style |= wxBORDER_NONE;
-

     // 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;

 
 

-    // prepare flags
-    DWORD msflags = 0;      // WS_VISIBLE | WS_CHILD always included
+    // MSW-specific initialisation
+    if ( !MSWCreateToolbar(pos, size) )
+        return false;

 
 

-   if ( style & wxCLIP_SIBLINGS )
-        msflags |= WS_CLIPSIBLINGS;
+    wxSetCCUnicodeFormat(GetHwnd());

 
 

-#ifdef TBSTYLE_TOOLTIPS
-    msflags |= TBSTYLE_TOOLTIPS;
-#endif
+    // set up the colors and fonts
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
+    SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));

 
 

-    if (style & wxTB_FLAT)
+    // workaround for flat toolbar on Windows XP classic style: we have to set
+    // the style after creating the control; doing it at creation time doesn't work
+#if wxUSE_UXTHEME
+    if ( style & wxTB_FLAT )

     {
     {

-        // static as it doesn't change during the program lifetime
-        static int s_verComCtl = wxTheApp->GetComCtl32Version();
+        LRESULT style = ::SendMessage(GetHwnd(), TB_GETSTYLE, 0, 0L);

 
 

-        // comctl32.dll 4.00 doesn't support the flat toolbars and using this
-        // style with 6.00 (part of Windows XP) leads to the toolbar with
-        // incorrect background colour - and not using it still results in the
-        // correct (flat) toolbar, so don't use it there
-        if ( s_verComCtl > 400 && s_verComCtl < 600 )
-        {
-            msflags |= TBSTYLE_FLAT | TBSTYLE_TRANSPARENT;
-        }
+        if ( !(style & TBSTYLE_FLAT) )
+            ::SendMessage(GetHwnd(), TB_SETSTYLE, 0, style | TBSTYLE_FLAT);

     }
     }

+#endif // wxUSE_UXTHEME

 
 

-    // MSW-specific initialisation
-    if ( !wxControl::MSWCreateControl(TOOLBARCLASSNAME, msflags) )
-        return FALSE;
+    return true;
+}
+
+bool wxToolBar::MSWCreateToolbar(const wxPoint& pos, const wxSize& size)
+{
+    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);
 

-    // set up the colors and fonts
-    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR));
-    SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
+    return true;
+}

 
 

-    // position it
-    int x = pos.x;
-    int y = pos.y;
-    int width = size.x;
-    int height = size.y;
+void wxToolBar::Recreate()
+{
+    const HWND hwndOld = GetHwnd();
+    if ( !hwndOld )
+    {
+        // we haven't been created yet, no need to recreate
+        return;
+    }

 
 

-    if (width <= 0)
-        width = 100;
-    if (height <= 0)
-        height = m_defaultHeight;
-    if (x < 0)
-        x = 0;
-    if (y < 0)
-        y = 0;
+    // get the position and size before unsubclassing the old toolbar
+    const wxPoint pos = GetPosition();
+    const wxSize size = GetSize();

 
 

-    SetSize(x, y, width, height);
+    UnsubclassWin();

 
 

-    return TRUE;
+    if ( !MSWCreateToolbar(pos, size) )
+    {
+        // what can we do?
+        wxFAIL_MSG( _T("recreating the toolbar failed") );
+
+        return;
+    }
+
+    // reparent all our children under the new toolbar
+    for ( wxWindowList::compatibility_iterator node = m_children.GetFirst();
+          node;
+          node = node->GetNext() )
+    {
+        wxWindow *win = node->GetData();
+        if ( !win->IsTopLevel() )
+            ::SetParent(GetHwndOf(win), GetHwnd());
+    }
+
+    // only destroy the old toolbar now --
+    // after all the children had been reparented
+    ::DestroyWindow(hwndOld);
+
+    // it is for the old bitmap control and can't be used with the new one
+    if ( m_hBitmap )
+    {
+        ::DeleteObject((HBITMAP) m_hBitmap);
+        m_hBitmap = 0;
+    }
+
+    if ( m_disabledImgList )
+    {
+        delete m_disabledImgList;
+        m_disabledImgList = NULL;
+    }
+
+    Realize();

 }
 
 wxToolBar::~wxToolBar()
 }
 
 wxToolBar::~wxToolBar()


@@ -285,28 +323,99 @@ wxToolBar::~wxToolBar()
     // is not - otherwise toolbar leaves a hole in the place it used to occupy
     wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
     if ( frame && !frame->IsBeingDeleted() )
     // is not - otherwise toolbar leaves a hole in the place it used to occupy
     wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
     if ( frame && !frame->IsBeingDeleted() )

-    {

         frame->SendSizeEvent();
         frame->SendSizeEvent();

-    }

 
     if ( m_hBitmap )
 
     if ( m_hBitmap )

-    {

         ::DeleteObject((HBITMAP) m_hBitmap);
         ::DeleteObject((HBITMAP) m_hBitmap);

+
+    delete m_disabledImgList;
+}
+
+wxSize wxToolBar::DoGetBestSize() const
+{
+    wxSize sizeBest;
+
+    SIZE size;
+    if ( !::SendMessage(GetHwnd(), TB_GETMAXSIZE, 0, (LPARAM)&size) )
+    {
+        // maybe an old (< 0x400) Windows version? try to approximate the
+        // toolbar size ourselves
+        sizeBest = GetToolSize();
+        sizeBest.y += 2 * ::GetSystemMetrics(SM_CYBORDER); // Add borders
+        sizeBest.x *= GetToolsCount();
+
+        // reverse horz and vertical components if necessary
+        if ( HasFlag(wxTB_VERTICAL) )
+        {
+            int t = sizeBest.x;
+            sizeBest.x = sizeBest.y;
+            sizeBest.y = t;
+        }
+    }
+    else
+    {
+        sizeBest.x = size.cx;
+        sizeBest.y = size.cy;
+    }
+
+    CacheBestSize(sizeBest);
+
+    return sizeBest;
+}
+
+WXDWORD wxToolBar::MSWGetStyle(long style, WXDWORD *exstyle) const
+{
+    // toolbars never have border, giving one to them results in broken
+    // appearance
+    WXDWORD msStyle = wxControl::MSWGetStyle
+                      (
+                        (style & ~wxBORDER_MASK) | wxBORDER_NONE, exstyle
+                      );
+
+    // always include this one, it never hurts and setting it later
+    // only if we do have tooltips wouldn't work
+    msStyle |= TBSTYLE_TOOLTIPS;
+
+    if ( style & (wxTB_FLAT | wxTB_HORZ_LAYOUT) )
+    {
+        // static as it doesn't change during the program lifetime
+        static int s_verComCtl = wxApp::GetComCtl32Version();
+
+        // comctl32.dll 4.00 doesn't support the flat toolbars and using this
+        // style with 6.00 (part of Windows XP) leads to the toolbar with
+        // incorrect background colour - and not using it still results in the
+        // correct (flat) toolbar, so don't use it there
+        if ( s_verComCtl > 400 && s_verComCtl < 600 )
+            msStyle |= TBSTYLE_FLAT | TBSTYLE_TRANSPARENT;
+
+        if ( s_verComCtl >= 470 && style & wxTB_HORZ_LAYOUT )
+            msStyle |= TBSTYLE_LIST;

     }
     }

+
+    if ( style & wxTB_NODIVIDER )
+        msStyle |= CCS_NODIVIDER;
+
+    if ( style & wxTB_NOALIGN )
+        msStyle |= CCS_NOPARENTALIGN;
+
+    if ( style & wxTB_VERTICAL )
+        msStyle |= CCS_VERT;
+
+    return msStyle;

 }
 
 // ----------------------------------------------------------------------------
 // adding/removing tools
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // adding/removing tools
 // ----------------------------------------------------------------------------
 

-bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos),
-                             wxToolBarToolBase *tool)
+bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *tool)

 {
     // nothing special to do here - we really create the toolbar buttons in
     // Realize() later
     tool->Attach(this);
 
 {
     // nothing special to do here - we really create the toolbar buttons in
     // 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)


@@ -318,7 +427,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();


@@ -331,9 +440,7 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
         }
 
         if ( tool2->IsControl() )
         }
 
         if ( tool2->IsControl() )

-        {

             pos += ((wxToolBarTool *)tool2)->GetSeparatorsCount() - 1;
             pos += ((wxToolBarTool *)tool2)->GetSeparatorsCount() - 1;

-        }

     }
 
     // now determine the number of buttons to delete and the area taken by them
     }
 
     // now determine the number of buttons to delete and the area taken by them


@@ -351,7 +458,6 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
     if ( tool->IsControl() )
     {
         nButtonsToDelete = ((wxToolBarTool *)tool)->GetSeparatorsCount();
     if ( tool->IsControl() )
     {
         nButtonsToDelete = ((wxToolBarTool *)tool)->GetSeparatorsCount();

-

         width *= nButtonsToDelete;
     }
 
         width *= nButtonsToDelete;
     }
 


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

-            return FALSE;
+            return false;

         }
     }
 
         }
     }
 


@@ -379,181 +485,301 @@ 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;
+}
+
+void wxToolBar::CreateDisabledImageList()
+{
+    if (m_disabledImgList != NULL)
+    {
+        delete m_disabledImgList;
+        m_disabledImgList = NULL;
+    }
+
+    // as we can't use disabled image list with older versions of comctl32.dll,
+    // don't even bother creating it
+    if ( wxTheApp->GetComCtl32Version() >= 470 )
+    {
+        // search for the first disabled button img in the toolbar, if any
+        for ( wxToolBarToolsList::compatibility_iterator
+                node = m_tools.GetFirst(); node; node = node->GetNext() )
+        {
+            wxToolBarToolBase *tool = node->GetData();
+            wxBitmap bmpDisabled = tool->GetDisabledBitmap();
+            if ( bmpDisabled.Ok() )
+            {
+                m_disabledImgList = new wxImageList
+                                        (
+                                            m_defaultWidth,
+                                            m_defaultHeight,
+                                            bmpDisabled.GetMask() != NULL,
+                                            GetToolsCount()
+                                        );
+                break;
+            }
+        }
+
+        // we don't have any disabled bitmaps
+    }

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

-    size_t nTools = GetToolsCount();
+    const size_t nTools = GetToolsCount();

     if ( nTools == 0 )
     if ( nTools == 0 )

-    {

         // nothing to do
         // nothing to do

-        return TRUE;
+        return true;
+
+    const bool isVertical = HasFlag(wxTB_VERTICAL);
+
+    bool doRemap, doRemapBg, doTransparent;
+    doRemapBg = doRemap = doTransparent = false;
+
+#ifndef __WXWINCE__
+    int remapValue = (-1);
+    const wxChar *remapOptionStr = wxT("msw.remap");
+    if (wxSystemOptions::HasOption( remapOptionStr ))
+        remapValue = wxSystemOptions::GetOptionInt( remapOptionStr );
+
+    doTransparent = (remapValue == 2);
+    if (!doTransparent)
+    {
+        doRemap = (remapValue != 0);
+        doRemapBg = !doRemap;

     }
     }

+#endif

 
 

-    bool isVertical = (GetWindowStyle() & wxTB_VERTICAL) != 0;
+    // 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
     // ----------------------------------------------------------------
 

-    // if we already have a bitmap, we'll replace the existing one - otherwise
-    // we'll install a new one
-    HBITMAP oldToolBarBitmap = (HBITMAP)m_hBitmap;
-
-    int totalBitmapWidth = (int)(m_defaultWidth * nTools);
-    int totalBitmapHeight = (int)m_defaultHeight;
-
-    // Create a bitmap and copy all the tool bitmaps to it
-#if USE_BITMAP_MASKS
-    wxMemoryDC dcAllButtons;
-    wxBitmap bitmap(totalBitmapWidth, totalBitmapHeight);
-    dcAllButtons.SelectObject(bitmap);
-    dcAllButtons.SetBackground(*wxLIGHT_GREY_BRUSH);
-    dcAllButtons.Clear();
-
-    m_hBitmap = bitmap.GetHBITMAP();
-    HBITMAP hBitmap = (HBITMAP)m_hBitmap;
-#else // !USE_BITMAP_MASKS
-    HBITMAP hBitmap = ::CreateCompatibleBitmap(ScreenHDC(),
-                                               totalBitmapWidth,
-                                               totalBitmapHeight);
-    if ( !hBitmap )
-    {
-        wxLogLastError(_T("CreateCompatibleBitmap"));
+    wxToolBarToolsList::compatibility_iterator node;
+    int bitmapId = 0;

 
 

-        return FALSE;
+    wxSize sizeBmp;
+    if ( HasFlag(wxTB_NOICONS) )
+    {
+        // no icons, don't leave space for them
+        sizeBmp.x =
+        sizeBmp.y = 0;

     }
     }

+    else // do show icons
+    {
+        // if we already have a bitmap, we'll replace the existing one --
+        // otherwise we'll install a new one
+        HBITMAP oldToolBarBitmap = (HBITMAP)m_hBitmap;

 
 

-    m_hBitmap = (WXHBITMAP)hBitmap;
+        sizeBmp.x = m_defaultWidth;
+        sizeBmp.y = m_defaultHeight;

 
 

-    HDC memoryDC = ::CreateCompatibleDC(NULL);
-    HBITMAP oldBitmap = (HBITMAP) ::SelectObject(memoryDC, hBitmap);
+        const wxCoord totalBitmapWidth  = m_defaultWidth *
+                                          wx_truncate_cast(wxCoord, nTools),
+                      totalBitmapHeight = m_defaultHeight;

 
 

-    HDC memoryDC2 = ::CreateCompatibleDC(NULL);
-#endif // USE_BITMAP_MASKS/!USE_BITMAP_MASKS
+        // Create a bitmap and copy all the tool bitmaps into it
+        wxMemoryDC dcAllButtons;
+        wxBitmap bitmap(totalBitmapWidth, totalBitmapHeight);
+        dcAllButtons.SelectObject(bitmap);

 
 

-    // the button position
-    wxCoord x = 0;
+#ifndef __WXWINCE__
+        if (doTransparent)
+            dcAllButtons.SetBackground(*wxTRANSPARENT_BRUSH);
+        else
+            dcAllButtons.SetBackground(wxBrush(GetBackgroundColour()));
+#else
+        dcAllButtons.SetBackground(wxBrush(wxColour(192,192,192)));
+#endif
+        dcAllButtons.Clear();

 
 

-    // the number of buttons (not separators)
-    int nButtons = 0;
+        m_hBitmap = bitmap.GetHBITMAP();
+        HBITMAP hBitmap = (HBITMAP)m_hBitmap;

 
 

-    wxToolBarToolsList::Node *node = m_tools.GetFirst();
-    while ( node )
-    {
-        wxToolBarToolBase *tool = node->GetData();
-        if ( tool->IsButton() )
+#ifndef __WXWINCE__
+        if (doRemapBg)

         {
         {

-            const wxBitmap& bmp = tool->GetBitmap1();
-            if ( bmp.Ok() )
+            dcAllButtons.SelectObject(wxNullBitmap);
+
+            // Even if we're not remapping the bitmap
+            // content, we still have to remap the background.
+            hBitmap = (HBITMAP)MapBitmap((WXHBITMAP) hBitmap,
+                totalBitmapWidth, totalBitmapHeight);
+
+            dcAllButtons.SelectObject(bitmap);
+        }
+#endif // !__WXWINCE__
+
+        // the button position
+        wxCoord x = 0;
+
+        // the number of buttons (not separators)
+        int nButtons = 0;
+
+        CreateDisabledImageList();
+        for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
+        {
+            wxToolBarToolBase *tool = node->GetData();
+            if ( tool->IsButton() )

             {
             {

-#if USE_BITMAP_MASKS
-                // notice the last parameter: do use mask
-                dcAllButtons.DrawBitmap(tool->GetBitmap1(), x, 0, TRUE);
-#else // !USE_BITMAP_MASKS
-                HBITMAP hbmp = GetHbitmapOf(bmp);
-                HBITMAP oldBitmap2 = (HBITMAP)::SelectObject(memoryDC2, hbmp);
-                if ( !BitBlt(memoryDC, x, 0,  m_defaultWidth, m_defaultHeight,
-                             memoryDC2, 0, 0, SRCCOPY) )
+                const wxBitmap& bmp = tool->GetNormalBitmap();
+
+                const int w = bmp.GetWidth();
+                const int h = bmp.GetHeight();
+
+                if ( bmp.Ok() )
+                {
+                    int xOffset = wxMax(0, (m_defaultWidth - w)/2);
+                    int yOffset = wxMax(0, (m_defaultHeight - h)/2);
+
+                    // notice the last parameter: do use mask
+                    dcAllButtons.DrawBitmap(bmp, x + xOffset, yOffset, true);
+                }
+                else

                 {
                 {

-                    wxLogLastError(wxT("BitBlt"));
+                    wxFAIL_MSG( _T("invalid tool button bitmap") );

                 }
 
                 }
 

-                ::SelectObject(memoryDC2, oldBitmap2);
-#endif // USE_BITMAP_MASKS/!USE_BITMAP_MASKS
-            }
-            else
-            {
-                wxFAIL_MSG( _T("invalid tool button bitmap") );
-            }
+                // also deal with disabled bitmap if we want to use them
+                if ( m_disabledImgList )
+                {
+                    wxBitmap bmpDisabled = tool->GetDisabledBitmap();
+#if wxUSE_IMAGE
+                    if ( !bmpDisabled.Ok() )
+                    {
+                        // no disabled bitmap specified but we still need to
+                        // fill the space in the image list with something, so
+                        // we grey out the normal bitmap
+                        wxImage imgGreyed;
+                        wxCreateGreyedImage(bmp.ConvertToImage(), imgGreyed);
+
+                        if (doRemap)
+                        {
+                            // we need to have light grey background colour for
+                            // MapBitmap() to work correctly
+                            for ( int y = 0; y < h; y++ )
+                            {
+                                for ( int x = 0; x < w; x++ )
+                                {
+                                    if ( imgGreyed.IsTransparent(x, y) )
+                                        imgGreyed.SetRGB(x, y,
+                                                         wxLIGHT_GREY->Red(),
+                                                         wxLIGHT_GREY->Green(),
+                                                         wxLIGHT_GREY->Blue());
+                                }
+                            }
+                        }
+
+                        bmpDisabled = wxBitmap(imgGreyed);
+                    }
+#endif // wxUSE_IMAGE
+
+                    if (doRemap)
+                        MapBitmap(bmpDisabled.GetHBITMAP(), w, h);
+
+                    m_disabledImgList->Add(bmpDisabled);
+                }

 
 

-            // still inc width and number of buttons because otherwise the
-            // subsequent buttons will all be shifted which is rather confusing
-            // (and like this you'd see immediately which bitmap was bad)
-            x += m_defaultWidth;
-            nButtons++;
+                // still inc width and number of buttons because otherwise the
+                // subsequent buttons will all be shifted which is rather confusing
+                // (and like this you'd see immediately which bitmap was bad)
+                x += m_defaultWidth;
+                nButtons++;
+            }

         }
 
         }
 

-        node = node->GetNext();
-    }
+        dcAllButtons.SelectObject(wxNullBitmap);

 
 

-#if USE_BITMAP_MASKS
-    dcAllButtons.SelectObject(wxNullBitmap);
+        // don't delete this HBITMAP!
+        bitmap.SetHBITMAP(0);

 
 

-    // don't delete this HBITMAP!
-    bitmap.SetHBITMAP(0);
-#else // !USE_BITMAP_MASKS
-    ::SelectObject(memoryDC, oldBitmap);
-    ::DeleteDC(memoryDC);
-    ::DeleteDC(memoryDC2);
-#endif // USE_BITMAP_MASKS/!USE_BITMAP_MASKS
-
-    // Map to system colours
-    hBitmap = (HBITMAP)MapBitmap((WXHBITMAP) hBitmap,
-                                 totalBitmapWidth, totalBitmapHeight);
-
-    int bitmapId = 0;
+        if (doRemap)
+        {
+            // Map to system colours
+            hBitmap = (HBITMAP)MapBitmap((WXHBITMAP) hBitmap,
+                totalBitmapWidth, totalBitmapHeight);
+        }

 
 

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

 
 

-    if ( oldToolBarBitmap )
-    {
-#ifdef TB_REPLACEBITMAP
-        if ( wxTheApp->GetComCtl32Version() >= 400 )
+        if ( oldToolBarBitmap )

         {
         {

-            TBREPLACEBITMAP replaceBitmap;
-            replaceBitmap.hInstOld = NULL;
-            replaceBitmap.hInstNew = NULL;
-            replaceBitmap.nIDOld = (UINT) oldToolBarBitmap;
-            replaceBitmap.nIDNew = (UINT) hBitmap;
-            replaceBitmap.nButtons = nButtons;
-            if ( !::SendMessage(GetHwnd(), TB_REPLACEBITMAP,
-                                0, (LPARAM) &replaceBitmap) )
+#ifdef TB_REPLACEBITMAP
+            if ( wxApp::GetComCtl32Version() >= 400 )

             {
             {

-                wxFAIL_MSG(wxT("Could not replace the old bitmap"));
-            }
+                TBREPLACEBITMAP replaceBitmap;
+                replaceBitmap.hInstOld = NULL;
+                replaceBitmap.hInstNew = NULL;
+                replaceBitmap.nIDOld = (UINT) oldToolBarBitmap;
+                replaceBitmap.nIDNew = (UINT) hBitmap;
+                replaceBitmap.nButtons = nButtons;
+                if ( !::SendMessage(GetHwnd(), TB_REPLACEBITMAP,
+                                    0, (LPARAM) &replaceBitmap) )
+                {
+                    wxFAIL_MSG(wxT("Could not replace the old bitmap"));
+                }

 
 

-            ::DeleteObject(oldToolBarBitmap);
+                ::DeleteObject(oldToolBarBitmap);

 
 

-            // already done
-            addBitmap = FALSE;
-        }
-        else
+                // already done
+                addBitmap = false;
+            }
+            else

 #endif // TB_REPLACEBITMAP
 #endif // TB_REPLACEBITMAP

-        {
-            // 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;
+            {
+                // 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;

 
 

-            bitmapId = m_nButtons;
+                bitmapId = m_nButtons;
+            }

         }
 
         }
 

-        // Now delete all the buttons
-        for ( size_t pos = 0; pos < m_nButtons; pos++ )
+        if ( addBitmap ) // no old bitmap or we can't replace it

         {
         {

-            if ( !::SendMessage(GetHwnd(), TB_DELETEBUTTON, 0, 0) )
+            TBADDBITMAP addBitmap;
+            addBitmap.hInst = 0;
+            addBitmap.nID = (UINT) hBitmap;
+            if ( ::SendMessage(GetHwnd(), TB_ADDBITMAP,
+                               (WPARAM) nButtons, (LPARAM)&addBitmap) == -1 )

             {
             {

-                wxLogDebug(wxT("TB_DELETEBUTTON failed"));
+                wxFAIL_MSG(wxT("Could not add bitmap to toolbar"));

             }
         }
 
             }
         }
 

+        if ( m_disabledImgList )
+        {
+            HIMAGELIST oldImageList = (HIMAGELIST)
+                ::SendMessage(GetHwnd(),
+                              TB_SETDISABLEDIMAGELIST,
+                              0,
+                              (LPARAM)GetHimagelistOf(m_disabledImgList));
+
+            // delete previous image list if any
+            if ( oldImageList )
+                ::DeleteObject( oldImageList );
+        }

     }
 
     }
 

-    if ( addBitmap ) // no old bitmap or we can't replace it
+    // don't call SetToolBitmapSize() as we don't want to change the values of
+    // m_defaultWidth/Height
+    if ( !::SendMessage(GetHwnd(), TB_SETBITMAPSIZE, 0,
+                        MAKELONG(sizeBmp.x, sizeBmp.y)) )

     {
     {

-        TBADDBITMAP addBitmap;
-        addBitmap.hInst = 0;
-        addBitmap.nID = (UINT) hBitmap;
-        if ( ::SendMessage(GetHwnd(), TB_ADDBITMAP,
-                           (WPARAM) nButtons, (LPARAM)&addBitmap) == -1 )
-        {
-            wxFAIL_MSG(wxT("Could not add bitmap to toolbar"));
-        }
+        wxLogLastError(_T("TB_SETBITMAPSIZE"));

     }
 
     // Next add the buttons and separators
     }
 
     // Next add the buttons and separators


@@ -564,19 +790,25 @@ 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;

     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() &&
+                wxApp::GetComCtl32Version() <= 472 )
+        {

             continue;
             continue;

+        }

 
         TBBUTTON& button = buttons[i];
 
         wxZeroMemory(button);
 
 
         TBBUTTON& button = buttons[i];
 
         wxZeroMemory(button);
 

+        bool isRadio = false;

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


@@ -589,7 +821,16 @@ bool wxToolBar::Realize()
                 break;
 
             case wxTOOL_STYLE_BUTTON:
                 break;
 
             case wxTOOL_STYLE_BUTTON:

-                button.iBitmap = bitmapId;
+                if ( !HasFlag(wxTB_NOICONS) )
+                    button.iBitmap = bitmapId;
+
+                if ( HasFlag(wxTB_TEXT) )
+                {
+                    const wxString& label = tool->GetLabel();
+                    if ( !label.empty() )
+                        button.iString = (int)label.c_str();
+                }
+

                 button.idCommand = tool->GetId();
 
                 if ( tool->IsEnabled() )
                 button.idCommand = tool->GetId();
 
                 if ( tool->IsEnabled() )


@@ -597,18 +838,70 @@ bool wxToolBar::Realize()
                 if ( tool->IsToggled() )
                     button.fsState |= TBSTATE_CHECKED;
 
                 if ( tool->IsToggled() )
                     button.fsState |= TBSTATE_CHECKED;
 

-                button.fsStyle = tool->CanBeToggled() ? TBSTYLE_CHECK
-                                                      : TBSTYLE_BUTTON;
+                switch ( tool->GetKind() )
+                {
+                    case wxITEM_RADIO:
+                        button.fsStyle = TBSTYLE_CHECKGROUP;
+
+                        if ( !lastWasRadio )
+                        {
+                            // the first item in the radio group is checked by
+                            // default to be consistent with wxGTK and the menu
+                            // radio items
+                            button.fsState |= TBSTATE_CHECKED;
+
+                            if (tool->Toggle(true))
+                            {
+                                DoToggleTool(tool, true);
+                            }
+                        }
+                        else if (tool->IsToggled())
+                        {
+                            wxToolBarToolsList::compatibility_iterator nodePrev = node->GetPrevious();
+                            int prevIndex = i - 1;
+                            while ( nodePrev )
+                            {
+                                TBBUTTON& prevButton = buttons[prevIndex];
+                                wxToolBarToolBase *tool = nodePrev->GetData();
+                                if ( !tool->IsButton() || tool->GetKind() != wxITEM_RADIO )
+                                    break;
+
+                                if ( tool->Toggle(false) )
+                                    DoToggleTool(tool, false);
+
+                                prevButton.fsState = TBSTATE_ENABLED;
+                                nodePrev = nodePrev->GetPrevious();
+                                prevIndex--;
+                            }
+                        }
+
+                        isRadio = true;
+                        break;
+
+                    case wxITEM_CHECK:
+                        button.fsStyle = TBSTYLE_CHECK;
+                        break;
+
+                    case wxITEM_NORMAL:
+                        button.fsStyle = TBSTYLE_BUTTON;
+                        break;
+
+                    default:
+                        wxFAIL_MSG( _T("unexpected toolbar button kind") );
+                        button.fsStyle = TBSTYLE_BUTTON;
+                        break;
+                }

 
                 bitmapId++;
                 break;
         }
 
 
                 bitmapId++;
                 break;
         }
 

+        lastWasRadio = isRadio;
+

         i++;
     }
 
         i++;
     }
 

-    if ( !::SendMessage(GetHwnd(), TB_ADDBUTTONS,
-                        (WPARAM)i, (LPARAM)buttons) )
+    if ( !::SendMessage(GetHwnd(), TB_ADDBUTTONS, (WPARAM)i, (LPARAM)buttons) )

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


@@ -635,8 +928,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"));
         }


@@ -650,26 +943,25 @@ bool wxToolBar::Realize()
         }
 
         wxControl *control = tool->GetControl();
         }
 
         wxControl *control = tool->GetControl();

-

         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)
         // available in headers, now check whether it is available now
         // (during run-time)

-        if ( wxTheApp->GetComCtl32Version() >= 471 )
+        if ( wxApp::GetComCtl32Version() >= 471 )

         {
             // set the (underlying) separators width to be that of the
             // control
             TBBUTTONINFO tbbi;
             tbbi.cbSize = sizeof(tbbi);
             tbbi.dwMask = TBIF_SIZE;
         {
             // set the (underlying) separators width to be that of the
             // control
             TBBUTTONINFO tbbi;
             tbbi.cbSize = sizeof(tbbi);
             tbbi.dwMask = TBIF_SIZE;

-            tbbi.cx = size.x;
-            if ( !SendMessage(GetHwnd(), TB_SETBUTTONINFO,
-                              tool->GetId(), (LPARAM)&tbbi) )
+            tbbi.cx = (WORD)size.x;
+            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"));


@@ -692,8 +984,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"));
                 }


@@ -706,7 +998,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


@@ -715,7 +1007,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;
         }


@@ -726,11 +1018,11 @@ bool wxToolBar::Realize()
             left = 0;
             top = y;
 
             left = 0;
             top = y;
 

-            y += height + 2*GetMargins().y;
+            y += height + 2 * GetMargins().y;

         }
         else // horizontal toolbar
         {
         }
         else // horizontal toolbar
         {

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

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


@@ -746,21 +1038,21 @@ bool wxToolBar::Realize()
     if ( !isVertical )
     {
         if ( m_maxRows == 0 )
     if ( !isVertical )
     {
         if ( m_maxRows == 0 )

-        {

             // if not set yet, only one row
             SetRows(1);
             // if not set yet, only one row
             SetRows(1);

-        }

     }
     else if ( m_nButtons > 0 ) // vertical non empty toolbar
     {
         if ( m_maxRows == 0 )
     }
     else if ( m_nButtons > 0 ) // vertical non empty toolbar
     {
         if ( m_maxRows == 0 )

-        {

             // if not set yet, have one column
             SetRows(m_nButtons);
             // if not set yet, have one column
             SetRows(m_nButtons);

-        }

     }
 
     }
 

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

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


@@ -771,99 +1063,68 @@ 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;
+
+        // 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;

 
 

-    bool toggled = tool->IsToggled();
+        tool->Toggle(toggled);
+        UnToggleRadioGroup(tool);
+    }

 
 

-    // OnLeftClick() can veto the button state change - for buttons which may
-    // be toggled only, of couse
+    // 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
     if ( !OnLeftClick((int)id, toggled) && tool->CanBeToggled() )
     {
         // revert back

-        toggled = !toggled;
-        tool->SetToggle(toggled);
+        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),
                             WXLPARAM lParam,
                             WXLPARAM *WXUNUSED(result))
 {
 }
 
 bool wxToolBar::MSWOnNotify(int WXUNUSED(idCtrl),
                             WXLPARAM lParam,
                             WXLPARAM *WXUNUSED(result))
 {

+#if wxUSE_TOOLTIPS

     // First check if this applies to us
     NMHDR *hdr = (NMHDR *)lParam;
 
     // the tooltips control created by the toolbar is sometimes Unicode, even
     // in an ANSI application - this seems to be a bug in comctl32.dll v5
     // First check if this applies to us
     NMHDR *hdr = (NMHDR *)lParam;
 
     // the tooltips control created by the toolbar is sometimes Unicode, even
     // in an ANSI application - this seems to be a bug in comctl32.dll v5

-    int code = (int)hdr->code;
-    if ( (code != TTN_NEEDTEXTA) && (code != TTN_NEEDTEXTW) )
-        return FALSE;
+    UINT code = hdr->code;
+    if ( (code != (UINT) TTN_NEEDTEXTA) && (code != (UINT) TTN_NEEDTEXTW) )
+        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;
-
-    const wxString& help = tool->GetShortHelp();
+        return false;

 
 

-    if ( !help.IsEmpty() )
-    {
-        if ( code == TTN_NEEDTEXTA )
-        {
-            ttText->lpszText = (wxChar *)help.c_str();
-        }
-        else
-        {
-#if wxUSE_UNICODE
-            ttText->lpszText = (wxChar *)help.c_str();
+    return HandleTooltipNotify(code, lParam, tool->GetShortHelp());

 #else
 #else

-            // VZ: I don't know why it happens, but the versions of
-            //     comctl32.dll starting from 4.70 sometimes send TTN_NEEDTEXTW
-            //     even to ANSI programs (normally, this message is supposed
-            //     to be sent to Unicode programs only) - hence we need to
-            //     handle it as well, otherwise no tooltips will be shown in
-            //     this case
-
-            size_t lenAnsi = help.Len();
-            #if defined( __MWERKS__ ) || defined( __CYGWIN__ )
-                // MetroWerks doesn't like calling mbstowcs with NULL argument
-                // neither Cygwin does
-                size_t lenUnicode = 2*lenAnsi;
-            #else
-                size_t lenUnicode = mbstowcs(NULL, help, lenAnsi);
-            #endif
-
-            // using the pointer of right type avoids us doing all sorts of
-            // pointer arithmetics ourselves
-            wchar_t *dst = (wchar_t *)ttText->szText,
-                    *pwz = new wchar_t[lenUnicode + 1];
-            mbstowcs(pwz, help, lenAnsi + 1);
-            memcpy(dst, pwz, lenUnicode*sizeof(wchar_t));
-
-            // put the terminating _wide_ NUL
-            dst[lenUnicode] = 0;
-
-            delete [] pwz;
-#endif
-        }
-    }
+    wxUnusedVar(lParam);

 
 

-    return TRUE;
+    return false;
+#endif

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


@@ -902,8 +1163,9 @@ 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 ) )
-    if ( wxTheApp->GetComCtl32Version() >= 470 )
+    && !( defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 1, 0 ) ) \
+    && !defined (__DIGITALMARS__)
+    if ( wxApp::GetComCtl32Version() >= 470 )

     {
         DWORD dw = ::SendMessage(GetHwnd(), TB_GETBUTTONSIZE, 0, 0);
 
     {
         DWORD dw = ::SendMessage(GetHwnd(), TB_GETBUTTONSIZE, 0, 0);
 


@@ -921,9 +1183,9 @@ 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 ; current = current->GetNext() )

     {
         if ( index == 0 )
             return current->GetData();
     {
         if ( index == 0 )
             return current->GetData();


@@ -946,22 +1208,22 @@ wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
     pt.x = x;
     pt.y = y;
     int index = (int)::SendMessage(GetHwnd(), TB_HITTEST, 0, (LPARAM)&pt);
     pt.x = x;
     pt.y = y;
     int index = (int)::SendMessage(GetHwnd(), TB_HITTEST, 0, (LPARAM)&pt);

+

     // MBN: when the point ( x, y ) is close to the toolbar border
     //      TB_HITTEST returns m_nButtons ( not -1 )
     if ( index < 0 || (size_t)index >= m_nButtons )
     // MBN: when the point ( x, y ) is close to the toolbar border
     //      TB_HITTEST returns m_nButtons ( not -1 )
     if ( index < 0 || (size_t)index >= m_nButtons )

-    {

         // it's a separator or there is no tool at all there
         return (wxToolBarToolBase *)NULL;
         // it's a separator or there is no tool at all there
         return (wxToolBarToolBase *)NULL;

-    }

 
 

-    // if comctl32 version < 4.71 wxToolBar95 adds dummy spacers
-#if defined(_WIN32_IE) && (_WIN32_IE >= 0x400 )
-    if ( wxTheApp->GetComCtl32Version() >= 471 )
+    // when TB_SETBUTTONINFO is available (both during compile- and run-time),
+    // we don't use the dummy separators hack
+#ifdef TB_SETBUTTONINFO
+    if ( wxApp::GetComCtl32Version() >= 471 )

     {
         return m_tools.Item((size_t)index)->GetData();
     }
     else
     {
         return m_tools.Item((size_t)index)->GetData();
     }
     else

-#endif
+#endif // TB_SETBUTTONINFO

     {
         return GetItemSkippingDummySpacers( m_tools, (size_t) index );
     }
     {
         return GetItemSkippingDummySpacers( m_tools, (size_t) index );
     }


@@ -969,17 +1231,47 @@ wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
 
 void wxToolBar::UpdateSize()
 {
 
 void wxToolBar::UpdateSize()
 {

-    // the toolbar size changed
-    SendMessage(GetHwnd(), TB_AUTOSIZE, 0, 0);
+    // In case Realize is called after the initial display (IOW the programmer
+    // may have rebuilt the toolbar) give the frame the option of resizing the
+    // toolbar to full width again, but only if the parent is a frame and the
+    // toolbar is managed by the frame.  Otherwise assume that some other
+    // layout mechanism is controlling the toolbar size and leave it alone.

 
 

-    // we must also refresh the frame after the toolbar size (possibly) changed

     wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
     wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);

-    if ( frame )
+    if ( frame && frame->GetToolBar() == this )

     {
     {

+        // the toolbar size changed
+        ::SendMessage(GetHwnd(), TB_AUTOSIZE, 0, 0);

         frame->SendSizeEvent();
     }
 }
 
         frame->SendSizeEvent();
     }
 }
 

+// ----------------------------------------------------------------------------
+// toolbar styles
+// ---------------------------------------------------------------------------
+
+void wxToolBar::SetWindowStyleFlag(long style)
+{
+    // the style bits whose changes force us to recreate the toolbar
+    static const long MASK_NEEDS_RECREATE = wxTB_TEXT | wxTB_NOICONS;
+
+    const long styleOld = GetWindowStyle();
+
+    wxToolBarBase::SetWindowStyleFlag(style);
+
+    // don't recreate an empty toolbar: not only this is unnecessary, but it is
+    // also fatal as we'd then try to recreate the toolbar when it's just being
+    // created
+    if ( GetToolsCount() &&
+            (style & MASK_NEEDS_RECREATE) != (styleOld & MASK_NEEDS_RECREATE) )
+    {
+        // to remove the text labels, simply re-realizing the toolbar is enough
+        // but I don't know of any way to add the text to an existing toolbar
+        // other than by recreating it entirely
+        Recreate();
+    }
+}
+

 // ----------------------------------------------------------------------------
 // tool state
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // tool state
 // ----------------------------------------------------------------------------


@@ -1028,11 +1320,21 @@ void wxToolBar::OnSysColourChanged(wxSysColourChangedEvent& event)
 
 void wxToolBar::OnMouseEvent(wxMouseEvent& event)
 {
 
 void wxToolBar::OnMouseEvent(wxMouseEvent& event)
 {

-    if (event.RightDown())
+    if (event.Leaving() && m_pInTool)
+    {
+        OnMouseEnter( -1 );
+        event.Skip();
+        return;
+    }
+
+    if ( event.RightDown() )

     {
     {

-        // For now, we don't have an id. Later we could
-        // try finding the tool.
-        OnRightClick((int)-1, event.GetX(), event.GetY());
+        // find the tool under the mouse
+        wxCoord x,y;
+        event.GetPosition(&x, &y);
+
+        wxToolBarToolBase *tool = FindToolForPosition(x, y);
+        OnRightClick(tool ? tool->GetId() : -1, x, y);

     }
     else
     {
     }
     else
     {


@@ -1040,69 +1342,226 @@ void wxToolBar::OnMouseEvent(wxMouseEvent& event)
     }
 }
 
     }
 }
 

-long wxToolBar::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+// This handler is required to allow the toolbar to be set to a non-default
+// colour: for example, when it must blend in with a notebook page.
+void wxToolBar::OnEraseBackground(wxEraseEvent& event)

 {
 {

-    if ( nMsg == WM_SIZE )
+    wxColour bgCol = GetBackgroundColour();
+    if (!bgCol.Ok())

     {
     {

-        // calculate our minor dimenstion 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) )
-        {
-            int w, h;
+        event.Skip();
+        return;
+    }
+
+    // notice that this 'dumb' implementation may cause flicker for some of the
+    // controls in which case they should intercept wxEraseEvent and process it
+    // themselves somehow
+
+    RECT rect;
+    ::GetClientRect(GetHwnd(), &rect);
+
+    HBRUSH hBrush = ::CreateSolidBrush(wxColourToRGB(bgCol));

 
 

-            if ( GetWindowStyle() & wxTB_VERTICAL )
+    HDC hdc = GetHdcOf((*event.GetDC()));
+
+#ifndef __WXWINCE__
+    int mode = ::SetMapMode(hdc, MM_TEXT);
+#endif
+
+    ::FillRect(hdc, &rect, hBrush);
+    ::DeleteObject(hBrush);
+
+#ifndef __WXWINCE__
+    ::SetMapMode(hdc, mode);
+#endif
+}
+
+bool wxToolBar::HandleSize(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam)
+{
+    // 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) )
+    {
+        int w, h;
+
+        if ( GetWindowStyle() & wxTB_VERTICAL )
+        {
+            w = r.right - r.left;
+            if ( m_maxRows )

             {
             {

-                w = r.right - r.left;
-                if ( m_maxRows )
-                {
-                    w *= (m_nButtons + m_maxRows - 1)/m_maxRows;
-                }
-                h = HIWORD(lParam);
+                w *= (m_nButtons + m_maxRows - 1)/m_maxRows;

             }
             }

+            h = HIWORD(lParam);
+        }
+        else
+        {
+            w = LOWORD(lParam);
+            if (HasFlag( wxTB_FLAT ))
+                h = r.bottom - r.top - 3;

             else
             else

-            {
-                w = LOWORD(lParam);

                 h = r.bottom - r.top;
                 h = r.bottom - r.top;

-                if ( m_maxRows )
-                {
-                    h += 6; // FIXME: this is the separator line height...
-                    h *= m_maxRows;
-                }
-            }
-
-            if ( MAKELPARAM(w, h) != lParam )
+            if ( m_maxRows )

             {
             {

-                // size really changed
-                SetSize(w, h);
+                // FIXME: hardcoded separator line height...
+                h += HasFlag(wxTB_NODIVIDER) ? 4 : 6;
+                h *= m_maxRows;

             }
             }

+        }

 
 

-            // message processed
-            return 0;
+        if ( MAKELPARAM(w, h) != lParam )
+        {
+            // size really changed
+            SetSize(w, h);

         }
         }

+
+        // message processed
+        return true;

     }
     }

-    else if ( nMsg == WM_MOUSEMOVE )
+
+    return false;
+}
+
+bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
+{
+    // erase any dummy separators which were used
+    // for aligning the controls if any here
+
+    // first of all, are there any controls at all?
+    wxToolBarToolsList::compatibility_iterator node;
+    for ( node = m_tools.GetFirst(); node; node = node->GetNext() )

     {
     {

-        wxCoord x = GET_X_LPARAM(lParam), y = GET_Y_LPARAM(lParam);
-        wxToolBarToolBase* tool = FindToolForPosition( x, y );
+        if ( node->GetData()->IsControl() )
+            break;
+    }

 
 

-        // cursor left current tool
-        if( tool != m_pInTool && !tool )
-        {
-            m_pInTool = 0;
-            OnMouseEnter( -1 );
-        }
+    if ( !node )
+        // no controls, nothing to erase
+        return false;
+
+    // prepare the DC on which we'll be drawing
+    wxClientDC dc(this);
+    dc.SetBrush(wxBrush(GetBackgroundColour(), wxSOLID));
+    dc.SetPen(*wxTRANSPARENT_PEN);
+
+    RECT r;
+    if ( !::GetUpdateRect(GetHwnd(), &r, FALSE) )
+        // nothing to redraw anyhow
+        return false;
+
+    wxRect rectUpdate;
+    wxCopyRECTToRect(r, rectUpdate);
+
+    dc.SetClippingRegion(rectUpdate);
+
+    // draw the toolbar tools, separators &c normally
+    wxControl::MSWWindowProc(WM_PAINT, wParam, lParam);

 
 

-        // cursor entered a tool
-        if( tool != m_pInTool && tool )
+    // for each control in the toolbar find all the separators intersecting it
+    // and erase them
+    //
+    // NB: this is really the only way to do it as we don't know if a separator
+    //     corresponds to a control (i.e. is a dummy one) or a real one
+    //     otherwise
+    for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
+    {
+        wxToolBarToolBase *tool = node->GetData();
+        if ( tool->IsControl() )

         {
         {

-            m_pInTool = tool;
-            OnMouseEnter( tool->GetId() );
+            // get the control rect in our client coords
+            wxControl *control = tool->GetControl();
+            wxRect rectCtrl = control->GetRect();
+
+            // iterate over all buttons
+            TBBUTTON tbb;
+            int count = ::SendMessage(GetHwnd(), TB_BUTTONCOUNT, 0, 0);
+            for ( int n = 0; n < count; n++ )
+            {
+                // is it a separator?
+                if ( !::SendMessage(GetHwnd(), TB_GETBUTTON,
+                                    n, (LPARAM)&tbb) )
+                {
+                    wxLogDebug(_T("TB_GETBUTTON failed?"));
+
+                    continue;
+                }
+
+                if ( tbb.fsStyle != TBSTYLE_SEP )
+                    continue;
+
+                // get the bounding rect of the separator
+                RECT r;
+                if ( !::SendMessage(GetHwnd(), TB_GETITEMRECT,
+                                    n, (LPARAM)&r) )
+                {
+                    wxLogDebug(_T("TB_GETITEMRECT failed?"));
+
+                    continue;
+                }
+
+                // does it intersect the control?
+                wxRect rectItem;
+                wxCopyRECTToRect(r, rectItem);
+                if ( rectCtrl.Intersects(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);
+                }
+            }

         }
         }

+    }

 
 

-        // we don't handle mouse moves, so fall through
-        // to wxControl::MSWWindowProc
+    return true;
+}
+
+void wxToolBar::HandleMouseMove(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam)
+{
+    wxCoord x = GET_X_LPARAM(lParam),
+            y = GET_Y_LPARAM(lParam);
+    wxToolBarToolBase* tool = FindToolForPosition( x, y );
+
+    // cursor left current tool
+    if ( tool != m_pInTool && !tool )
+    {
+        m_pInTool = 0;
+        OnMouseEnter( -1 );
+    }
+
+    // cursor entered a tool
+    if ( tool != m_pInTool && tool )
+    {
+        m_pInTool = tool;
+        OnMouseEnter( tool->GetId() );
+    }
+}
+
+WXLRESULT wxToolBar::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+{
+    switch ( nMsg )
+    {
+        case WM_MOUSEMOVE:
+            // we don't handle mouse moves, so always pass the message to
+            // wxControl::MSWWindowProc (HandleMouseMove just calls OnMouseEnter)
+            HandleMouseMove(wParam, lParam);
+            break;
+
+        case WM_SIZE:
+            if ( HandleSize(wParam, lParam) )
+                return 0;
+            break;
+
+#ifndef __WXWINCE__
+        case WM_PAINT:
+            if ( HandlePaint(wParam, lParam) )
+                return 0;
+#endif
+
+        default:
+            break;

     }
 
     return wxControl::MSWWindowProc(nMsg, wParam, lParam);
     }
 
     return wxControl::MSWWindowProc(nMsg, wParam, lParam);


@@ -1218,5 +1677,5 @@ WXHBITMAP wxToolBar::MapBitmap(WXHBITMAP bitmap, int width, int height)
 #endif // 0
 }
 
 #endif // 0
 }
 

-#endif // wxUSE_TOOLBAR && Win95
+#endif // wxUSE_TOOLBAR