Include order is wxprec.h=>defs.h=>platform.h=>setup.h so remove explicit setup.h inclusion not touched by chckconf.h.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37162 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: metafile.cpp
|
||||
// Name: src/os2/metafile.cpp
|
||||
// Purpose: wxMetaFile, wxMetaFileDC etc. These classes are optional.
|
||||
// Author: David Webster
|
||||
// Modified by:
|
||||
@@ -12,10 +12,6 @@
|
||||
// For compilers that support precompilation, includes "wx.h".
|
||||
#include "wx/wxprec.h"
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx/setup.h"
|
||||
#endif
|
||||
|
||||
#if wxUSE_METAFILE
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
@@ -62,7 +58,7 @@ wxMetafile::wxMetafile(const wxString& file)
|
||||
|
||||
M_METAFILEDATA->m_windowsMappingMode = wxMM_ANISOTROPIC;
|
||||
M_METAFILEDATA->m_metafile = 0;
|
||||
if (!file.IsNull() && (file.Cmp(wxT("")) == 0))
|
||||
if (!file.empty())
|
||||
M_METAFILEDATA->m_metafile = (WXHANDLE)0; // TODO: GetMetaFile(file);
|
||||
}
|
||||
|
||||
@@ -144,7 +140,7 @@ wxMetafileDC::wxMetafileDC(const wxString& file)
|
||||
|
||||
// TODO
|
||||
/*
|
||||
if (!file.IsNull() && (file != wxT("")))
|
||||
if (!file.empty())
|
||||
m_hDC = (WXHDC) CreateMetaFile(file);
|
||||
else
|
||||
m_hDC = (WXHDC) CreateMetaFile(NULL);
|
||||
@@ -170,7 +166,7 @@ wxMetafileDC::wxMetafileDC( const wxString& file,
|
||||
m_minY = 10000;
|
||||
m_maxX = -10000;
|
||||
m_maxY = -10000;
|
||||
if (file != wxT("") && wxFileExists(file))
|
||||
if (!file.empty() && wxFileExists(file))
|
||||
wxRemoveFile(file);
|
||||
|
||||
// m_hDC = (WXHDC) CreateMetaFile(file);
|
||||
|
Reference in New Issue
Block a user