projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
we need our own imaglist implementation because in wxmac wxIcon does not inherit...
[wxWidgets.git]
/
include
/
wx
/
gtk
/
stattext.h
diff --git
a/include/wx/gtk/stattext.h
b/include/wx/gtk/stattext.h
index 3debaf7f2e8c326a617828791e323237079e1819..6686c96982fd80da969685882386aaf5925a2a6f 100644
(file)
--- a/
include/wx/gtk/stattext.h
+++ b/
include/wx/gtk/stattext.h
@@
-11,7
+11,7
@@
#ifndef __GTKSTATICTEXTH__
#define __GTKSTATICTEXTH__
#ifndef __GTKSTATICTEXTH__
#define __GTKSTATICTEXTH__
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface
#endif
#pragma interface
#endif
@@
-30,8
+30,6
@@
class wxStaticText;
// global data
//-----------------------------------------------------------------------------
// global data
//-----------------------------------------------------------------------------
-extern const wxChar *wxStaticTextNameStr;
-
//-----------------------------------------------------------------------------
// wxStaticText
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// wxStaticText
//-----------------------------------------------------------------------------
@@
-60,11
+58,13
@@
public:
void SetLabel( const wxString &label );
bool SetFont( const wxFont &font );
void SetLabel( const wxString &label );
bool SetFont( const wxFont &font );
+ bool SetForegroundColour( const wxColour& colour );
+
+ static wxVisualAttributes
+ GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
// implementation
// --------------
// implementation
// --------------
-
- void ApplyWidgetStyle();
protected:
virtual wxSize DoGetBestSize() const;
protected:
virtual wxSize DoGetBestSize() const;