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 29c5b615cfc42c51731417a67c2499bdf3a64f3d..a3fb60dd83226e850b9c8376f4e9243adfcd536f 100644 (file)
--- 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 1fb6a096d7b8df3dfd88d555530e271e75ee87a7..656cef681e1a8b2f44a57bde25cc6e4ef7514b79 100644 (file)
--- 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 2be06936ece813037bf63cede13f5865116ad336..981c00b62181f6ea586ad149db54fb6d2a24d8a5 100644 (file)
--- 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 1986c326bdc8777186a66f55615ee5696a18fde2..c319c2e164a349c8cfe71661731e05369cdd29c9 100644 (file)
--- 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 5fe1b097b6c3dc32a17e9a87646d7e6dfcd144d5..04cb4d99f2212a579489f33a7f6db5b548a0df1f 100644 (file)
--- 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 e5c1236f4b1ed9c1ebd3ffd66a3277215095d137..97cde0852aa6be97f1138b5e26da39815a9e0dfa 100644 (file)
--- 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 0617002b2a092ba51aeee73ea9c4dcbd0783cf50..60aeb2d72a02e414ee375c6ad358d6f572d7b409 100644 (file)
--- 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 5ff8ab5f573039d11639ad917c1eb0148abcbd73..279c12d197371f60242775bee29a5c595f1d8456 100644 (file)
--- 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 b2c23b9ce12135e16c670da83c3bacb5c66de481..7e4dcb9dd09be89730b016dbf4f9f76d6a1196c0 100644 (file)
--- 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 d226118377c332590bba629dcba4fb783c5e4d6a..f44d23dab8ec32303a72d0b0194313f9d009080a 100644 (file)
--- 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 <wx/numdlg.h>
 
 // -----------------------------------------------------------------------

diff --git a/src/propgrid/advprops.cpp b/src/propgrid/advprops.cpp
index 33c4547747e70c614cda95baf27571dc8da483fe..dcc6b982076037441e0f6a80e41c74205789effb 100644 (file)
--- 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 8394e5caad9f07a110bf72209c1fc553b56ff30b..fd0a8c663ca4b9ab05dbe9cb0824f7139b864121 100644 (file)
--- 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 6d7338d824480be78408332b2b73cb65cbbbad8e..5864d13b5eca67e79c6a6f6b4e6eae41269f0f28 100644 (file)
--- 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 0936589da7d5d0ac12dc6482215625884fd3fc0f..abaa782c13ad239b571fd650b7c2a8d3137c5913 100644 (file)
--- 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 5418444430608b22e996e9da27d7587f0cb22285..de6cafab9e35f4d1206efccc39e4ed17ca2f1c88 100644 (file)
--- 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 3c21c640cd63b79c52c3ac23b7563adba18750aa..8ee1c101dcbd587d0224c8ead58934fff3f42440 100644 (file)
--- 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 7aaaa2e5fd4a119a2342ae934c4873409e4988e2..3b11fe2c43b8202349083d17642f941730458c4c 100644 (file)
--- 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 f0ed6cee7ecd6feaf7f02cb7dc5cab6a166838b9..b161d8c10ddede65a70b60e3a2ebc5850bb21385 100644 (file)
--- 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