From bce49490f66910767d8a3dd7ea5ebafc5f40005b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 17 Oct 2008 12:02:47 +0000
Subject: [PATCH] compilation fix for include wx/generic/stattextg.h
 before/without including wx/stattext.h in PCH-less wxUniv build

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/generic/stattextg.h | 8 +++++++-
 include/wx/stattext.h          | 8 ++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/include/wx/generic/stattextg.h b/include/wx/generic/stattextg.h
index 69ef8b08f6..ef225e12b2 100644
--- a/include/wx/generic/stattextg.h
+++ b/include/wx/generic/stattextg.h
@@ -3,7 +3,7 @@
 // Purpose:     wxGenericStaticText header
 // Author:      Marcin Wojdyr
 // Created:     2008-06-26
-// Id:          $Id:$
+// Id:          $Id$
 // Copyright:   Marcin Wojdyr
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -11,7 +11,13 @@
 #ifndef _WX_GENERIC_STATTEXTG_H_
 #define _WX_GENERIC_STATTEXTG_H_
 
+// prevent it from including the platform-specific wxStaticText declaration as
+// this is not going to compile if it derives from wxGenericStaticText defined
+// below (currently this is only the case in wxUniv but it could also happen
+// with other ports)
+#define wxNO_PORT_STATTEXT_INCLUDE
 #include "wx/stattext.h"
+#undef wxNO_PORT_STATTEXT_INCLUDE
 
 class WXDLLIMPEXP_CORE wxGenericStaticText : public wxStaticTextBase
 {
diff --git a/include/wx/stattext.h b/include/wx/stattext.h
index d23d88d4c1..1aef30c9a4 100644
--- a/include/wx/stattext.h
+++ b/include/wx/stattext.h
@@ -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__)
@@ -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_
-- 
2.45.2