projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduced invalidation of ranges for later optimization code
[wxWidgets.git]
/
include
/
wx
/
msw
/
stattext.h
diff --git
a/include/wx/msw/stattext.h
b/include/wx/msw/stattext.h
index c42f65552c131fc9d6205516cb596bdd9d50952a..d9e8f0b742a7bcd09d0c4927dcce5bf1e5a320cf 100644
(file)
--- a/
include/wx/msw/stattext.h
+++ b/
include/wx/msw/stattext.h
@@
-12,10
+12,6
@@
#ifndef _WX_STATTEXT_H_
#define _WX_STATTEXT_H_
#ifndef _WX_STATTEXT_H_
#define _WX_STATTEXT_H_
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma interface "stattext.h"
-#endif
-
class WXDLLEXPORT wxStaticText : public wxStaticTextBase
{
public:
class WXDLLEXPORT wxStaticText : public wxStaticTextBase
{
public:
@@
-40,6
+36,10
@@
public:
long style = 0,
const wxString& name = wxStaticTextNameStr);
long style = 0,
const wxString& name = wxStaticTextNameStr);
+ // override some methods to resize the window properly
+ virtual void SetLabel(const wxString& label);
+ virtual bool SetFont( const wxFont &font );
+
protected:
// implement/override some base class virtuals
virtual wxBorder GetDefaultBorder() const;
protected:
// implement/override some base class virtuals
virtual wxBorder GetDefaultBorder() const;
@@
-48,6
+48,7
@@
protected:
virtual wxSize DoGetBestSize() const;
virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;
virtual wxSize DoGetBestSize() const;
virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;
+
DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText)
};
DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText)
};