fix for wxBitmapType definition problem

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

diff --git a/include/wx/stattext.h b/include/wx/stattext.h
index 0346783aaf7aac73bbc1743f7a637c91053da4c2..0f29f9834b4b7f92edc18291626f087ebf2ca059 100644 (file)
--- a/include/wx/stattext.h
+++ b/include/wx/stattext.h
@@ -1,15 +1,38 @@
-#ifndef __STATTEXTH_BASE__
-#define __STATTEXTH_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"
+
+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/xt/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__)
+    #include "wx/mac/stattext.h"
+#elif defined(__WXPM__)
+    #include "wx/os2/stattext.h"
+#elif defined(__WXSTUBS__)
+    #include "wx/stubs/stattext.h"

 #endif
 
 #endif
 

+#endif // wxUSE_STATTEXT
+

 #endif
 #endif

-    // __STATTEXTH_BASE__
+    // _WX_STATTEXT_H_BASE_