corrected library order to make the sample link

[wxWidgets.git] / include / wx / stattext.h

diff --git a/include/wx/stattext.h b/include/wx/stattext.h
index 8590052f74938221b45eccb6218c4ffaed5ff1ef..cf49abca926933f0f564d7b45e333ad6cc2b539d 100644 (file)
--- a/include/wx/stattext.h
+++ b/include/wx/stattext.h
@@ -1,11 +1,24 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        stattext.h
+// Purpose:     wxStaticText base header
+// Author:      wxWidgets Team
+// Modified by:
+// Created:
+// Copyright:   (c) wxWidgets Team
+// RCS-ID:      $Id$
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+

 #ifndef _WX_STATTEXT_H_BASE_
 #define _WX_STATTEXT_H_BASE_
 
 #ifndef _WX_STATTEXT_H_BASE_
 #define _WX_STATTEXT_H_BASE_
 

+#include "wx/defs.h"
+

 #if wxUSE_STATTEXT
 
 #include "wx/control.h"
 
 #if wxUSE_STATTEXT
 
 #include "wx/control.h"
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxStaticTextNameStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxStaticTextNameStr;

 
 class WXDLLEXPORT wxStaticTextBase : public wxControl
 {
 
 class WXDLLEXPORT wxStaticTextBase : public wxControl
 {


@@ -14,8 +27,7 @@ public:
 
     // overriden base virtuals
     virtual bool AcceptsFocus() const { return false; }
 
     // overriden base virtuals
     virtual bool AcceptsFocus() const { return false; }

-    virtual void ApplyParentThemeBackground(const wxColour& bg)
-        { SetBackgroundColour(bg); }
+    virtual bool HasTransparentBackground() { return true; }

 
 private:
     DECLARE_NO_COPY_CLASS(wxStaticTextBase)
 
 private:
     DECLARE_NO_COPY_CLASS(wxStaticTextBase)


@@ -35,6 +47,8 @@ private:
     #include "wx/cocoa/stattext.h"
 #elif defined(__WXPM__)
     #include "wx/os2/stattext.h"
     #include "wx/cocoa/stattext.h"
 #elif defined(__WXPM__)
     #include "wx/os2/stattext.h"

+#elif defined(__WXPALMOS__)
+    #include "wx/palmos/stattext.h"

 #endif
 
 #endif // wxUSE_STATTEXT
 #endif
 
 #endif // wxUSE_STATTEXT