Output the extracted number from wxString::ToXXX() even if it returns false.

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

diff --git a/src/msw/toolbar.cpp b/src/msw/toolbar.cpp
index bc29e616991529f9d1b594abcd3bfca6f52239a0..ba4638e445c6e742ae05dd3092a7021967135f77 100644 (file)
--- a/src/msw/toolbar.cpp
+++ b/src/msw/toolbar.cpp
@@ -43,8 +43,10 @@
     #include "wx/stattext.h"
 #endif
 
     #include "wx/stattext.h"
 #endif
 

+#include "wx/artprov.h"

 #include "wx/sysopt.h"
 #include "wx/dcclient.h"
 #include "wx/sysopt.h"
 #include "wx/dcclient.h"

+#include "wx/scopedarray.h"

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


@@ -96,10 +98,6 @@
     #define TB_GETMAXSIZE           (WM_USER + 83)
 #endif
 
     #define TB_GETMAXSIZE           (WM_USER + 83)
 #endif
 

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

 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------


@@ -202,7 +200,7 @@ public:
     wxStaticText* GetStaticText()
     {
         wxASSERT_MSG( IsControl(),
     wxStaticText* GetStaticText()
     {
         wxASSERT_MSG( IsControl(),

-                      _T("only makes sense for embedded control tools") );
+                      wxT("only makes sense for embedded control tools") );

 
         return m_staticText;
     }
 
         return m_staticText;
     }


@@ -216,7 +214,7 @@ private:
     size_t m_nSepCount;
     wxStaticText *m_staticText;
 
     size_t m_nSepCount;
     wxStaticText *m_staticText;
 

-    DECLARE_NO_COPY_CLASS(wxToolBarTool)
+    wxDECLARE_NO_COPY_CLASS(wxToolBarTool);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -284,8 +282,13 @@ void wxToolBar::Init()
 
     m_nButtons = 0;
 
 
     m_nButtons = 0;
 

-    m_defaultWidth = DEFAULTBITMAPX;
-    m_defaultHeight = DEFAULTBITMAPY;
+    // even though modern Windows applications typically use 24*24 (or even
+    // 32*32) size for their bitmaps, the native control itself still uses the
+    // old 16*15 default size (see TB_SETBITMAPSIZE documentation in MSDN), so
+    // default to it so that we don't call SetToolBitmapSize() unnecessarily in
+    // wxToolBarBase::AdjustToolBitmapSize()
+    m_defaultWidth = 16;
+    m_defaultHeight = 15;

 
     m_pInTool = NULL;
 }
 
     m_pInTool = NULL;
 }


@@ -358,7 +361,7 @@ void wxToolBar::Recreate()
     if ( !MSWCreateToolbar(pos, size) )
     {
         // what can we do?
     if ( !MSWCreateToolbar(pos, size) )
     {
         // what can we do?

-        wxFAIL_MSG( _T("recreating the toolbar failed") );
+        wxFAIL_MSG( wxT("recreating the toolbar failed") );

 
         return;
     }
 
         return;
     }


@@ -633,10 +636,10 @@ void wxToolBar::CreateDisabledImageList()
 
 bool wxToolBar::Realize()
 {
 
 bool wxToolBar::Realize()
 {

+    if ( !wxToolBarBase::Realize() )
+        return false;
+

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

-    if ( nTools == 0 )
-        // nothing to do
-        return true;

 
 #ifdef wxREMAP_BUTTON_COLOURS
     // don't change the values of these constants, they can be set from the
 
 #ifdef wxREMAP_BUTTON_COLOURS
     // don't change the values of these constants, they can be set from the


@@ -675,22 +678,12 @@ bool wxToolBar::Realize()
     wxToolBarToolsList::compatibility_iterator node;
     int bitmapId = 0;
 
     wxToolBarToolsList::compatibility_iterator node;
     int bitmapId = 0;
 

-    wxSize sizeBmp;
-    if ( HasFlag(wxTB_NOICONS) )
-    {
-        // no icons, don't leave space for them
-        sizeBmp.x =
-        sizeBmp.y = 0;
-    }
-    else // do show icons
+    if ( !HasFlag(wxTB_NOICONS) )

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

-        sizeBmp.x = m_defaultWidth;
-        sizeBmp.y = m_defaultHeight;
-

         const wxCoord totalBitmapWidth  = m_defaultWidth *
                                           wx_truncate_cast(wxCoord, nTools),
                       totalBitmapHeight = m_defaultHeight;
         const wxCoord totalBitmapWidth  = m_defaultWidth *
                                           wx_truncate_cast(wxCoord, nTools),
                       totalBitmapHeight = m_defaultHeight;


@@ -759,7 +752,7 @@ bool wxToolBar::Realize()
                 }
                 else
                 {
                 }
                 else
                 {

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

                 }
 
                 // also deal with disabled bitmap if we want to use them
                 }
 
                 // also deal with disabled bitmap if we want to use them


