From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 14 Dec 2009 12:41:55 +0000 (+0000)
Subject: Restore correct access to wxGenericStaticText::Set{Font,Label}.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/5851e6407895ba0a456fe19bd0b1a840dd5df4f6?hp=03773e400b6ff2692f2a9ba045d652c3b7b7109d

Restore correct access to wxGenericStaticText::Set{Font,Label}.

Accessibility of these methods was accidentally changed to protected in r62821
and this broke wxUniv compilation, make them public again.

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

diff --git a/include/wx/generic/stattextg.h b/include/wx/generic/stattextg.h
index 02860ea951..361c3dc007 100644
--- a/include/wx/generic/stattextg.h
+++ b/include/wx/generic/stattextg.h
@@ -44,12 +44,13 @@ public:
                 const wxString& name = wxStaticTextNameStr);
 
 
-protected:
-    virtual wxSize DoGetBestClientSize() const;
-
+    // overridden base class virtual methods
     virtual void SetLabel(const wxString& label);
     virtual bool SetFont(const wxFont &font);
 
+protected:
+    virtual wxSize DoGetBestClientSize() const;
+
     virtual wxString DoGetLabel() const { return m_label; }
     virtual void DoSetLabel(const wxString& label);