Minor cleanings.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/list.h b/include/wx/list.h
index b1f5d93a9c5e434cb99560ba16f1fae563302a77..fb597e90aad579fea0852d98b53d1dea290d937f 100644 (file)
--- 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 <wx/listimpl.cpp>
+//      #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 <wx/listimpl.cpp>
+//      #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 249fcf549ae46c9ec5be5444fdf8de5ec2816399..f9ff12304e20fcf206e8ebb87a74c07119fc9ce2 100644 (file)
--- 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 <wx/gdicmn.h>
+#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 421a71771e56aa98a53fae9f1164e85f0640f45c..4fdca8a4d7157cc9f464b56ff3c1ed137d827563 100644 (file)
--- 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 <wx/gdicmn.h>
-#include <wx/colour.h>
+#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 35ff626b4e3cf67a245543d54aedfdc0d2320dc5..d24af7125785c588bb44ee1e442e5f5bc0ff67e2 100644 (file)
--- 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 <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 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 96321056890db3a64b552121636eace6d96588e6..4c67ca7fcd334ccabe7189bbe3c97b9ea8fae06c 100644 (file)
--- 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  <wx/dynarray.h>
+    #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 54358ae2e3fbba739ec196dee0cdc641ff3d80cb..3ec690b1e75acbc208688edb6d8a59f5cd078bd5 100644 (file)
--- 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 <wx/gdicmn.h>
+#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 69178254fa8aac457a99a4ae5896cf95e1e1cb9a..6baf80e6f04ed10fe65c6d95683b41a8979a6000 100644 (file)
--- a/include/wx/wxprec.h
+++ b/include/wx/wxprec.h
@@ -36,7 +36,7 @@
 
 #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>
 #include "wx/wxchar.h"
 

diff --git a/include/wx/xti.h b/include/wx/xti.h
index 881ae54bec77d3703b19ee7efd3c7232db6583df..de91e9d8da547f377b584318bc778858e9fd5f87 100644 (file)
--- a/include/wx/xti.h
+++ b/include/wx/xti.h
@@ -689,7 +689,7 @@ private :
     wxString m_name ;
 } ;
 
-#include <wx/dynarray.h>
+#include "wx/dynarray.h"
 
 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__