@@ -894,18 +887,11 @@ bool wxToolBar::Realize()
         }
     }
 
         }
     }
 

-    // 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)) )
-    {
-        wxLogLastError(_T("TB_SETBITMAPSIZE"));
-    }

 
     // Next add the buttons and separators
     // -----------------------------------
 
 
     // Next add the buttons and separators
     // -----------------------------------
 

-    TBBUTTON *buttons = new TBBUTTON[nTools];
+    wxScopedArray<TBBUTTON> buttons(new TBBUTTON[nTools]);

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


@@ -1011,7 +997,7 @@ bool wxToolBar::Realize()
                         break;
 
                     default:
                         break;
 
                     default:

-                        wxFAIL_MSG( _T("unexpected toolbar button kind") );
+                        wxFAIL_MSG( wxT("unexpected toolbar button kind") );

                         button.fsStyle = TBSTYLE_BUTTON;
                         break;
                 }
                         button.fsStyle = TBSTYLE_BUTTON;
                         break;
                 }


@@ -1025,12 +1011,11 @@ bool wxToolBar::Realize()
         i++;
     }
 
         i++;
     }
 

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

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

-    delete [] buttons;

 
     // Deal with the controls finally
     // ------------------------------
 
     // Deal with the controls finally
     // ------------------------------


@@ -1250,7 +1235,16 @@ bool wxToolBar::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD id_)
 
     bool allowLeftClick = OnLeftClick(id, toggled);
 
 
     bool allowLeftClick = OnLeftClick(id, toggled);
 

-    // restore the unpressed state
+    // Restore the unpressed state. Enabled/toggled state might have been
+    // changed since so take care of it.
+    if (tool->IsEnabled())
+        state |= TBSTATE_ENABLED;
+    else
+        state &= ~TBSTATE_ENABLED;
+    if (tool->IsToggled())
+        state |= TBSTATE_CHECKED;
+    else
+        state &= ~TBSTATE_CHECKED;

     ::SendMessage(GetHwnd(), TB_SETSTATE, id, MAKELONG(state, 0));
 
     // OnLeftClick() can veto the button state change - for buttons which
     ::SendMessage(GetHwnd(), TB_SETSTATE, id, MAKELONG(state, 0));
 
     // OnLeftClick() can veto the button state change - for buttons which


@@ -1283,7 +1277,7 @@ bool wxToolBar::MSWOnNotify(int WXUNUSED(idCtrl),
         }
 
         const wxToolBarToolBase * const tool = FindById(tbhdr->iItem);
         }
 
         const wxToolBarToolBase * const tool = FindById(tbhdr->iItem);

-        wxCHECK_MSG( tool, false, _T("drop down message for unknown tool") );
+        wxCHECK_MSG( tool, false, wxT("drop down message for unknown tool") );

 
         wxMenu * const menu = tool->GetDropdownMenu();
         if ( !menu )
 
         wxMenu * const menu = tool->GetDropdownMenu();
         if ( !menu )


@@ -1413,7 +1407,7 @@ wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
     //      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
     //      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;
+        return NULL;

 
     // when TB_SETBUTTONINFO is available (both during compile- and run-time),
     // we don't use the dummy separators hack
 
     // when TB_SETBUTTONINFO is available (both during compile- and run-time),
     // we don't use the dummy separators hack


