Fix wxPropertyGrid headers so they can be compiled independently

See #18465
This commit is contained in:
Paul Cornett
2019-08-15 17:27:07 -07:00
parent 6549d4c3c5
commit b200c661ed
11 changed files with 51 additions and 27 deletions

View File

@@ -11,6 +11,8 @@
#ifndef _WX_PROPGRID_ADVPROPS_H_ #ifndef _WX_PROPGRID_ADVPROPS_H_
#define _WX_PROPGRID_ADVPROPS_H_ #define _WX_PROPGRID_ADVPROPS_H_
#include "wx/defs.h"
#if wxUSE_PROPGRID #if wxUSE_PROPGRID
#include "wx/propgrid/props.h" #include "wx/propgrid/props.h"

View File

@@ -11,8 +11,12 @@
#ifndef _WX_PROPGRID_EDITORS_H_ #ifndef _WX_PROPGRID_EDITORS_H_
#define _WX_PROPGRID_EDITORS_H_ #define _WX_PROPGRID_EDITORS_H_
#include "wx/defs.h"
#if wxUSE_PROPGRID #if wxUSE_PROPGRID
#include "wx/window.h"
class WXDLLIMPEXP_FWD_PROPGRID wxPGCell; class WXDLLIMPEXP_FWD_PROPGRID wxPGCell;
class WXDLLIMPEXP_FWD_PROPGRID wxPGProperty; class WXDLLIMPEXP_FWD_PROPGRID wxPGProperty;
class WXDLLIMPEXP_FWD_PROPGRID wxPropertyGrid; class WXDLLIMPEXP_FWD_PROPGRID wxPropertyGrid;

View File

@@ -11,6 +11,8 @@
#ifndef _WX_PROPGRID_MANAGER_H_ #ifndef _WX_PROPGRID_MANAGER_H_
#define _WX_PROPGRID_MANAGER_H_ #define _WX_PROPGRID_MANAGER_H_
#include "wx/defs.h"
#if wxUSE_PROPGRID #if wxUSE_PROPGRID
#include "wx/propgrid/propgrid.h" #include "wx/propgrid/propgrid.h"
@@ -151,12 +153,12 @@ private:
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
#if wxUSE_TOOLBAR #if wxUSE_TOOLBAR
class wxToolBar; class WXDLLIMPEXP_FWD_CORE wxToolBar;
#endif #endif
#if wxUSE_HEADERCTRL #if wxUSE_HEADERCTRL
class wxPGHeaderCtrl; class wxPGHeaderCtrl;
#endif #endif
class wxStaticText; class WXDLLIMPEXP_FWD_CORE wxStaticText;
// wxPropertyGridManager is an efficient multi-page version of wxPropertyGrid, // wxPropertyGridManager is an efficient multi-page version of wxPropertyGrid,
// which can optionally have toolbar for mode and page selection, and help // which can optionally have toolbar for mode and page selection, and help

View File

@@ -11,9 +11,14 @@
#ifndef _WX_PROPGRID_PROPERTY_H_ #ifndef _WX_PROPGRID_PROPERTY_H_
#define _WX_PROPGRID_PROPERTY_H_ #define _WX_PROPGRID_PROPERTY_H_
#include "wx/defs.h"
#if wxUSE_PROPGRID #if wxUSE_PROPGRID
#include "wx/propgrid/propgriddefs.h" #include "wx/propgrid/propgriddefs.h"
#include "wx/bitmap.h"
#include "wx/font.h"
#include "wx/validate.h"
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------

View File

@@ -11,10 +11,10 @@
#ifndef _WX_PROPGRID_PROPGRID_H_ #ifndef _WX_PROPGRID_PROPGRID_H_
#define _WX_PROPGRID_PROPGRID_H_ #define _WX_PROPGRID_PROPGRID_H_
#include "wx/defs.h"
#if wxUSE_PROPGRID #if wxUSE_PROPGRID
#include "wx/dc.h"
#include "wx/control.h"
#include "wx/scrolwin.h" #include "wx/scrolwin.h"
#include "wx/recguard.h" #include "wx/recguard.h"
#include "wx/time.h" // needed for wxMilliClock_t #include "wx/time.h" // needed for wxMilliClock_t

View File

