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

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