GetColumnTextValue() can't return a reference to a temporary string, so changed it...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43370 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/listctrl_mac.cpp b/src/mac/carbon/listctrl_mac.cpp
index 72c02bd3f9998ea23f46e8fe670155d99f75b62d..b3ed2a593dc9b4f986337ec665669ed88ebe2c39 100644 (file)
--- a/src/mac/carbon/listctrl_mac.cpp
+++ b/src/mac/carbon/listctrl_mac.cpp
@@ -186,7 +186,7 @@ public:
     virtual bool HasColumnInfo( unsigned int column );
 
     virtual void SetColumnTextValue( unsigned int column, const wxString& text );
     virtual bool HasColumnInfo( unsigned int column );
 
     virtual void SetColumnTextValue( unsigned int column, const wxString& text );

-    virtual const wxString& GetColumnTextValue( unsigned int column );
+    virtual wxString GetColumnTextValue( unsigned int column );

 
     virtual int GetColumnImageValue( unsigned int column );
     virtual void SetColumnImageValue( unsigned int column, int imageIndex );
 
     virtual int GetColumnImageValue( unsigned int column );
     virtual void SetColumnImageValue( unsigned int column, int imageIndex );


@@ -635,7 +635,7 @@ bool wxListCtrl::Create(wxWindow *parent,
         paneStyle &= ~wxSTATIC_BORDER;
         if ( !wxWindow::Create(parent, id, pos, size, paneStyle | wxNO_BORDER, name) )
             return false;
         paneStyle &= ~wxSTATIC_BORDER;
         if ( !wxWindow::Create(parent, id, pos, size, paneStyle | wxNO_BORDER, name) )
             return false;

-        
+

         // since the generic control is a child, make sure we position it at 0, 0
         m_genericImpl = new wxGenericListCtrlHook(this, id, wxPoint(0, 0), size, style, validator, name);
         m_genericImpl->PushEventHandler( new wxMacListCtrlEventDelegate( this, GetId() ) );
         // since the generic control is a child, make sure we position it at 0, 0
         m_genericImpl = new wxGenericListCtrlHook(this, id, wxPoint(0, 0), size, style, validator, name);
         m_genericImpl->PushEventHandler( new wxMacListCtrlEventDelegate( this, GetId() ) );


@@ -947,10 +947,10 @@ bool wxListCtrl::SetColumnWidth(int col, int width)
             {
                 wxListItem colInfo;
                 GetColumn(col, colInfo);
             {
                 wxListItem colInfo;
                 GetColumn(col, colInfo);

-             
+

                 colInfo.SetWidth(width);
                 SetColumn(col, colInfo);
                 colInfo.SetWidth(width);
                 SetColumn(col, colInfo);

-            
+

                 m_dbImpl->SetColumnWidth(col, mywidth);
             }
         }
                 m_dbImpl->SetColumnWidth(col, mywidth);
             }
         }


@@ -958,7 +958,7 @@ bool wxListCtrl::SetColumnWidth(int col, int width)
         {
             wxListItem colInfo;
             GetColumn(col, colInfo);
         {
             wxListItem colInfo;
             GetColumn(col, colInfo);

-         
+

             colInfo.SetWidth(width);
             SetColumn(col, colInfo);
             m_dbImpl->SetColumnWidth(col, mywidth);
             colInfo.SetWidth(width);
             SetColumn(col, colInfo);
             m_dbImpl->SetColumnWidth(col, mywidth);


@@ -1718,7 +1718,7 @@ wxListCtrl::HitTest(const wxPoint& point, int& flags, long *ptrSubItem) const
 
         if ( y < 0 )
             return -1;
 
         if ( y < 0 )
             return -1;

-            
+

         int row = y / rowHeight;
         DataBrowserItemID id;
         m_dbImpl->GetItemID( (DataBrowserTableViewRowIndex) row, &id );
         int row = y / rowHeight;
         DataBrowserItemID id;
         m_dbImpl->GetItemID( (DataBrowserTableViewRowIndex) row, &id );


@@ -2375,7 +2375,7 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
                       enclosingRect.bottom - enclosingRect.top);
 
     active = IsControlActive(GetControlRef());
                       enclosingRect.bottom - enclosingRect.top);
 
     active = IsControlActive(GetControlRef());

-    
+

     // don't paint the background over the vertical rule line
     if ( list->GetWindowStyleFlag() & wxLC_VRULES )
     {
     // don't paint the background over the vertical rule line
     if ( list->GetWindowStyleFlag() & wxLC_VRULES )
     {


@@ -2722,7 +2722,7 @@ Boolean wxMacDataBrowserListCtrlControl::CompareItems(DataBrowserItemID itemOneI
         }
         else
         {
         }
         else
         {

-        
+

             long itemNum = (long)itemOneID;
             long otherItemNum = (long)itemTwoID;
             itemText = list->OnGetItemText( itemNum-1, colId );
             long itemNum = (long)itemOneID;
             long otherItemNum = (long)itemTwoID;
             itemText = list->OnGetItemText( itemNum-1, colId );


@@ -2792,7 +2792,7 @@ void wxMacDataBrowserListCtrlControl::MacGetColumnInfo( unsigned int row, unsign
     //if (item)
     {
         wxMacListCtrlItem* listItem = dynamic_cast<wxMacListCtrlItem*>(dataItem);
     //if (item)
     {
         wxMacListCtrlItem* listItem = dynamic_cast<wxMacListCtrlItem*>(dataItem);

-        
+

         if (!listItem->HasColumnInfo( column ))
             return;
 
         if (!listItem->HasColumnInfo( column ))
             return;
 


@@ -2845,7 +2845,7 @@ int wxMacListCtrlItem::GetColumnImageValue( unsigned int column )
 {
     if ( HasColumnInfo(column) )
         return GetColumnInfo(column)->GetImage();
 {
     if ( HasColumnInfo(column) )
         return GetColumnInfo(column)->GetImage();

-    
+

     return -1;
 }
 
     return -1;
 }
 


@@ -2855,14 +2855,14 @@ void wxMacListCtrlItem::SetColumnImageValue( unsigned int column, int imageIndex
         GetColumnInfo(column)->SetImage(imageIndex);
 }
 
         GetColumnInfo(column)->SetImage(imageIndex);
 }
 

-const wxString& wxMacListCtrlItem::GetColumnTextValue( unsigned int column )
+wxString wxMacListCtrlItem::GetColumnTextValue( unsigned int column )

 {
     if ( column == 0 )
         return GetLabel();
 
 {
     if ( column == 0 )
         return GetLabel();
 

-    if ( HasColumnInfo(column) ) 
+    if ( HasColumnInfo(column) )

         return GetColumnInfo(column)->GetText();
         return GetColumnInfo(column)->GetText();

-    
+

     return wxEmptyString;
 }
 
     return wxEmptyString;
 }