IRIX compilation fix: don't redeclare usleep() if HAVE_USLEEP is defined

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

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 94305d7af8e8c5b352177cd90e902f8c339c127f..d1079d550c28934adfec34c216e52ef5c2179f76 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -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,33 +39,22 @@
     #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"
 

+#if wxUSE_UXTHEME
+#include "wx/msw/uxtheme.h"
+#endif
+

 // include <commctrl.h> "properly"
 #include "wx/msw/wrapcctl.h"
 
 #include "wx/app.h"         // for GetComCtl32Version
 
 // include <commctrl.h> "properly"
 #include "wx/msw/wrapcctl.h"
 
 #include "wx/app.h"         // for GetComCtl32Version
 

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


@@ -96,6 +85,10 @@
     #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


@@ -110,22 +103,22 @@
 IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
 
 /*
 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
+    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)
 */
 
 BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)


@@ -237,28 +230,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
     if ( !MSWCreateToolbar(pos, size) )
 
     // MSW-specific initialisation
     if ( !MSWCreateToolbar(pos, size) )

-        return FALSE;
+        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)
 {
     if ( !MSWCreateControl(TOOLBARCLASSNAME, wxEmptyString, pos, size) )
 }
 
 bool wxToolBar::MSWCreateToolbar(const wxPoint& pos, const wxSize& size)
 {
     if ( !MSWCreateControl(TOOLBARCLASSNAME, wxEmptyString, pos, size) )

-        return FALSE;
+        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()


@@ -327,11 +342,32 @@ wxToolBar::~wxToolBar()
 
 wxSize wxToolBar::DoGetBestSize() const
 {
 
 wxSize wxToolBar::DoGetBestSize() const
 {

-    wxSize sizeBest = GetToolSize();
-    sizeBest.x *= GetToolsCount();
+    wxSize sizeBest;

 
 

-    // reverse horz and vertical components if necessary
-    return HasFlag(wxTB_VERTICAL) ? wxSize(sizeBest.y, sizeBest.x) : 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;
+    }
+
+    return sizeBest;

 }
 
 WXDWORD wxToolBar::MSWGetStyle(long style, WXDWORD *exstyle) const
 }
 
 WXDWORD wxToolBar::MSWGetStyle(long style, WXDWORD *exstyle) const


@@ -389,7 +425,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)


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

-            return FALSE;
+            return false;

         }
     }
 
         }
     }
 


@@ -462,11 +499,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()


@@ -475,11 +513,24 @@ 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++ )
     {
     // delete all old buttons, if any
     for ( size_t pos = 0; pos < m_nButtons; pos++ )
     {


@@ -515,33 +566,29 @@ bool wxToolBar::Realize()
                       totalBitmapHeight = m_defaultHeight;
 
         // Create a bitmap and copy all the tool bitmaps to it
                       totalBitmapHeight = 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);
         wxMemoryDC dcAllButtons;
         wxBitmap bitmap(totalBitmapWidth, totalBitmapHeight);
         dcAllButtons.SelectObject(bitmap);

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

         dcAllButtons.SetBackground(*wxLIGHT_GREY_BRUSH);
         dcAllButtons.Clear();
 
         m_hBitmap = bitmap.GetHBITMAP();
         HBITMAP hBitmap = (HBITMAP)m_hBitmap;
         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"));

 
 

-            return FALSE;
-        }
-
-        m_hBitmap = (WXHBITMAP)hBitmap;
+        if (doRemapBg)
+        {
+            dcAllButtons.SelectObject(wxNullBitmap);

 
 

-        MemoryHDC memoryDC;
-        SelectInHDC hdcSelector(memoryDC, hBitmap);
+            // Even if we're not remapping the bitmap
+            // content, we still have to remap the background.
+            hBitmap = (HBITMAP)MapBitmap((WXHBITMAP) hBitmap,
+                totalBitmapWidth, totalBitmapHeight);

 
 

-        MemoryHDC memoryDC2;
-#endif // USE_BITMAP_MASKS/!USE_BITMAP_MASKS
+            dcAllButtons.SelectObject(bitmap);
+        }

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


