X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0c133e13b36a923c65f94499554e432bc3a0daa..69d31e313035d5e22d9400ec946f6007f710910c:/src/msw/toolbar.cpp

diff --git a/src/msw/toolbar.cpp b/src/msw/toolbar.cpp
index 724dc006bc..ba4638e445 100644
--- a/src/msw/toolbar.cpp
+++ b/src/msw/toolbar.cpp
@@ -200,7 +200,7 @@ public:
     wxStaticText* GetStaticText()
     {
         wxASSERT_MSG( IsControl(),
-                      _T("only makes sense for embedded control tools") );
+                      wxT("only makes sense for embedded control tools") );
 
         return m_staticText;
     }
@@ -286,7 +286,7 @@ void wxToolBar::Init()
     // 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
-    // AdjustToolBitmapSize()
+    // wxToolBarBase::AdjustToolBitmapSize()
     m_defaultWidth = 16;
     m_defaultHeight = 15;
 
@@ -361,7 +361,7 @@ void wxToolBar::Recreate()
     if ( !MSWCreateToolbar(pos, size) )
     {
         // what can we do?
-        wxFAIL_MSG( _T("recreating the toolbar failed") );
+        wxFAIL_MSG( wxT("recreating the toolbar failed") );
 
         return;
     }
@@ -634,34 +634,12 @@ void wxToolBar::CreateDisabledImageList()
     }
 }
 
-void wxToolBar::AdjustToolBitmapSize()
-{
-    const wxSize sizeOrig(m_defaultWidth, m_defaultHeight);
-
-    wxSize sizeActual(sizeOrig);
-
-    for ( wxToolBarToolsList::const_iterator i = m_tools.begin();
-          i != m_tools.end();
-          ++i )
-    {
-        const wxBitmap& bmp = (*i)->GetNormalBitmap();
-        sizeActual.IncTo(bmp.GetSize());
-    }
-
-    if ( sizeActual != sizeOrig )
-        SetToolBitmapSize(sizeActual);
-}
-
 bool wxToolBar::Realize()
 {
-    const size_t nTools = GetToolsCount();
-    if ( nTools == 0 )
-        // nothing to do
-        return true;
+    if ( !wxToolBarBase::Realize() )
+        return false;
 
-    // make sure tool size is larger enough for all all bitmaps to fit in
-    // (this is consistent with what other ports do):
-    AdjustToolBitmapSize();
+    const size_t nTools = GetToolsCount();
 
 #ifdef wxREMAP_BUTTON_COLOURS
     // don't change the values of these constants, they can be set from the
@@ -774,7 +752,7 @@ bool wxToolBar::Realize()
                 }
                 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
@@ -1019,7 +997,7 @@ bool wxToolBar::Realize()
                         break;
 
                     default:
-                        wxFAIL_MSG( _T("unexpected toolbar button kind") );
+                        wxFAIL_MSG( wxT("unexpected toolbar button kind") );
                         button.fsStyle = TBSTYLE_BUTTON;
                         break;
                 }
@@ -1299,7 +1277,7 @@ bool wxToolBar::MSWOnNotify(int WXUNUSED(idCtrl),
         }
 
         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 )
@@ -1512,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
-    wxFAIL_MSG( _T("not implemented") );
+    wxFAIL_MSG( wxT("not implemented") );
 }
 
 void wxToolBar::SetToolNormalBitmap( int id, const wxBitmap& bitmap )
@@ -1596,7 +1574,7 @@ void wxToolBar::OnMouseEvent(wxMouseEvent& event)
 void wxToolBar::OnEraseBackground(wxEraseEvent& event)
 {
     RECT rect = wxGetClientRect(GetHwnd());
-    
+
     wxDC *dc = event.GetDC();
     if (!dc) return;
     wxMSWDCImpl *impl = (wxMSWDCImpl*) dc->GetImpl();
@@ -1622,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) )
-                wxLogApiError(_T("DrawThemeParentBackground(toolbar)"), hr);
+            {
+                wxLogApiError(wxT("DrawThemeParentBackground(toolbar)"), hr);
+            }
         }
     }
 
@@ -1645,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) )
-                wxLogApiError(_T("DrawThemeParentBackground(toolbar)"), hr);
+            {
+                wxLogApiError(wxT("DrawThemeParentBackground(toolbar)"), hr);
+            }
         }
     }
 
@@ -1721,6 +1703,7 @@ bool wxToolBar::HandleSize(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam)
     return true;
 }
 
+#ifndef __WXWINCE__
 bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
 {
     // erase any dummy separators which were used
@@ -1790,7 +1773,7 @@ bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
                 if ( !::SendMessage(GetHwnd(), TB_GETBUTTON,
                                     n, (LPARAM)&tbb) )
                 {
-                    wxLogDebug(_T("TB_GETBUTTON failed?"));
+                    wxLogDebug(wxT("TB_GETBUTTON failed?"));
 
                     continue;
                 }
@@ -1832,14 +1815,14 @@ bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
                             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;
                         }
                     }
-#endif
+#endif // wxUSE_UXTHEME
 
                     if (!haveRefreshed)
                         dc.DrawRectangle(rectItem);
@@ -1864,6 +1847,7 @@ bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
 
     return true;
 }
+#endif // __WXWINCE__
 
 void wxToolBar::HandleMouseMove(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam)
 {
@@ -1921,7 +1905,7 @@ WXHBITMAP wxToolBar::MapBitmap(WXHBITMAP bitmap, int width, int height)
 
     if ( !hdcMem )
     {
-        wxLogLastError(_T("CreateCompatibleDC"));
+        wxLogLastError(wxT("CreateCompatibleDC"));
 
         return bitmap;
     }
@@ -1930,7 +1914,7 @@ WXHBITMAP wxToolBar::MapBitmap(WXHBITMAP bitmap, int width, int height)
 
     if ( !bmpInHDC )
     {
-        wxLogLastError(_T("SelectObject"));
+        wxLogLastError(wxT("SelectObject"));
 
         return bitmap;
     }