X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/083f7497d34a1df453b92ab411aace3fc4ace927..2d4957f2401a8814f90cda21ef945d99bc74596e:/include/wx/wx.h diff --git a/include/wx/wx.h b/include/wx/wx.h index 4da515ebec..08978f4902 100644 --- a/include/wx/wx.h +++ b/include/wx/wx.h @@ -1,9 +1,6 @@ -#ifndef _WX_WXH__ -#define _WX_WXH__ - ///////////////////////////////////////////////////////////////////////////// -// Name: wx.h -// Purpose: wxWindows main include file +// Name: wx/wx.h +// Purpose: wxWindows central header including the most often used ones // Author: Julian Smart // Modified by: // Created: 01/02/97 @@ -12,6 +9,9 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +#ifndef _WX_WX_H_ +#define _WX_WX_H_ + #include "wx/defs.h" #include "wx/object.h" #include "wx/dynarray.h" @@ -77,8 +77,9 @@ #include "wx/choicdlg.h" #include "wx/textdlg.h" #include "wx/filedlg.h" -#include "wx/treectrl.h" -#include "wx/validate.h" // always include, even if !wxUSE_VALIDATORS + +// always include, even if !wxUSE_VALIDATORS because we need wxDefaultValidator +#include "wx/validate.h" #if wxUSE_VALIDATORS #include "wx/valtext.h" @@ -86,5 +87,5 @@ #endif // wxUSE_GUI -#endif - // _WX_WXH__ +#endif // _WX_WX_H_ +