@@ -11,15 +11,16 @@
#ifndef _WX_PROPGRID_PROPGRIDDEFS_H_ #ifndef _WX_PROPGRID_PROPGRIDDEFS_H_
#define _WX_PROPGRID_PROPGRIDDEFS_H_ #define _WX_PROPGRID_PROPGRIDDEFS_H_
#include "wx/defs.h"
#if wxUSE_PROPGRID #if wxUSE_PROPGRID
#include "wx/dynarray.h" #include "wx/colour.h"
#include "wx/vector.h"
#include "wx/hashmap.h"
#include "wx/hashset.h" #include "wx/hashset.h"
#include "wx/variant.h"
#include "wx/any.h" class WXDLLIMPEXP_FWD_CORE wxPoint;
#include "wx/longlong.h" class WXDLLIMPEXP_FWD_CORE wxSize;
class WXDLLIMPEXP_FWD_CORE wxFont;
#if wxUSE_STD_CONTAINERS #if wxUSE_STD_CONTAINERS
#include <numeric> #include <numeric>
@@ -193,22 +194,21 @@
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
class wxPGEditor; class WXDLLIMPEXP_FWD_PROPGRID wxPGEditor;
class wxPGProperty; class WXDLLIMPEXP_FWD_PROPGRID wxPGProperty;
class wxPropertyCategory; class WXDLLIMPEXP_FWD_PROPGRID wxPropertyCategory;
class wxPGChoices; class WXDLLIMPEXP_FWD_PROPGRID wxPGChoices;
class wxPropertyGridPageState; class WXDLLIMPEXP_FWD_PROPGRID wxPropertyGridPageState;
class wxPGCell; class WXDLLIMPEXP_FWD_PROPGRID wxPGCell;
class wxPGCellRenderer; class WXDLLIMPEXP_FWD_PROPGRID wxPGCellRenderer;
class wxPGChoiceEntry; class WXDLLIMPEXP_FWD_PROPGRID wxPGChoiceEntry;
class wxPGPropArgCls; class WXDLLIMPEXP_FWD_PROPGRID wxPGPropArgCls;
class wxPropertyGridInterface; class WXDLLIMPEXP_FWD_PROPGRID wxPropertyGridInterface;
class wxPropertyGrid; class WXDLLIMPEXP_FWD_PROPGRID wxPropertyGrid;
class wxPropertyGridEvent; class WXDLLIMPEXP_FWD_PROPGRID wxPropertyGridEvent;
class wxPropertyGridManager; class wxPropertyGridManager;
class wxPGOwnerDrawnComboBox; class WXDLLIMPEXP_FWD_PROPGRID wxPGEditorDialogAdapter;
class wxPGEditorDialogAdapter; class WXDLLIMPEXP_FWD_PROPGRID wxPGValidationInfo;
class wxPGValidationInfo;
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------

View File

@@ -11,6 +11,8 @@
#ifndef __WX_PROPGRID_PROPGRIDIFACE_H__ #ifndef __WX_PROPGRID_PROPGRIDIFACE_H__
#define __WX_PROPGRID_PROPGRIDIFACE_H__ #define __WX_PROPGRID_PROPGRIDIFACE_H__
#include "wx/defs.h"
#if wxUSE_PROPGRID #if wxUSE_PROPGRID
#include "wx/propgrid/property.h" #include "wx/propgrid/property.h"

View File

@@ -11,10 +11,14 @@
#ifndef _WX_PROPGRID_PROPGRIDPAGESTATE_H_ #ifndef _WX_PROPGRID_PROPGRIDPAGESTATE_H_
#define _WX_PROPGRID_PROPGRIDPAGESTATE_H_ #define _WX_PROPGRID_PROPGRIDPAGESTATE_H_
#include "wx/defs.h"
#if wxUSE_PROPGRID #if wxUSE_PROPGRID
#include "wx/propgrid/property.h" #include "wx/propgrid/property.h"
class WXDLLIMPEXP_FWD_CORE wxClientDC;
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
// A return value from wxPropertyGrid::HitTest(), // A return value from wxPropertyGrid::HitTest(),

View File

@@ -11,13 +11,15 @@
#ifndef _WX_PROPGRID_PROPS_H_ #ifndef _WX_PROPGRID_PROPS_H_
#define _WX_PROPGRID_PROPS_H_ #define _WX_PROPGRID_PROPS_H_
#include "wx/defs.h"
#if wxUSE_PROPGRID #if wxUSE_PROPGRID
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
class wxPGArrayEditorDialog; class WXDLLIMPEXP_FWD_PROPGRID wxPGArrayEditorDialog;
#include "wx/propgrid/editors.h" #include "wx/propgrid/property.h"
#include "wx/filename.h" #include "wx/filename.h"
#include "wx/dialog.h" #include "wx/dialog.h"

View File

@@ -18,6 +18,7 @@
#if wxUSE_PROPGRID #if wxUSE_PROPGRID
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/dc.h"
#include "wx/log.h" #include "wx/log.h"
#endif #endif
@@ -27,6 +28,7 @@
#include "wx/propgrid/propgrid.h" #include "wx/propgrid/propgrid.h"
#include "wx/propgrid/property.h" #include "wx/propgrid/property.h"
#include "wx/propgrid/props.h" #include "wx/propgrid/props.h"
#include "wx/propgrid/editors.h"
#if wxPG_USE_RENDERER_NATIVE #if wxPG_USE_RENDERER_NATIVE
#include "wx/renderer.h" #include "wx/renderer.h"

View File

@@ -28,6 +28,7 @@
#include "wx/numformatter.h" #include "wx/numformatter.h"
#include "wx/propgrid/propgrid.h" #include "wx/propgrid/propgrid.h"
#include "wx/propgrid/editors.h"
#include <float.h> #include <float.h>
#include <limits.h> #include <limits.h>