Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compilation fix for include wx/generic/stattextg.h before/without including wx/stattext.h in PCH-less wxUniv build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-10-17 12:02:47 +00:00
parent 11339a3884
commit bce49490f6
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/generic/stattextg.h
View File

@@ -3,7 +3,7 @@
// Purpose: wxGenericStaticText header // Purpose: wxGenericStaticText header
// Author: Marcin Wojdyr // Author: Marcin Wojdyr
// Created: 2008-06-26 // Created: 2008-06-26
// Id: $Id:$ // Id: $Id$
// Copyright: Marcin Wojdyr // Copyright: Marcin Wojdyr
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
@@ -11,7 +11,13 @@
#ifndef _WX_GENERIC_STATTEXTG_H_ #ifndef _WX_GENERIC_STATTEXTG_H_
#define _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" #include "wx/stattext.h"
#undef wxNO_PORT_STATTEXT_INCLUDE
class WXDLLIMPEXP_CORE wxGenericStaticText : public wxStaticTextBase class WXDLLIMPEXP_CORE wxGenericStaticText : public wxStaticTextBase
{ {

8
include/wx/stattext.h
View File

@@ -100,6 +100,9 @@ private:
DECLARE_NO_COPY_CLASS(wxStaticTextBase) DECLARE_NO_COPY_CLASS(wxStaticTextBase)
}; };
// see wx/generic/stattextg.h for the explanation
#ifndef wxNO_PORT_STATTEXT_INCLUDE
#if defined(__WXUNIVERSAL__) #if defined(__WXUNIVERSAL__)
#include "wx/univ/stattext.h" #include "wx/univ/stattext.h"
#elif defined(__WXMSW__) #elif defined(__WXMSW__)
@@ -120,7 +123,8 @@ private:
#include "wx/palmos/stattext.h" #include "wx/palmos/stattext.h"
#endif #endif
#endif // !wxNO_PORT_STATTEXT_INCLUDE
#endif // wxUSE_STATTEXT #endif // wxUSE_STATTEXT
#endif #endif // _WX_STATTEXT_H_BASE_
// _WX_STATTEXT_H_BASE_