From: Jaakko Salli Date: Wed, 17 Sep 2008 15:00:00 +0000 (+0000) Subject: wxUSE_PROPGRID is now recognized by source and header files X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f4bc1aa27cb33f679d7e9c1518a7855bbc1fa471 wxUSE_PROPGRID is now recognized by source and header files git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/propgrid/advprops.h b/include/wx/propgrid/advprops.h index 29c5b615cf..a3fb60dd83 100644 --- a/include/wx/propgrid/advprops.h +++ b/include/wx/propgrid/advprops.h @@ -12,6 +12,8 @@ #ifndef _WX_PROPGRID_ADVPROPS_H_ #define _WX_PROPGRID_ADVPROPS_H_ +#if wxUSE_PROPGRID + #include "wx/propgrid/props.h" // ----------------------------------------------------------------------- @@ -507,4 +509,6 @@ private: // ----------------------------------------------------------------------- +#endif // wxUSE_PROPGRID + #endif // _WX_PROPGRID_ADVPROPS_H_ diff --git a/include/wx/propgrid/editors.h b/include/wx/propgrid/editors.h index 1fb6a096d7..656cef681e 100644 --- a/include/wx/propgrid/editors.h +++ b/include/wx/propgrid/editors.h @@ -12,6 +12,8 @@ #ifndef _WX_PROPGRID_EDITORS_H_ #define _WX_PROPGRID_EDITORS_H_ +#if wxUSE_PROPGRID + // ----------------------------------------------------------------------- // wxPGWindowList contains list of editor windows returned by CreateControls. @@ -648,4 +650,6 @@ protected: // ----------------------------------------------------------------------- +#endif // wxUSE_PROPGRID + #endif // _WX_PROPGRID_EDITORS_H_ diff --git a/include/wx/propgrid/manager.h b/include/wx/propgrid/manager.h index 2be06936ec..981c00b621 100644 --- a/include/wx/propgrid/manager.h +++ b/include/wx/propgrid/manager.h @@ -12,6 +12,8 @@ #ifndef _WX_PROPGRID_MANAGER_H_ #define _WX_PROPGRID_MANAGER_H_ +#if wxUSE_PROPGRID + #include "wx/propgrid/propgrid.h" #include "wx/dcclient.h" @@ -787,4 +789,6 @@ inline int wxPropertyGridPage::GetIndex() const // ----------------------------------------------------------------------- +#endif // wxUSE_PROPGRID + #endif // _WX_PROPGRID_MANAGER_H_ diff --git a/include/wx/propgrid/property.h b/include/wx/propgrid/property.h index 1986c326bd..c319c2e164 100644 --- a/include/wx/propgrid/property.h +++ b/include/wx/propgrid/property.h @@ -12,6 +12,8 @@ #ifndef _WX_PROPGRID_PROPERTY_H_ #define _WX_PROPGRID_PROPERTY_H_ +#if wxUSE_PROPGRID + #include "wx/propgrid/propgriddefs.h" // ----------------------------------------------------------------------- @@ -2452,4 +2454,6 @@ inline bool wxPGProperty::SetChoices( const wxArrayString& labels, // ----------------------------------------------------------------------- +#endif // wxUSE_PROPGRID + #endif // _WX_PROPGRID_PROPERTY_H_ diff --git a/include/wx/propgrid/propgrid.h b/include/wx/propgrid/propgrid.h index 5fe1b097b6..04cb4d99f2 100644 --- a/include/wx/propgrid/propgrid.h +++ b/include/wx/propgrid/propgrid.h @@ -12,6 +12,8 @@ #ifndef _WX_PROPGRID_PROPGRID_H_ #define _WX_PROPGRID_PROPGRID_H_ +#if wxUSE_PROPGRID + #include "wx/dcclient.h" #include "wx/scrolwin.h" #include "wx/tooltip.h" @@ -2196,5 +2198,7 @@ protected: // ----------------------------------------------------------------------- +#endif + #endif // _WX_PROPGRID_PROPGRID_H_ diff --git a/include/wx/propgrid/propgriddefs.h b/include/wx/propgrid/propgriddefs.h index e5c1236f4b..97cde0852a 100644 --- a/include/wx/propgrid/propgriddefs.h +++ b/include/wx/propgrid/propgriddefs.h @@ -12,6 +12,8 @@ #ifndef _WX_PROPGRID_PROPGRIDDEFS_H_ #define _WX_PROPGRID_PROPGRIDDEFS_H_ +#if wxUSE_PROPGRID + #include "wx/dynarray.h" #include "wx/hashmap.h" #include "wx/variant.h" @@ -710,4 +712,6 @@ protected: // ----------------------------------------------------------------------- +#endif // wxUSE_PROPGRID + #endif // _WX_PROPGRID_PROPGRIDDEFS_H_ diff --git a/include/wx/propgrid/propgridiface.h b/include/wx/propgrid/propgridiface.h index 0617002b2a..60aeb2d72a 100644 --- a/include/wx/propgrid/propgridiface.h +++ b/include/wx/propgrid/propgridiface.h @@ -12,6 +12,8 @@ #ifndef __WX_PROPGRID_PROPGRIDIFACE_H__ #define __WX_PROPGRID_PROPGRIDIFACE_H__ +#if wxUSE_PROPGRID + #include "wx/propgrid/property.h" #include "wx/propgrid/propgridpagestate.h" @@ -1562,4 +1564,6 @@ private: friend class wxPropertyGridManager; }; +#endif // wxUSE_PROPGRID + #endif // __WX_PROPGRID_PROPGRIDIFACE_H__ diff --git a/include/wx/propgrid/propgridpagestate.h b/include/wx/propgrid/propgridpagestate.h index 5ff8ab5f57..279c12d197 100644 --- a/include/wx/propgrid/propgridpagestate.h +++ b/include/wx/propgrid/propgridpagestate.h @@ -12,6 +12,8 @@ #ifndef _WX_PROPGRID_PROPGRIDPAGESTATE_H_ #define _WX_PROPGRID_PROPGRIDPAGESTATE_H_ +#if wxUSE_PROPGRID + #include "wx/propgrid/property.h" // ----------------------------------------------------------------------- @@ -688,5 +690,7 @@ protected: // ----------------------------------------------------------------------- +#endif // wxUSE_PROPGRID + #endif // _WX_PROPGRID_PROPGRIDPAGESTATE_H_ diff --git a/include/wx/propgrid/props.h b/include/wx/propgrid/props.h index b2c23b9ce1..7e4dcb9dd0 100644 --- a/include/wx/propgrid/props.h +++ b/include/wx/propgrid/props.h @@ -12,6 +12,8 @@ #ifndef _WX_PROPGRID_PROPS_H_ #define _WX_PROPGRID_PROPS_H_ +#if wxUSE_PROPGRID + // ----------------------------------------------------------------------- class wxArrayEditorDialog; @@ -1287,4 +1289,6 @@ private: // ----------------------------------------------------------------------- +#endif // wxUSE_PROPGRID + #endif // _WX_PROPGRID_PROPS_H_ diff --git a/samples/propgrid/propgrid.cpp b/samples/propgrid/propgrid.cpp index d226118377..f44d23dab8 100644 --- a/samples/propgrid/propgrid.cpp +++ b/samples/propgrid/propgrid.cpp @@ -45,6 +45,10 @@ #include "wx/wx.h" #endif +#if !wxUSE_PROPGRID + #error "Please set wxUSE_PROPGRID to 1 and rebuild the library." +#endif + #include // ----------------------------------------------------------------------- diff --git a/src/propgrid/advprops.cpp b/src/propgrid/advprops.cpp index 33c4547747..dcc6b98207 100644 --- a/src/propgrid/advprops.cpp +++ b/src/propgrid/advprops.cpp @@ -16,6 +16,8 @@ #pragma hdrstop #endif +#if wxUSE_PROPGRID + #ifndef WX_PRECOMP #include "wx/defs.h" #include "wx/object.h" @@ -2011,4 +2013,7 @@ void wxPropertyGridInterface::RegisterAdditionalEditors() // ----------------------------------------------------------------------- -#endif // wxPG_INCLUDE_ADVPROPS +#endif // wxPG_INCLUDE_ADVPROPS + +#endif // wxUSE_PROPGRID + diff --git a/src/propgrid/editors.cpp b/src/propgrid/editors.cpp index 8394e5caad..fd0a8c663c 100644 --- a/src/propgrid/editors.cpp +++ b/src/propgrid/editors.cpp @@ -16,6 +16,8 @@ #pragma hdrstop #endif +#if wxUSE_PROPGRID + #ifndef WX_PRECOMP #include "wx/defs.h" #include "wx/object.h" @@ -2160,3 +2162,5 @@ void wxPGMultiButton::Add( const wxString& label, int id ) } // ----------------------------------------------------------------------- + +#endif // wxUSE_PROPGRID diff --git a/src/propgrid/manager.cpp b/src/propgrid/manager.cpp index 6d7338d824..5864d13b5e 100644 --- a/src/propgrid/manager.cpp +++ b/src/propgrid/manager.cpp @@ -16,6 +16,8 @@ #pragma hdrstop #endif +#if wxUSE_PROPGRID + #ifndef WX_PRECOMP #include "wx/defs.h" #include "wx/object.h" @@ -1690,3 +1692,5 @@ wxPGVIterator wxPropertyGridManager::GetVIterator( int flags ) const { return wxPGVIterator( new wxPGVIteratorBase_Manager( (wxPropertyGridManager*)this, flags ) ); } + +#endif // wxUSE_PROPGRID diff --git a/src/propgrid/property.cpp b/src/propgrid/property.cpp index 0936589da7..abaa782c13 100644 --- a/src/propgrid/property.cpp +++ b/src/propgrid/property.cpp @@ -16,6 +16,8 @@ #pragma hdrstop #endif +#if wxUSE_PROPGRID + #ifndef WX_PRECOMP #include "wx/defs.h" #include "wx/object.h" @@ -2167,3 +2169,4 @@ void wxPGAttributeStorage::Set( const wxString& name, const wxVariant& value ) m_map[name] = data; } +#endif // wxUSE_PROPGRID diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp index 5418444430..de6cafab9e 100644 --- a/src/propgrid/propgrid.cpp +++ b/src/propgrid/propgrid.cpp @@ -16,6 +16,8 @@ #pragma hdrstop #endif +#if wxUSE_PROPGRID + #ifndef WX_PRECOMP #include "wx/defs.h" #include "wx/object.h" @@ -6300,3 +6302,5 @@ void wxPropertyGridPopulator::ProcessError( const wxString& msg ) } // ----------------------------------------------------------------------- + +#endif // wxUSE_PROPGRID diff --git a/src/propgrid/propgridiface.cpp b/src/propgrid/propgridiface.cpp index 3c21c640cd..8ee1c101dc 100644 --- a/src/propgrid/propgridiface.cpp +++ b/src/propgrid/propgridiface.cpp @@ -16,6 +16,8 @@ #pragma hdrstop #endif +#if wxUSE_PROPGRID + #ifndef WX_PRECOMP #include "wx/defs.h" #include "wx/object.h" @@ -1179,3 +1181,5 @@ bool wxPropertyGridInterface::RestoreEditableState( const wxString& src, int res return res; } +#endif // wxUSE_PROPGRID + diff --git a/src/propgrid/propgridpagestate.cpp b/src/propgrid/propgridpagestate.cpp index 7aaaa2e5fd..3b11fe2c43 100644 --- a/src/propgrid/propgridpagestate.cpp +++ b/src/propgrid/propgridpagestate.cpp @@ -16,6 +16,8 @@ #pragma hdrstop #endif +#if wxUSE_PROPGRID + #ifndef WX_PRECOMP #include "wx/defs.h" #include "wx/object.h" @@ -1878,3 +1880,5 @@ void wxPropertyGridPageState::DoDelete( wxPGProperty* item ) } // ----------------------------------------------------------------------- + +#endif // wxUSE_PROPGRID diff --git a/src/propgrid/props.cpp b/src/propgrid/props.cpp index f0ed6cee7e..b161d8c10d 100644 --- a/src/propgrid/props.cpp +++ b/src/propgrid/props.cpp @@ -16,6 +16,8 @@ #pragma hdrstop #endif +#if wxUSE_PROPGRID + #ifndef WX_PRECOMP #include "wx/defs.h" #include "wx/object.h" @@ -2635,3 +2637,4 @@ bool wxPGInDialogValidator::DoValidate( wxPropertyGrid* WXUNUSED(propGrid), // ----------------------------------------------------------------------- +#endif // wxUSE_PROPGRID