Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't provide wxSharedClientDataContainer::m_data accessors

Browse Source 
This is not really necessary and breaks encapsulation of this private
method. It is enough to provide just a way to copy the data from another
object as this is all that the derived classes really need.
This commit is contained in:
Vadim Zeitlin
2022-04-28 00:36:40 +02:00
parent de8877d3ee
commit e2a5c1ffc8
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/clntdata.h
View File

@@ -181,8 +181,10 @@ public:
protected: protected:
bool HasClientDataContainer() const { return m_data.get() != NULL; } bool HasClientDataContainer() const { return m_data.get() != NULL; }
wxSharedPtr<wxClientDataContainer> GetClientDataContainer() const { return m_data; } void CopyClientDataContainer(const wxSharedClientDataContainer& other)
void SetClientDataContainer(wxSharedPtr<wxClientDataContainer> data) { m_data = data; } {
m_data = other.m_data;
}
private: private:
// Helper function that will create m_data if it is currently NULL // Helper function that will create m_data if it is currently NULL

4
src/common/clntdata.cpp
View File

@@ -79,7 +79,7 @@ void wxSharedClientDataContainer::SetClientObject(wxClientData *data)
wxClientData *wxSharedClientDataContainer::GetClientObject() const wxClientData *wxSharedClientDataContainer::GetClientObject() const
{ {
return HasClientDataContainer() ? GetClientDataContainer()->GetClientObject() : NULL; return HasClientDataContainer() ? m_data->GetClientObject() : NULL;
} }
void wxSharedClientDataContainer::SetClientData(void *data) void wxSharedClientDataContainer::SetClientData(void *data)
@@ -89,7 +89,7 @@ void wxSharedClientDataContainer::SetClientData(void *data)
void *wxSharedClientDataContainer::GetClientData() const void *wxSharedClientDataContainer::GetClientData() const
{ {
return HasClientDataContainer() ? GetClientDataContainer()->GetClientData() : NULL; return HasClientDataContainer() ? m_data->GetClientData() : NULL;
} }
wxClientDataContainer *wxSharedClientDataContainer::GetValidClientData() wxClientDataContainer *wxSharedClientDataContainer::GetValidClientData()

6
src/generic/grid.cpp
View File

@@ -255,7 +255,7 @@ int wxGridColumnOperations::GetFirstLine(const wxGrid *grid, wxGridWindow *gridW
wxGridCellWorker::wxGridCellWorker(const wxGridCellWorker& other) wxGridCellWorker::wxGridCellWorker(const wxGridCellWorker& other)
{ {
SetClientDataContainer(other.GetClientDataContainer()); CopyClientDataContainer(other);
} }
void wxGridCellWorker::SetParameters(const wxString& WXUNUSED(params)) void wxGridCellWorker::SetParameters(const wxString& WXUNUSED(params))
@@ -450,7 +450,7 @@ wxGridCellAttr *wxGridCellAttr::Clone() const
m_editor->IncRef(); m_editor->IncRef();
} }
attr->SetClientDataContainer(GetClientDataContainer()); attr->CopyClientDataContainer(*this);
if ( IsReadOnly() ) if ( IsReadOnly() )
attr->SetReadOnly(); attr->SetReadOnly();
@@ -494,7 +494,7 @@ void wxGridCellAttr::MergeWith(wxGridCellAttr *mergefrom)
} }
if ( !HasClientDataContainer() && mergefrom->HasClientDataContainer() ) if ( !HasClientDataContainer() && mergefrom->HasClientDataContainer() )
{ {
SetClientDataContainer(mergefrom->GetClientDataContainer()); CopyClientDataContainer(*mergefrom);
} }
if ( !HasReadWriteMode() && mergefrom->HasReadWriteMode() ) if ( !HasReadWriteMode() && mergefrom->HasReadWriteMode() )
SetReadOnly(mergefrom->IsReadOnly()); SetReadOnly(mergefrom->IsReadOnly());