@@ -1496,7 +1490,7 @@ void wxToolBar::DoSetToggle(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(tog
 {
     // VZ: AFAIK, the button has to be created either with TBSTYLE_CHECK or
     //     without, so we really need to delete the button and recreate it here
 {
     // VZ: AFAIK, the button has to be created either with TBSTYLE_CHECK or
     //     without, so we really need to delete the button and recreate it here

-    wxFAIL_MSG( _T("not implemented") );
+    wxFAIL_MSG( wxT("not implemented") );

 }
 
 void wxToolBar::SetToolNormalBitmap( int id, const wxBitmap& bitmap )
 }
 
 void wxToolBar::SetToolNormalBitmap( int id, const wxBitmap& bitmap )


@@ -1580,7 +1574,7 @@ void wxToolBar::OnMouseEvent(wxMouseEvent& event)
 void wxToolBar::OnEraseBackground(wxEraseEvent& event)
 {
     RECT rect = wxGetClientRect(GetHwnd());
 void wxToolBar::OnEraseBackground(wxEraseEvent& event)
 {
     RECT rect = wxGetClientRect(GetHwnd());

-    
+

     wxDC *dc = event.GetDC();
     if (!dc) return;
     wxMSWDCImpl *impl = (wxMSWDCImpl*) dc->GetImpl();
     wxDC *dc = event.GetDC();
     if (!dc) return;
     wxMSWDCImpl *impl = (wxMSWDCImpl*) dc->GetImpl();


@@ -1606,7 +1600,9 @@ void wxToolBar::OnEraseBackground(wxEraseEvent& event)
             // it can also return S_FALSE which seems to simply say that it
             // didn't draw anything but no error really occurred
             if ( FAILED(hr) )
             // it can also return S_FALSE which seems to simply say that it
             // didn't draw anything but no error really occurred
             if ( FAILED(hr) )

-                wxLogApiError(_T("DrawThemeParentBackground(toolbar)"), hr);
+            {
+                wxLogApiError(wxT("DrawThemeParentBackground(toolbar)"), hr);
+            }

         }
     }
 
         }
     }
 


@@ -1629,7 +1625,9 @@ void wxToolBar::OnEraseBackground(wxEraseEvent& event)
             // it can also return S_FALSE which seems to simply say that it
             // didn't draw anything but no error really occurred
             if ( FAILED(hr) )
             // it can also return S_FALSE which seems to simply say that it
             // didn't draw anything but no error really occurred
             if ( FAILED(hr) )

-                wxLogApiError(_T("DrawThemeParentBackground(toolbar)"), hr);
+            {
+                wxLogApiError(wxT("DrawThemeParentBackground(toolbar)"), hr);
+            }

         }
     }
 
         }
     }
 


@@ -1705,6 +1703,7 @@ bool wxToolBar::HandleSize(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam)
     return true;
 }
 
     return true;
 }
 

+#ifndef __WXWINCE__

 bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
 {
     // erase any dummy separators which were used
 bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
 {
     // erase any dummy separators which were used


@@ -1774,7 +1773,7 @@ bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
                 if ( !::SendMessage(GetHwnd(), TB_GETBUTTON,
                                     n, (LPARAM)&tbb) )
                 {
                 if ( !::SendMessage(GetHwnd(), TB_GETBUTTON,
                                     n, (LPARAM)&tbb) )
                 {

-                    wxLogDebug(_T("TB_GETBUTTON failed?"));
+                    wxLogDebug(wxT("TB_GETBUTTON failed?"));

 
                     continue;
                 }
 
                     continue;
                 }


@@ -1816,14 +1815,14 @@ bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
                             r.right = clientSize.x;
                             r.top = 0;
                             r.bottom = clientSize.y;
                             r.right = clientSize.x;
                             r.top = 0;
                             r.bottom = clientSize.y;

-                            
+

                             wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl();
                             HRESULT hr = theme->DrawThemeBackground(hTheme, GetHdcOf(*impl), 0, 0, & r, & clipRect);
                             if ( hr == S_OK )
                                 haveRefreshed = true;
                         }
                     }
                             wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl();
                             HRESULT hr = theme->DrawThemeBackground(hTheme, GetHdcOf(*impl), 0, 0, & r, & clipRect);
                             if ( hr == S_OK )
                                 haveRefreshed = true;
                         }
                     }

-#endif
+#endif // wxUSE_UXTHEME

 
                     if (!haveRefreshed)
                         dc.DrawRectangle(rectItem);
 
                     if (!haveRefreshed)
                         dc.DrawRectangle(rectItem);


@@ -1848,6 +1847,7 @@ bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
 
     return true;
 }
 
     return true;
 }

+#endif // __WXWINCE__

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


@@ -1905,7 +1905,7 @@ WXHBITMAP wxToolBar::MapBitmap(WXHBITMAP bitmap, int width, int height)
 
     if ( !hdcMem )
     {
 
     if ( !hdcMem )
     {

-        wxLogLastError(_T("CreateCompatibleDC"));
+        wxLogLastError(wxT("CreateCompatibleDC"));

 
         return bitmap;
     }
 
         return bitmap;
     }


@@ -1914,7 +1914,7 @@ WXHBITMAP wxToolBar::MapBitmap(WXHBITMAP bitmap, int width, int height)
 
     if ( !bmpInHDC )
     {
 
     if ( !bmpInHDC )
     {

-        wxLogLastError(_T("SelectObject"));
+        wxLogLastError(wxT("SelectObject"));

 
         return bitmap;
     }
 
         return bitmap;
     }