fixed the last of the off-by-one errors (some are refixed, again...)

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

diff --git a/include/wx/stattext.h b/include/wx/stattext.h
index 48ea950c52faf057b91ce40cdbe86e30439604e5..4df4158dc0a85553d355bfed509f562f4980c9df 100644 (file)
--- a/include/wx/stattext.h
+++ b/include/wx/stattext.h
@@ -1,21 +1,38 @@
 #ifndef _WX_STATTEXT_H_BASE_
 #define _WX_STATTEXT_H_BASE_
 
 #ifndef _WX_STATTEXT_H_BASE_
 #define _WX_STATTEXT_H_BASE_
 

-#if defined(__WXMSW__)
-#include "wx/msw/stattext.h"
+#if wxUSE_STATTEXT
+
+#include "wx/control.h"
+
+WXDLLEXPORT_DATA(extern const wxChar*) wxStaticTextNameStr;
+
+class WXDLLEXPORT wxStaticTextBase : public wxControl
+{
+public:
+    // overriden base class virtuals
+    virtual bool AcceptsFocus() const { return FALSE; }
+};
+
+#if defined(__WXUNIVERSAL__)
+    #include "wx/univ/stattext.h"
+#elif defined(__WXMSW__)
+    #include "wx/msw/stattext.h"

 #elif defined(__WXMOTIF__)
 #elif defined(__WXMOTIF__)

-#include "wx/motif/stattext.h"
+    #include "wx/motif/stattext.h"

 #elif defined(__WXGTK__)
 #elif defined(__WXGTK__)

-#include "wx/gtk/stattext.h"
+    #include "wx/gtk/stattext.h"

 #elif defined(__WXQT__)
 #elif defined(__WXQT__)

-#include "wx/qt/stattext.h"
+    #include "wx/qt/stattext.h"

 #elif defined(__WXMAC__)
 #elif defined(__WXMAC__)

-#include "wx/mac/stattext.h"
+    #include "wx/mac/stattext.h"

 #elif defined(__WXPM__)
 #elif defined(__WXPM__)

-#include "wx/os2/stattext.h"
+    #include "wx/os2/stattext.h"

 #elif defined(__WXSTUBS__)
 #elif defined(__WXSTUBS__)

-#include "wx/stubs/stattext.h"
+    #include "wx/stubs/stattext.h"

 #endif
 
 #endif
 

+#endif // wxUSE_STATTEXT
+

 #endif
     // _WX_STATTEXT_H_BASE_
 #endif
     // _WX_STATTEXT_H_BASE_