Remove unnecessary header dependencies. Fix resulting compilation
problems for wxMSW, wxGTK, wxMotif, wxX11 and wxMac in default configuration. Non-default configurations will probably need some more fixes. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19172 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -17,8 +17,6 @@
|
||||
#pragma interface "fontenum.h"
|
||||
#endif
|
||||
|
||||
#include "wx/font.h"
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxFontEnumerator enumerates all available fonts on the system or only the
|
||||
// fonts with given attributes
|
||||
|
@@ -20,13 +20,10 @@
|
||||
#pragma interface "gdicmn.h"
|
||||
#endif
|
||||
|
||||
#include "wx/object.h"
|
||||
#include "wx/list.h"
|
||||
#include "wx/hash.h"
|
||||
#include "wx/string.h"
|
||||
#include "wx/setup.h"
|
||||
#include "wx/colour.h"
|
||||
#include "wx/font.h"
|
||||
#include "wx/list.h"
|
||||
#include "wx/string.h"
|
||||
#include "wx/fontenc.h"
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// forward declarations
|
||||
|
@@ -18,7 +18,9 @@
|
||||
#include "wx/object.h"
|
||||
#include "wx/string.h"
|
||||
#include "wx/gdicmn.h"
|
||||
#include "wx/bitmap.h"
|
||||
#if WXWIN_COMPATIBILITY_2_2
|
||||
# include "wx/bitmap.h"
|
||||
#endif
|
||||
#include "wx/hashmap.h"
|
||||
|
||||
#if wxUSE_STREAMS
|
||||
@@ -35,6 +37,7 @@
|
||||
|
||||
class WXDLLEXPORT wxImageHandler;
|
||||
class WXDLLEXPORT wxImage;
|
||||
class WXDLLEXPORT wxPalette;
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxImageHandler
|
||||
|
@@ -20,6 +20,8 @@
|
||||
// ----------------------------------------------------------------------------
|
||||
// simple types
|
||||
// ----------------------------------------------------------------------------
|
||||
#include "wx/dynarray.h"
|
||||
|
||||
|
||||
#if wxUSE_OWNER_DRAWN
|
||||
class WXDLLEXPORT wxOwnerDrawn;
|
||||
|
@@ -19,6 +19,7 @@
|
||||
#include "wx/gdicmn.h"
|
||||
#include "wx/gdiobj.h"
|
||||
#include "wx/bitmap.h"
|
||||
#include "wx/colour.h"
|
||||
|
||||
class WXDLLEXPORT wxBrush;
|
||||
|
||||
|
@@ -18,6 +18,7 @@
|
||||
|
||||
#include "wx/gdiobj.h"
|
||||
#include "wx/bitmap.h"
|
||||
#include "wx/colour.h"
|
||||
|
||||
typedef WXDWORD wxMSWDash;
|
||||
|
||||
|
@@ -213,6 +213,7 @@ extern LONG APIENTRY _EXPORT
|
||||
#if wxUSE_GUI
|
||||
|
||||
#include <wx/gdicmn.h>
|
||||
#include <wx/colour.h>
|
||||
|
||||
// make conversion from wxColour and COLORREF a bit less painful
|
||||
inline COLORREF wxColourToRGB(const wxColour& c)
|
||||
|
@@ -21,6 +21,7 @@
|
||||
#if wxUSE_STATUSBAR
|
||||
|
||||
#include "wx/list.h"
|
||||
#include "wx/dynarray.h"
|
||||
|
||||
WX_DECLARE_LIST(wxString, wxListString);
|
||||
|
||||
|
@@ -24,6 +24,7 @@
|
||||
|
||||
#include "wx/window.h" // for wxClientData
|
||||
#include "wx/event.h"
|
||||
#include "wx/dynarray.h"
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxTreeItemId identifies an element of the tree. In this implementation, it's
|
||||
|
@@ -17,6 +17,7 @@
|
||||
#endif
|
||||
|
||||
#include "wx/scrolwin.h" // for wxScrollHelper
|
||||
#include "wx/dynarray.h"
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// the actions supported by this control
|
||||
|
@@ -33,7 +33,6 @@
|
||||
#include "wx/validate.h" // for wxDefaultValidator (always include it)
|
||||
|
||||
#if wxUSE_PALETTE
|
||||
#include "wx/dcclient.h"
|
||||
#include "wx/palette.h"
|
||||
#endif // wxUSE_PALETTE
|
||||
|
||||
|
Reference in New Issue
Block a user