Minor cleanings.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba 2005-11-15 07:40:12 +00:00
parent 41ab357ed9
commit c0089c96ec
8 changed files with 18 additions and 32 deletions

View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: list.h // Name: wx/list.h
// Purpose: wxList, wxStringList classes // Purpose: wxList, wxStringList classes
// Author: Julian Smart // Author: Julian Smart
// Modified by: VZ at 16/11/98: WX_DECLARE_LIST() and typesafe lists added // 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) WX_DECLARE_USER_EXPORTED_LIST(elementtype, listname, usergoo)
// this macro must be inserted in your program after // this macro must be inserted in your program after
// #include <wx/listimpl.cpp> // #include "wx/listimpl.cpp"
#define WX_DEFINE_LIST(name) "don't forget to include listimpl.cpp!" #define WX_DEFINE_LIST(name) "don't forget to include listimpl.cpp!"
#define WX_DEFINE_EXPORTED_LIST(name) WX_DEFINE_LIST(name) #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) WX_DECLARE_LIST_PTR_2(elementtype, listname, wx##listname##Node, class usergoo)
// this macro must be inserted in your program after // this macro must be inserted in your program after
// #include <wx/listimpl.cpp> // #include "wx/listimpl.cpp"
#define WX_DEFINE_LIST(name) "don't forget to include listimpl.cpp!" #define WX_DEFINE_LIST(name) "don't forget to include listimpl.cpp!"
#define WX_DEFINE_EXPORTED_LIST(name) WX_DEFINE_LIST(name) #define WX_DEFINE_EXPORTED_LIST(name) WX_DEFINE_LIST(name)
@ -1236,5 +1236,4 @@ public:
(list).clear(); \ (list).clear(); \
} }
#endif #endif // _WX_LISTH__
// _WX_LISTH__

View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: font.h // Name: wx/msw/font.h
// Purpose: wxFont class // Purpose: wxFont class
// Author: Julian Smart // Author: Julian Smart
// Modified by: // Modified by:
@ -12,7 +12,7 @@
#ifndef _WX_FONT_H_ #ifndef _WX_FONT_H_
#define _WX_FONT_H_ #define _WX_FONT_H_
#include <wx/gdicmn.h> #include "wx/gdicmn.h"
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxFont // wxFont
@ -154,5 +154,4 @@ private:
DECLARE_DYNAMIC_CLASS(wxFont) DECLARE_DYNAMIC_CLASS(wxFont)
}; };
#endif #endif // _WX_FONT_H_
// _WX_FONT_H_

View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: private.h // Name: wx/msw/private.h
// Purpose: Private declarations: as this header is only included by // Purpose: Private declarations: as this header is only included by
// wxWidgets itself, it may contain identifiers which don't start // wxWidgets itself, it may contain identifiers which don't start
// with "wx". // with "wx".
@ -210,8 +210,8 @@ struct WinStruct : public T
#if wxUSE_GUI #if wxUSE_GUI
#include <wx/gdicmn.h> #include "wx/gdicmn.h"
#include <wx/colour.h> #include "wx/colour.h"
// make conversion from wxColour and COLORREF a bit less painful // make conversion from wxColour and COLORREF a bit less painful
inline COLORREF wxColourToRGB(const wxColour& c) inline COLORREF wxColourToRGB(const wxColour& c)

View File

@ -34,15 +34,6 @@ class WXDLLIMPEXP_BASE wxObject;
// conditional compilation // conditional compilation
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// this shouldn't be needed any longer as <wx/msw/private.h> 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 wxClassInfo;
class WXDLLIMPEXP_BASE wxHashTable; class WXDLLIMPEXP_BASE wxHashTable;
class WXDLLIMPEXP_BASE wxObjectRefData; class WXDLLIMPEXP_BASE wxObjectRefData;
@ -581,5 +572,4 @@ private :
#include "wx/msw/msvcrt.h" #include "wx/msw/msvcrt.h"
#endif #endif
#endif // _WX_OBJECTH__ #endif // _WX_OBJECTH__

View File

@ -20,7 +20,7 @@
class WXDLLEXPORT wxOwnerDrawn; class WXDLLEXPORT wxOwnerDrawn;
// define the array of list box items // define the array of list box items
#include <wx/dynarray.h> #include "wx/dynarray.h"
WX_DEFINE_EXPORTED_ARRAY_PTR(wxOwnerDrawn *, wxListBoxItemsArray); WX_DEFINE_EXPORTED_ARRAY_PTR(wxOwnerDrawn *, wxListBoxItemsArray);
#endif // wxUSE_OWNER_DRAWN #endif // wxUSE_OWNER_DRAWN
@ -173,5 +173,4 @@ private:
DECLARE_DYNAMIC_CLASS(wxListBox) DECLARE_DYNAMIC_CLASS(wxListBox)
}; // end of wxListBox }; // end of wxListBox
#endif #endif // _WX_LISTBOX_H_
// _WX_LISTBOX_H_

View File

@ -12,7 +12,7 @@
#ifndef _WX_FONT_H_ #ifndef _WX_FONT_H_
#define _WX_FONT_H_ #define _WX_FONT_H_
#include <wx/gdicmn.h> #include "wx/gdicmn.h"
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxFont // wxFont
@ -146,5 +146,4 @@ private:
DECLARE_DYNAMIC_CLASS(wxFont) DECLARE_DYNAMIC_CLASS(wxFont)
}; };
#endif #endif // _WX_FONT_H_
// _WX_FONT_H_

View File

@ -36,7 +36,7 @@
#ifdef WX_PRECOMP #ifdef WX_PRECOMP
// include <wx/wxchar.h> first to ensure that UNICODE macro is correctly set // include "wx/wxchar.h" first to ensure that UNICODE macro is correctly set
// _before_ including <windows.h> // _before_ including <windows.h>
#include "wx/wxchar.h" #include "wx/wxchar.h"

View File

@ -689,7 +689,7 @@ private :
wxString m_name ; wxString m_name ;
} ; } ;
#include <wx/dynarray.h> #include "wx/dynarray.h"
WX_DECLARE_OBJARRAY_WITH_DECL(wxxVariant, wxxVariantArray, class WXDLLIMPEXP_BASE); WX_DECLARE_OBJARRAY_WITH_DECL(wxxVariant, wxxVariantArray, class WXDLLIMPEXP_BASE);
@ -2076,4 +2076,4 @@ template<typename collection_t> void wxArrayCollectionToVariantArray( const coll
} }
#endif #endif // _WX_XTIH__