Latest updates for compiling.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2001-12-21 20:42:20 +00:00
parent 7e67a05520
commit 1908260b42
2 changed files with 14 additions and 6 deletions

View File

@@ -20,7 +20,7 @@
WXDLLEXPORT_DATA(extern const char*) wxStaticTextNameStr;
class WXDLLEXPORT wxStaticText : public wxControl
class WXDLLEXPORT wxStaticText : public wxStaticTextBase
{
public:
inline wxStaticText() { }
@@ -48,8 +48,8 @@ public:
//
// Accessors
//
void SetLabel(const wxString&);
bool SetFont(const wxFont &rFont);
virtual void SetLabel(const wxString& rsLabel);
virtual bool SetFont(const wxFont &rFont);
//
// Overriden base class virtuals
@@ -65,6 +65,12 @@ public:
);
protected:
virtual void DoSetSize( int nX
,int nY
,int nWidth
,int nHeight
,int nSizeFlags = wxSIZE_AUTO
);
virtual wxSize DoGetBestSize(void) const;
private: