AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wxUSE_PROPGRID is now recognized by source and header files

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli 2008-09-17 15:00:00 +00:00
parent cfdef19f33
commit f4bc1aa27c
18 changed files with 72 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/propgrid/advprops.h
View File

@ -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_

4
include/wx/propgrid/editors.h
View File

@ -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_

4
include/wx/propgrid/manager.h
View File

@ -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_

4
include/wx/propgrid/property.h
View File

@ -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_

4
include/wx/propgrid/propgrid.h
View File

@ -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_

4
include/wx/propgrid/propgriddefs.h
View File

@ -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_

4
include/wx/propgrid/propgridiface.h
View File

@ -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__

4
include/wx/propgrid/propgridpagestate.h
View File

@ -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_

4
include/wx/propgrid/props.h
View File

@ -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_

4
samples/propgrid/propgrid.cpp
View File

@ -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>
// -----------------------------------------------------------------------

7
src/propgrid/advprops.cpp
View File

@ -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

4
src/propgrid/editors.cpp
View File

@ -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

4
src/propgrid/manager.cpp
View File

@ -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

3
src/propgrid/property.cpp
View File

@ -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

4
src/propgrid/propgrid.cpp
View File

@ -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

4
src/propgrid/propgridiface.cpp
View File

@ -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

4
src/propgrid/propgridpagestate.cpp
View File

@ -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

3
src/propgrid/props.cpp
View File

@ -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