projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add missing WXK constants for the control keys
[wxWidgets.git]
/
include
/
wx
/
msw
/
stattext.h
diff --git
a/include/wx/msw/stattext.h
b/include/wx/msw/stattext.h
index 284067079dfcf02c7386232173bc7ce60603c357..2bae45488975063e193e4d749c9e81df723252f6 100644
(file)
--- a/
include/wx/msw/stattext.h
+++ b/
include/wx/msw/stattext.h
@@
-12,7
+12,7
@@
#ifndef _WX_STATTEXT_H_
#define _WX_STATTEXT_H_
#ifndef _WX_STATTEXT_H_
#define _WX_STATTEXT_H_
-class WXDLL
EXPORT
wxStaticText : public wxStaticTextBase
+class WXDLL
IMPEXP_CORE
wxStaticText : public wxStaticTextBase
{
public:
wxStaticText() { }
{
public:
wxStaticText() { }
@@
-44,10
+44,12
@@
public:
protected:
// implement/override some base class virtuals
protected:
// implement/override some base class virtuals
- virtual wxBorder GetDefaultBorder() const;
virtual void DoSetSize(int x, int y, int w, int h,
int sizeFlags = wxSIZE_AUTO);
virtual void DoSetSize(int x, int y, int w, int h,
int sizeFlags = wxSIZE_AUTO);
- virtual wxSize DoGetBestSize() const;
+ virtual wxSize DoGetBestClientSize() const;
+
+ virtual wxString DoGetLabel() const;
+ virtual void DoSetLabel(const wxString& str);
DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText)
};
DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText)
};