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

derive wxStaticText from wxStaticTextBase under wxGTK1 too, in particular thi sfixes missing wxStaticText::Wrap() problem during linking

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-04-11 12:13:36 +00:00
parent 21324807f5
commit f99bfeea73
1 changed files with 6 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
include/wx/gtk1/stattext.h
View File

@@ -10,26 +10,11 @@
#ifndef __GTKSTATICTEXTH__ #ifndef __GTKSTATICTEXTH__
#define __GTKSTATICTEXTH__ #define __GTKSTATICTEXTH__
#include "wx/defs.h"
#include "wx/object.h"
#include "wx/list.h"
#include "wx/control.h"
//-----------------------------------------------------------------------------
// classes
//-----------------------------------------------------------------------------
class WXDLLIMPEXP_CORE wxStaticText;
//-----------------------------------------------------------------------------
// global data
//-----------------------------------------------------------------------------
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxStaticText // wxStaticText
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
class WXDLLIMPEXP_CORE wxStaticText : public wxControl class WXDLLIMPEXP_CORE wxStaticText : public wxStaticTextBase
{ {
public: public:
wxStaticText(); wxStaticText();
@@ -49,21 +34,15 @@ public:
long style = 0, long style = 0,
const wxString &name = wxStaticTextNameStr ); const wxString &name = wxStaticTextNameStr );
wxString GetLabel() const; virtual wxString GetLabel() const;
void SetLabel( const wxString &label ); virtual void SetLabel( const wxString &label );
bool SetFont( const wxFont &font ); virtual bool SetFont( const wxFont &font );
bool SetForegroundColour( const wxColour& colour ); virtual bool SetForegroundColour( const wxColour& colour );
static wxVisualAttributes static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
// see wx/stattext.h
void Wrap(int width);
// implementation
// --------------
protected: protected:
virtual void DoSetSize(int x, int y, virtual void DoSetSize(int x, int y,
int width, int height, int width, int height,
@@ -74,5 +53,4 @@ protected:
DECLARE_DYNAMIC_CLASS(wxStaticText) DECLARE_DYNAMIC_CLASS(wxStaticText)
}; };
#endif #endif // __GTKSTATICTEXTH__
// __GTKSTATICTEXTH__