switching away from angle brackets includes, deactivating OSX workaround

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56109 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2008-10-06 10:41:40 +00:00
parent f55d9f749b
commit 3b211af168
8 changed files with 37 additions and 36 deletions

View File

@@ -51,15 +51,15 @@
#define __wxPG_SOURCE_FILE__ #define __wxPG_SOURCE_FILE__
#include <wx/propgrid/propgrid.h> #include "wx/propgrid/propgrid.h"
#if wxPG_INCLUDE_ADVPROPS #if wxPG_INCLUDE_ADVPROPS
#include <wx/propgrid/advprops.h> #include "wx/propgrid/advprops.h"
#ifdef __WXMSW__ #ifdef __WXMSW__
#include <wx/msw/private.h> #include "wx/msw/private.h"
#include <wx/msw/dc.h> #include "wx/msw/dc.h"
#endif #endif
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
@@ -281,8 +281,8 @@ bool wxPGSpinCtrlEditor::OnEvent( wxPropertyGrid* propgrid, wxPGProperty* proper
#if wxUSE_DATEPICKCTRL #if wxUSE_DATEPICKCTRL
#include <wx/datectrl.h> #include "wx/datectrl.h"
#include <wx/dateevt.h> #include "wx/dateevt.h"
class wxPGDatePickerCtrlEditor : public wxPGEditor class wxPGDatePickerCtrlEditor : public wxPGEditor
{ {
@@ -395,8 +395,8 @@ void wxPGDatePickerCtrlEditor::SetValueToUnspecified( wxPGProperty* WXUNUSED(pro
// wxFontProperty // wxFontProperty
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
#include <wx/fontdlg.h> #include "wx/fontdlg.h"
#include <wx/fontenum.h> #include "wx/fontenum.h"
static const wxChar* gs_fp_es_family_labels[] = { static const wxChar* gs_fp_es_family_labels[] = {
wxT("Default"), wxT("Decorative"), wxT("Default"), wxT("Decorative"),
@@ -665,7 +665,7 @@ void wxFontProperty::OnCustomPaint(wxDC& dc,
// wxEnumProperty based classes cannot use wxPG_PROP_CLASS_SPECIFIC_1 // wxEnumProperty based classes cannot use wxPG_PROP_CLASS_SPECIFIC_1
#define wxPG_PROP_HIDE_CUSTOM_COLOUR wxPG_PROP_CLASS_SPECIFIC_2 #define wxPG_PROP_HIDE_CUSTOM_COLOUR wxPG_PROP_CLASS_SPECIFIC_2
#include <wx/colordlg.h> #include "wx/colordlg.h"
//#define wx_cp_es_syscolours_len 25 //#define wx_cp_es_syscolours_len 25
static const wxChar* gs_cp_es_syscolour_labels[] = { static const wxChar* gs_cp_es_syscolour_labels[] = {
@@ -1635,7 +1635,7 @@ void wxImageFileProperty::OnCustomPaint( wxDC& dc,
#if wxUSE_CHOICEDLG #if wxUSE_CHOICEDLG
#include <wx/choicdlg.h> #include "wx/choicdlg.h"
WX_PG_IMPLEMENT_PROPERTY_CLASS(wxMultiChoiceProperty,wxPGProperty, WX_PG_IMPLEMENT_PROPERTY_CLASS(wxMultiChoiceProperty,wxPGProperty,
wxArrayInt,const wxArrayInt&,TextCtrlAndButton) wxArrayInt,const wxArrayInt&,TextCtrlAndButton)

View File

@@ -58,12 +58,12 @@
// This define is necessary to prevent macro clearing // This define is necessary to prevent macro clearing
#define __wxPG_SOURCE_FILE__ #define __wxPG_SOURCE_FILE__
#include <wx/propgrid/propgrid.h> #include "wx/propgrid/propgrid.h"
#include <wx/propgrid/editors.h> #include "wx/propgrid/editors.h"
#include <wx/propgrid/props.h> #include "wx/propgrid/props.h"
#if wxPG_USE_RENDERER_NATIVE #if wxPG_USE_RENDERER_NATIVE
#include <wx/renderer.h> #include "wx/renderer.h"
#endif #endif
// How many pixels between textctrl and button // How many pixels between textctrl and button
@@ -75,10 +75,10 @@
#define wxPG_BUTTON_SIZEDEC 0 #define wxPG_BUTTON_SIZEDEC 0
#include <wx/odcombo.h> #include "wx/odcombo.h"
#ifdef __WXMSW__ #ifdef __WXMSW__
#include <wx/msw/private.h> #include "wx/msw/private.h"
#endif #endif
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------

View File

@@ -41,9 +41,9 @@
// This define is necessary to prevent macro clearing // This define is necessary to prevent macro clearing
#define __wxPG_SOURCE_FILE__ #define __wxPG_SOURCE_FILE__
#include <wx/propgrid/propgrid.h> #include "wx/propgrid/propgrid.h"
#include <wx/propgrid/manager.h> #include "wx/propgrid/manager.h"
#define wxPG_MAN_ALTERNATE_BASE_ID 11249 // Needed for wxID_ANY madnesss #define wxPG_MAN_ALTERNATE_BASE_ID 11249 // Needed for wxID_ANY madnesss

View File

@@ -35,7 +35,7 @@
#include "wx/intl.h" #include "wx/intl.h"
#endif #endif
#include <wx/propgrid/propgrid.h> #include "wx/propgrid/propgrid.h"
#define PWC_CHILD_SUMMARY_LIMIT 16 // Maximum number of children summarized in a parent property's #define PWC_CHILD_SUMMARY_LIMIT 16 // Maximum number of children summarized in a parent property's

View File

@@ -52,22 +52,22 @@
// This define is necessary to prevent macro clearing // This define is necessary to prevent macro clearing
#define __wxPG_SOURCE_FILE__ #define __wxPG_SOURCE_FILE__
#include <wx/propgrid/propgrid.h> #include "wx/propgrid/propgrid.h"
#include <wx/propgrid/editors.h> #include "wx/propgrid/editors.h"
#if wxPG_USE_RENDERER_NATIVE #if wxPG_USE_RENDERER_NATIVE
#include <wx/renderer.h> #include "wx/renderer.h"
#endif #endif
#include <wx/odcombo.h> #include "wx/odcombo.h"
#include "wx/timer.h" #include "wx/timer.h"
#include "wx/dcbuffer.h" #include "wx/dcbuffer.h"
#include <wx/clipbrd.h> #include "wx/clipbrd.h"
#include <wx/dataobj.h> #include "wx/dataobj.h"
#ifdef __WXMSW__ #ifdef __WXMSW__
#include <wx/msw/private.h> #include "wx/msw/private.h"
#endif #endif
// Two pics for the expand / collapse buttons. // Two pics for the expand / collapse buttons.
@@ -140,7 +140,7 @@ const wxChar *wxPropertyGridNameStr = wxT("wxPropertyGrid");
// Statics in one class for easy destruction. // Statics in one class for easy destruction.
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
#include <wx/module.h> #include "wx/module.h"
class wxPGGlobalVarsClassManager : public wxModule class wxPGGlobalVarsClassManager : public wxModule
{ {
@@ -1174,7 +1174,8 @@ bool wxPropertyGrid::SetFont( const wxFont& font )
// TODO: Following code is disabled with wxMac because // TODO: Following code is disabled with wxMac because
// it is reported to fail. I (JMS) cannot debug it // it is reported to fail. I (JMS) cannot debug it
// personally right now. // personally right now.
#if !defined(__WXMAC__) // CS: should be fixed now, leaving old code in just in case, TODO: REMOVE
#if 1 // !defined(__WXMAC__)
bool res = wxScrolledWindow::SetFont( font ); bool res = wxScrolledWindow::SetFont( font );
if ( res ) if ( res )
{ {

View File

@@ -37,8 +37,8 @@
#include "wx/intl.h" #include "wx/intl.h"
#endif #endif
#include <wx/propgrid/property.h> #include "wx/propgrid/property.h"
#include <wx/propgrid/propgrid.h> #include "wx/propgrid/propgrid.h"
const wxChar *wxPGTypeName_long = wxT("long"); const wxChar *wxPGTypeName_long = wxT("long");

View File

@@ -38,9 +38,9 @@
// This define is necessary to prevent macro clearing // This define is necessary to prevent macro clearing
#define __wxPG_SOURCE_FILE__ #define __wxPG_SOURCE_FILE__
#include <wx/propgrid/propgridpagestate.h> #include "wx/propgrid/propgridpagestate.h"
#include <wx/propgrid/propgrid.h> #include "wx/propgrid/propgrid.h"
#include <wx/propgrid/editors.h> #include "wx/propgrid/editors.h"
#define wxPG_DEFAULT_SPLITTERX 110 #define wxPG_DEFAULT_SPLITTERX 110

View File

@@ -49,9 +49,9 @@
#include "wx/intl.h" #include "wx/intl.h"
#endif #endif
#include <wx/filename.h> #include "wx/filename.h"
#include <wx/propgrid/propgrid.h> #include "wx/propgrid/propgrid.h"
#define wxPG_CUSTOM_IMAGE_WIDTH 20 // for wxColourProperty etc. #define wxPG_CUSTOM_IMAGE_WIDTH 20 // for wxColourProperty etc.
@@ -1997,7 +1997,7 @@ END_EVENT_TABLE()
IMPLEMENT_ABSTRACT_CLASS(wxArrayEditorDialog, wxDialog) IMPLEMENT_ABSTRACT_CLASS(wxArrayEditorDialog, wxDialog)
#include <wx/statline.h> #include "wx/statline.h"
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------