From 05627cf54c44178653a41d84b27eaf39795adf6f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 20 Jun 2019 01:44:27 +0200 Subject: [PATCH] Make wxControlBase::DoEllipsizeSingleLine() private function This function doesn't need to be a method of wxControl, so don't make it one. No real changes, just improve the encapsulation. --- include/wx/control.h | 5 ----- src/common/ctrlcmn.cpp | 12 ++++++------ 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/include/wx/control.h b/include/wx/control.h index 86563645e0..0e646b2faa 100644 --- a/include/wx/control.h +++ b/include/wx/control.h @@ -178,11 +178,6 @@ protected: // initialize the common fields of wxCommandEvent void InitCommandEvent(wxCommandEvent& event) const; - // Ellipsize() helper: - static wxString DoEllipsizeSingleLine(const wxString& label, const wxDC& dc, - wxEllipsizeMode mode, int maxWidth, - int replacementWidth); - #if wxUSE_MARKUP // Remove markup from the given string, returns empty string on error i.e. // if markup was syntactically invalid. diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp index 3715caf07b..7768c08d70 100644 --- a/src/common/ctrlcmn.cpp +++ b/src/common/ctrlcmn.cpp @@ -403,12 +403,9 @@ struct EllipsizeCalculator bool m_isOk; }; -} // anonymous namespace - -/* static and protected */ -wxString wxControlBase::DoEllipsizeSingleLine(const wxString& curLine, const wxDC& dc, - wxEllipsizeMode mode, int maxFinalWidthPx, - int replacementWidthPx) +wxString DoEllipsizeSingleLine(const wxString& curLine, const wxDC& dc, + wxEllipsizeMode mode, int maxFinalWidthPx, + int replacementWidthPx) { wxASSERT_MSG(replacementWidthPx > 0, "Invalid parameters"); wxASSERT_LEVEL_2_MSG(!curLine.Contains('\n'), @@ -523,6 +520,9 @@ wxString wxControlBase::DoEllipsizeSingleLine(const wxString& curLine, const wxD return calc.GetEllipsizedText(); } +} // anonymous namespace + + /* static */ wxString wxControlBase::Ellipsize(const wxString& label, const wxDC& dc, wxEllipsizeMode mode, int maxFinalWidth,