projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wxCursor(wxImage) added (Chris Elliott, patch 517439)
[wxWidgets.git]
/
include
/
wx
/
os2
/
stattext.h
diff --git
a/include/wx/os2/stattext.h
b/include/wx/os2/stattext.h
index 66da229103fb0bd56c18df12937ff27f09cd928b..b061ae950f30472ba18b9291ebac149bd847af2c 100644
(file)
--- a/
include/wx/os2/stattext.h
+++ b/
include/wx/os2/stattext.h
@@
-18,9
+18,7
@@
#include "wx/control.h"
#include "wx/control.h"
-WXDLLEXPORT_DATA(extern const char*) wxStaticTextNameStr;
-
-class WXDLLEXPORT wxStaticText : public wxControl
+class WXDLLEXPORT wxStaticText : public wxStaticTextBase
{
public:
inline wxStaticText() { }
{
public:
inline wxStaticText() { }
@@
-48,8
+46,8
@@
public:
//
// Accessors
//
//
// Accessors
//
- v
oid SetLabel(const wxString&
);
- bool SetFont(const wxFont &rFont);
+ v
irtual void SetLabel(const wxString& rsLabel
);
+
virtual
bool SetFont(const wxFont &rFont);
//
// Overriden base class virtuals
//
// Overriden base class virtuals
@@
-65,6
+63,12
@@
public:
);
protected:
);
protected:
+ virtual void DoSetSize( int nX
+ ,int nY
+ ,int nWidth
+ ,int nHeight
+ ,int nSizeFlags = wxSIZE_AUTO
+ );
virtual wxSize DoGetBestSize(void) const;
private:
virtual wxSize DoGetBestSize(void) const;
private: