X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dc797d8e1b4ef10be4f5c9cd73151406f459706d..0aa619b53203461ec07541f0ba5ebe4aaf4f7184:/include/wx/stattext.h

diff --git a/include/wx/stattext.h b/include/wx/stattext.h
index 395b19066a..1aef30c9a4 100644
--- a/include/wx/stattext.h
+++ b/include/wx/stattext.h
@@ -29,9 +29,9 @@
 #define wxST_ELLIPSIZE_END         0x0010
 
 
-extern WXDLLEXPORT_DATA(const char) wxStaticTextNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticTextNameStr[];
 
-class WXDLLEXPORT wxStaticTextBase : public wxControl
+class WXDLLIMPEXP_CORE wxStaticTextBase : public wxControl
 {
 public:
     wxStaticTextBase() { }
@@ -100,6 +100,9 @@ private:
     DECLARE_NO_COPY_CLASS(wxStaticTextBase)
 };
 
+// see wx/generic/stattextg.h for the explanation
+#ifndef wxNO_PORT_STATTEXT_INCLUDE
+
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/stattext.h"
 #elif defined(__WXMSW__)
@@ -111,7 +114,7 @@ private:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/stattext.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/stattext.h"
+    #include "wx/osx/stattext.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/stattext.h"
 #elif defined(__WXPM__)
@@ -120,7 +123,8 @@ private:
     #include "wx/palmos/stattext.h"
 #endif
 
+#endif // !wxNO_PORT_STATTEXT_INCLUDE
+
 #endif // wxUSE_STATTEXT
 
-#endif
-    // _WX_STATTEXT_H_BASE_
+#endif // _WX_STATTEXT_H_BASE_