Layout fixes due to measuring with the wrong font. Also added

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

diff --git a/include/wx/stattext.h b/include/wx/stattext.h
index 0c30862324ef3db05b64878b9753dde8d8adca18..8590052f74938221b45eccb6218c4ffaed5ff1ef 100644 (file)
--- a/include/wx/stattext.h
+++ b/include/wx/stattext.h
@@ -1,13 +1,43 @@
-#ifndef __STATTEXTH_BASE__
-#define __STATTEXTH_BASE_
-
-#if defined(__WINDOWS__)
-#include "wx/msw/stattext.h"
-#elif defined(__MOTIF__)
-#include "wx/xt/stattext.h"
-#elif defined(__GTK__)
-#include "wx/gtk/stattext.h"
+#ifndef _WX_STATTEXT_H_BASE_
+#define _WX_STATTEXT_H_BASE_
+
+#if wxUSE_STATTEXT
+
+#include "wx/control.h"
+
+WXDLLEXPORT_DATA(extern const wxChar*) wxStaticTextNameStr;
+
+class WXDLLEXPORT wxStaticTextBase : public wxControl
+{
+public:
+    wxStaticTextBase() { }
+
+    // overriden base virtuals
+    virtual bool AcceptsFocus() const { return false; }
+    virtual void ApplyParentThemeBackground(const wxColour& bg)
+        { SetBackgroundColour(bg); }
+
+private:
+    DECLARE_NO_COPY_CLASS(wxStaticTextBase)
+};
+
+#if defined(__WXUNIVERSAL__)
+    #include "wx/univ/stattext.h"
+#elif defined(__WXMSW__)
+    #include "wx/msw/stattext.h"
+#elif defined(__WXMOTIF__)
+    #include "wx/motif/stattext.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk/stattext.h"
+#elif defined(__WXMAC__)
+    #include "wx/mac/stattext.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/stattext.h"
+#elif defined(__WXPM__)
+    #include "wx/os2/stattext.h"

 #endif
 
 #endif
 

+#endif // wxUSE_STATTEXT
+

 #endif
 #endif

-    // __STATTEXTH_BASE__
+    // _WX_STATTEXT_H_BASE_