Don't define wxArrayPGProperty as std::vector in STL build.

[wxWidgets.git] / src / common / tbarbase.cpp

diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index 97fe65f63142988dcc7a132be923b9948e0f51d8..abc7670961e7465b318842ac661d871da3a2c8a1 100644 (file)
--- a/src/common/tbarbase.cpp
+++ b/src/common/tbarbase.cpp
@@ -79,7 +79,7 @@ bool wxToolBarToolBase::Enable(bool enable)
 
 bool wxToolBarToolBase::Toggle(bool toggle)
 {
 
 bool wxToolBarToolBase::Toggle(bool toggle)
 {

-    wxASSERT_MSG( CanBeToggled(), _T("can't toggle this tool") );
+    wxASSERT_MSG( CanBeToggled(), wxT("can't toggle this tool") );

 
     if ( m_toggled == toggle )
         return false;
 
     if ( m_toggled == toggle )
         return false;


@@ -178,7 +178,7 @@ wxToolBarToolBase *wxToolBarBase::InsertTool(size_t pos,
                                              wxObject *clientData)
 {
     wxCHECK_MSG( pos <= GetToolsCount(), NULL,
                                              wxObject *clientData)
 {
     wxCHECK_MSG( pos <= GetToolsCount(), NULL,

-                 _T("invalid position in wxToolBar::InsertTool()") );
+                 wxT("invalid position in wxToolBar::InsertTool()") );

 
     wxToolBarToolBase *tool = CreateTool(id, label, bitmap, bmpDisabled, kind,
                                          clientData, shortHelp, longHelp);
 
     wxToolBarToolBase *tool = CreateTool(id, label, bitmap, bmpDisabled, kind,
                                          clientData, shortHelp, longHelp);


@@ -202,7 +202,7 @@ wxToolBarToolBase *
 wxToolBarBase::InsertTool(size_t pos, wxToolBarToolBase *tool)
 {
     wxCHECK_MSG( pos <= GetToolsCount(), NULL,
 wxToolBarBase::InsertTool(size_t pos, wxToolBarToolBase *tool)
 {
     wxCHECK_MSG( pos <= GetToolsCount(), NULL,

-                 _T("invalid position in wxToolBar::InsertTool()") );
+                 wxT("invalid position in wxToolBar::InsertTool()") );

 
     if ( !tool || !DoInsertTool(pos, tool) )
     {
 
     if ( !tool || !DoInsertTool(pos, tool) )
     {


@@ -227,13 +227,13 @@ wxToolBarBase::InsertControl(size_t pos,
                              const wxString& label)
 {
     wxCHECK_MSG( control, NULL,
                              const wxString& label)
 {
     wxCHECK_MSG( control, NULL,

-                 _T("toolbar: can't insert NULL control") );
+                 wxT("toolbar: can't insert NULL control") );

 
     wxCHECK_MSG( control->GetParent() == this, NULL,
 
     wxCHECK_MSG( control->GetParent() == this, NULL,

-                 _T("control must have toolbar as parent") );
+                 wxT("control must have toolbar as parent") );

 
     wxCHECK_MSG( pos <= GetToolsCount(), NULL,
 
     wxCHECK_MSG( pos <= GetToolsCount(), NULL,

-                 _T("invalid position in wxToolBar::InsertControl()") );
+                 wxT("invalid position in wxToolBar::InsertControl()") );

 
     wxToolBarToolBase *tool = CreateTool(control, label);
 
 
     wxToolBarToolBase *tool = CreateTool(control, label);
 


@@ -260,7 +260,7 @@ wxControl *wxToolBarBase::FindControl( int id )
 
             if ( !control )
             {
 
             if ( !control )
             {

-                wxFAIL_MSG( _T("NULL control in toolbar?") );
+                wxFAIL_MSG( wxT("NULL control in toolbar?") );

             }
             else if ( control->GetId() == id )
             {
             }
             else if ( control->GetId() == id )
             {


@@ -281,7 +281,7 @@ wxToolBarToolBase *wxToolBarBase::AddSeparator()
 wxToolBarToolBase *wxToolBarBase::InsertSeparator(size_t pos)
 {
     wxCHECK_MSG( pos <= GetToolsCount(), NULL,
 wxToolBarToolBase *wxToolBarBase::InsertSeparator(size_t pos)
 {
     wxCHECK_MSG( pos <= GetToolsCount(), NULL,

-                 _T("invalid position in wxToolBar::InsertSeparator()") );
+                 wxT("invalid position in wxToolBar::InsertSeparator()") );

 
     wxToolBarToolBase *tool = CreateTool(wxID_SEPARATOR,
                                          wxEmptyString,
 
     wxToolBarToolBase *tool = CreateTool(wxID_SEPARATOR,
                                          wxEmptyString,


@@ -336,7 +336,7 @@ wxToolBarToolBase *wxToolBarBase::RemoveTool(int id)
 bool wxToolBarBase::DeleteToolByPos(size_t pos)
 {
     wxCHECK_MSG( pos < GetToolsCount(), false,
 bool wxToolBarBase::DeleteToolByPos(size_t pos)
 {
     wxCHECK_MSG( pos < GetToolsCount(), false,

-                 _T("invalid position in wxToolBar::DeleteToolByPos()") );
+                 wxT("invalid position in wxToolBar::DeleteToolByPos()") );

 
     wxToolBarToolsList::compatibility_iterator node = m_tools.Item(pos);
 
 
     wxToolBarToolsList::compatibility_iterator node = m_tools.Item(pos);
 


@@ -397,13 +397,13 @@ wxToolBarToolBase *wxToolBarBase::FindById(int id) const
 
 void wxToolBarBase::UnToggleRadioGroup(wxToolBarToolBase *tool)
 {
 
 void wxToolBarBase::UnToggleRadioGroup(wxToolBarToolBase *tool)
 {

-    wxCHECK_RET( tool, _T("NULL tool in wxToolBarTool::UnToggleRadioGroup") );
+    wxCHECK_RET( tool, wxT("NULL tool in wxToolBarTool::UnToggleRadioGroup") );

 
     if ( !tool->IsButton() || tool->GetKind() != wxITEM_RADIO )
         return;
 
     wxToolBarToolsList::compatibility_iterator node = m_tools.Find(tool);
 
     if ( !tool->IsButton() || tool->GetKind() != wxITEM_RADIO )
         return;
 
     wxToolBarToolsList::compatibility_iterator node = m_tools.Find(tool);

-    wxCHECK_RET( node, _T("invalid tool in wxToolBarTool::UnToggleRadioGroup") );
+    wxCHECK_RET( node, wxT("invalid tool in wxToolBarTool::UnToggleRadioGroup") );

 
     wxToolBarToolsList::compatibility_iterator nodeNext = node->GetNext();
     while ( nodeNext )
 
     wxToolBarToolsList::compatibility_iterator nodeNext = node->GetNext();
     while ( nodeNext )


@@ -446,8 +446,35 @@ void wxToolBarBase::ClearTools()
     }
 }
 
     }
 }
 

+void wxToolBarBase::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();
+        if ( bmp.IsOk() )
+            sizeActual.IncTo(bmp.GetSize());
+    }
+
+    if ( sizeActual != sizeOrig )
+        SetToolBitmapSize(sizeActual);
+}
+

 bool wxToolBarBase::Realize()
 {
 bool wxToolBarBase::Realize()
 {

+    // check if we have anything to do
+    if ( m_tools.empty() )
+        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();
+

     return true;
 }
 
     return true;
 }
 


@@ -534,7 +561,7 @@ void wxToolBarBase::SetToolClientData(int id, wxObject *clientData)
 {
     wxToolBarToolBase *tool = FindById(id);
 
 {
     wxToolBarToolBase *tool = FindById(id);
 

-    wxCHECK_RET( tool, _T("no such tool in wxToolBar::SetToolClientData") );
+    wxCHECK_RET( tool, wxT("no such tool in wxToolBar::SetToolClientData") );

 
     tool->SetClientData(clientData);
 }
 
     tool->SetClientData(clientData);
 }


@@ -558,7 +585,7 @@ int wxToolBarBase::GetToolPos(int id) const
 bool wxToolBarBase::GetToolState(int id) const
 {
     wxToolBarToolBase *tool = FindById(id);
 bool wxToolBarBase::GetToolState(int id) const
 {
     wxToolBarToolBase *tool = FindById(id);

-    wxCHECK_MSG( tool, false, _T("no such tool") );
+    wxCHECK_MSG( tool, false, wxT("no such tool") );

 
     return tool->IsToggled();
 }
 
     return tool->IsToggled();
 }


@@ -566,7 +593,7 @@ bool wxToolBarBase::GetToolState(int id) const
 bool wxToolBarBase::GetToolEnabled(int id) const
 {
     wxToolBarToolBase *tool = FindById(id);
 bool wxToolBarBase::GetToolEnabled(int id) const
 {
     wxToolBarToolBase *tool = FindById(id);

-    wxCHECK_MSG( tool, false, _T("no such tool") );
+    wxCHECK_MSG( tool, false, wxT("no such tool") );

 
     return tool->IsEnabled();
 }
 
     return tool->IsEnabled();
 }


@@ -574,7 +601,7 @@ bool wxToolBarBase::GetToolEnabled(int id) const
 wxString wxToolBarBase::GetToolShortHelp(int id) const
 {
     wxToolBarToolBase *tool = FindById(id);
 wxString wxToolBarBase::GetToolShortHelp(int id) const
 {
     wxToolBarToolBase *tool = FindById(id);

-    wxCHECK_MSG( tool, wxEmptyString, _T("no such tool") );
+    wxCHECK_MSG( tool, wxEmptyString, wxT("no such tool") );

 
     return tool->GetShortHelp();
 }
 
     return tool->GetShortHelp();
 }


@@ -582,7 +609,7 @@ wxString wxToolBarBase::GetToolShortHelp(int id) const
 wxString wxToolBarBase::GetToolLongHelp(int id) const
 {
     wxToolBarToolBase *tool = FindById(id);
 wxString wxToolBarBase::GetToolLongHelp(int id) const
 {
     wxToolBarToolBase *tool = FindById(id);

-    wxCHECK_MSG( tool, wxEmptyString, _T("no such tool") );
+    wxCHECK_MSG( tool, wxEmptyString, wxT("no such tool") );

 
     return tool->GetLongHelp();
 }
 
     return tool->GetLongHelp();
 }


@@ -723,10 +750,10 @@ void wxToolBarBase::UpdateWindowUI(long flags)
 bool wxToolBarBase::SetDropdownMenu(int toolid, wxMenu* menu)
 {
     wxToolBarToolBase * const tool = FindById(toolid);
 bool wxToolBarBase::SetDropdownMenu(int toolid, wxMenu* menu)
 {
     wxToolBarToolBase * const tool = FindById(toolid);

-    wxCHECK_MSG( tool, false, _T("invalid tool id") );
+    wxCHECK_MSG( tool, false, wxT("invalid tool id") );

 
     wxCHECK_MSG( tool->GetKind() == wxITEM_DROPDOWN, false,
 
     wxCHECK_MSG( tool->GetKind() == wxITEM_DROPDOWN, false,

-                    _T("menu can be only associated with drop down tools") );
+                    wxT("menu can be only associated with drop down tools") );

 
     tool->SetDropdownMenu(menu);
 
 
     tool->SetDropdownMenu(menu);