From c0089c96ecb12ae0ad48545337d2e47ce3a9f37a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=C5=82odzimierz=20Skiba?= Date: Tue, 15 Nov 2005 07:40:12 +0000 Subject: [PATCH] Minor cleanings. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/list.h | 9 ++++----- include/wx/msw/font.h | 7 +++---- include/wx/msw/private.h | 6 +++--- include/wx/object.h | 12 +----------- include/wx/os2/listbox.h | 5 ++--- include/wx/palmos/font.h | 5 ++--- include/wx/wxprec.h | 2 +- include/wx/xti.h | 4 ++-- 8 files changed, 18 insertions(+), 32 deletions(-) diff --git a/include/wx/list.h b/include/wx/list.h index b1f5d93a9c..fb597e90aa 100644 --- a/include/wx/list.h +++ b/include/wx/list.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: list.h +// Name: wx/list.h // Purpose: wxList, wxStringList classes // Author: Julian Smart // Modified by: VZ at 16/11/98: WX_DECLARE_LIST() and typesafe lists added @@ -309,7 +309,7 @@ private: WX_DECLARE_USER_EXPORTED_LIST(elementtype, listname, usergoo) // this macro must be inserted in your program after -// #include +// #include "wx/listimpl.cpp" #define WX_DEFINE_LIST(name) "don't forget to include listimpl.cpp!" #define WX_DEFINE_EXPORTED_LIST(name) WX_DEFINE_LIST(name) @@ -1064,7 +1064,7 @@ private: WX_DECLARE_LIST_PTR_2(elementtype, listname, wx##listname##Node, class usergoo) // this macro must be inserted in your program after -// #include +// #include "wx/listimpl.cpp" #define WX_DEFINE_LIST(name) "don't forget to include listimpl.cpp!" #define WX_DEFINE_EXPORTED_LIST(name) WX_DEFINE_LIST(name) @@ -1236,5 +1236,4 @@ public: (list).clear(); \ } -#endif - // _WX_LISTH__ +#endif // _WX_LISTH__ diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h index 249fcf549a..f9ff12304e 100644 --- a/include/wx/msw/font.h +++ b/include/wx/msw/font.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: font.h +// Name: wx/msw/font.h // Purpose: wxFont class // Author: Julian Smart // Modified by: @@ -12,7 +12,7 @@ #ifndef _WX_FONT_H_ #define _WX_FONT_H_ -#include +#include "wx/gdicmn.h" // ---------------------------------------------------------------------------- // wxFont @@ -154,5 +154,4 @@ private: DECLARE_DYNAMIC_CLASS(wxFont) }; -#endif - // _WX_FONT_H_ +#endif // _WX_FONT_H_ diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h index 421a71771e..4fdca8a4d7 100644 --- a/include/wx/msw/private.h +++ b/include/wx/msw/private.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: private.h +// Name: wx/msw/private.h // Purpose: Private declarations: as this header is only included by // wxWidgets itself, it may contain identifiers which don't start // with "wx". @@ -210,8 +210,8 @@ struct WinStruct : public T #if wxUSE_GUI -#include -#include +#include "wx/gdicmn.h" +#include "wx/colour.h" // make conversion from wxColour and COLORREF a bit less painful inline COLORREF wxColourToRGB(const wxColour& c) diff --git a/include/wx/object.h b/include/wx/object.h index 35ff626b4e..d24af71257 100644 --- a/include/wx/object.h +++ b/include/wx/object.h @@ -34,15 +34,6 @@ class WXDLLIMPEXP_BASE wxObject; // conditional compilation // ---------------------------------------------------------------------------- -// this shouldn't be needed any longer as does it but it -// doesn't hurt neither -#ifdef GetClassName -#undef GetClassName -#endif -#ifdef GetClassInfo -#undef GetClassInfo -#endif - class WXDLLIMPEXP_BASE wxClassInfo; class WXDLLIMPEXP_BASE wxHashTable; class WXDLLIMPEXP_BASE wxObjectRefData; @@ -581,5 +572,4 @@ private : #include "wx/msw/msvcrt.h" #endif -#endif // _WX_OBJECTH__ - +#endif // _WX_OBJECTH__ diff --git a/include/wx/os2/listbox.h b/include/wx/os2/listbox.h index 9632105689..4c67ca7fcd 100644 --- a/include/wx/os2/listbox.h +++ b/include/wx/os2/listbox.h @@ -20,7 +20,7 @@ class WXDLLEXPORT wxOwnerDrawn; // define the array of list box items - #include + #include "wx/dynarray.h" WX_DEFINE_EXPORTED_ARRAY_PTR(wxOwnerDrawn *, wxListBoxItemsArray); #endif // wxUSE_OWNER_DRAWN @@ -173,5 +173,4 @@ private: DECLARE_DYNAMIC_CLASS(wxListBox) }; // end of wxListBox -#endif - // _WX_LISTBOX_H_ +#endif // _WX_LISTBOX_H_ diff --git a/include/wx/palmos/font.h b/include/wx/palmos/font.h index 54358ae2e3..3ec690b1e7 100644 --- a/include/wx/palmos/font.h +++ b/include/wx/palmos/font.h @@ -12,7 +12,7 @@ #ifndef _WX_FONT_H_ #define _WX_FONT_H_ -#include +#include "wx/gdicmn.h" // ---------------------------------------------------------------------------- // wxFont @@ -146,5 +146,4 @@ private: DECLARE_DYNAMIC_CLASS(wxFont) }; -#endif - // _WX_FONT_H_ +#endif // _WX_FONT_H_ diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h index 69178254fa..6baf80e6f0 100644 --- a/include/wx/wxprec.h +++ b/include/wx/wxprec.h @@ -36,7 +36,7 @@ #ifdef WX_PRECOMP -// include first to ensure that UNICODE macro is correctly set +// include "wx/wxchar.h" first to ensure that UNICODE macro is correctly set // _before_ including #include "wx/wxchar.h" diff --git a/include/wx/xti.h b/include/wx/xti.h index 881ae54bec..de91e9d8da 100644 --- a/include/wx/xti.h +++ b/include/wx/xti.h @@ -689,7 +689,7 @@ private : wxString m_name ; } ; -#include +#include "wx/dynarray.h" WX_DECLARE_OBJARRAY_WITH_DECL(wxxVariant, wxxVariantArray, class WXDLLIMPEXP_BASE); @@ -2076,4 +2076,4 @@ template void wxArrayCollectionToVariantArray( const coll } -#endif +#endif // _WX_XTIH__