@@ -557,19 +604,10 @@ bool wxToolBar::Realize()
                 const wxBitmap& bmp = tool->GetNormalBitmap();
                 if ( bmp.Ok() )
                 {
                 const wxBitmap& bmp = tool->GetNormalBitmap();
                 if ( bmp.Ok() )
                 {

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

                     // notice the last parameter: do use mask
                     // notice the last parameter: do use mask

-                    dcAllButtons.DrawBitmap(bmp, x, 0, TRUE);
-#else // !USE_BITMAP_MASKS
-                    SelectInHDC hdcSelector2(memoryDC2, GetHbitmapOf(bmp));
-                    if ( !BitBlt(memoryDC,
-                                 x, 0,  m_defaultWidth, m_defaultHeight,
-                                 memoryDC2,
-                                 0, 0, SRCCOPY) )
-                    {
-                        wxLogLastError(wxT("BitBlt"));
-                    }
-#endif // USE_BITMAP_MASKS/!USE_BITMAP_MASKS
+                    dcAllButtons.DrawBitmap(bmp, x+xOffset, yOffset, true);

                 }
                 else
                 {
                 }
                 else
                 {


@@ -584,18 +622,19 @@ bool wxToolBar::Realize()
             }
         }
 
             }
         }
 

-#if USE_BITMAP_MASKS

         dcAllButtons.SelectObject(wxNullBitmap);
 
         // don't delete this HBITMAP!
         bitmap.SetHBITMAP(0);
         dcAllButtons.SelectObject(wxNullBitmap);
 
         // don't delete this HBITMAP!
         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 )
         {


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

-                addBitmap = FALSE;
+                addBitmap = false;

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


@@ -625,7 +664,7 @@ 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;
             }


@@ -660,7 +699,7 @@ 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() )
     {
     int i = 0;
     for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
     {


@@ -679,7 +718,7 @@ bool wxToolBar::Realize()
 
         wxZeroMemory(button);
 
 
         wxZeroMemory(button);
 

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

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


@@ -723,10 +762,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:


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


@@ -796,7 +835,7 @@ 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+
 #ifdef TB_SETBUTTONINFO
 
         // TB_SETBUTTONINFO message is only supported by comctl32.dll 4.71+
 #ifdef TB_SETBUTTONINFO


@@ -809,9 +848,9 @@ bool wxToolBar::Realize()
             TBBUTTONINFO tbbi;
             tbbi.cbSize = sizeof(tbbi);
             tbbi.dwMask = TBIF_SIZE;
             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"));


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


@@ -848,7 +887,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


@@ -857,7 +896,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;
         }


@@ -872,7 +911,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;


@@ -902,7 +941,8 @@ bool wxToolBar::Realize()
         }
     }
 
         }
     }
 

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

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


@@ -913,33 +953,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;
+
+        // 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);
+    }

 
 

-    // 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),


@@ -954,22 +996,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
 }
 


@@ -1009,7 +1051,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);


@@ -1077,7 +1120,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);


@@ -1220,10 +1263,10 @@ bool wxToolBar::HandleSize(WXWPARAM WXUNUSED(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)


@@ -1242,7 +1285,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


@@ -1251,10 +1294,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;


@@ -1314,16 +1357,16 @@ 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
                     // Necessary in case we use a no-paint-on-size
                     // style in the parent: the controls can disappear

-                    control->Refresh(FALSE);
+                    control->Refresh(false);

                 }
             }
         }
     }
 
                 }
             }
         }
     }
 

-    return TRUE;
+    return true;

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


@@ -1347,7 +1390,7 @@ void wxToolBar::HandleMouseMove(WXWPARAM WXUNUSED(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 )
     {