From 5aa5c1e4c9150c6cacdaf6090e2ae8c496e79b6b Mon Sep 17 00:00:00 2001 From: Gilles Depeyrot Date: Thu, 22 Nov 2001 22:03:26 +0000 Subject: [PATCH] use "..." instead of <...> for wx headers git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12603 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- utils/HelpGen/src/HelpGen.cpp | 15 +++++++++------ utils/Install/builder/wxib.cpp | 10 +++++----- utils/dialoged/src/dlghndlr.cpp | 2 +- utils/dialoged/src/edlist.h | 4 ++-- utils/dialoged/src/edtree.h | 2 +- utils/dialoged/src/reseditr.cpp | 2 +- utils/dialoged/src/symbtabl.cpp | 2 +- utils/makegen/makegen.cpp | 18 +++++++++--------- utils/tex2rtf/src/maths.cpp | 2 +- utils/tex2rtf/src/table.cpp | 3 +-- utils/tex2rtf/src/texutils.cpp | 2 +- 11 files changed, 32 insertions(+), 30 deletions(-) diff --git a/utils/HelpGen/src/HelpGen.cpp b/utils/HelpGen/src/HelpGen.cpp index 6828f79252..9fed79e63b 100644 --- a/utils/HelpGen/src/HelpGen.cpp +++ b/utils/HelpGen/src/HelpGen.cpp @@ -52,14 +52,14 @@ #include "wx/wxprec.h" #ifndef WX_PRECOMP - #include - #include - #include - #include + #include "wx/string.h" + #include "wx/log.h" + #include "wx/dynarray.h" + #include "wx/wx.h" #endif // WX_PRECOMP -#include -#include +#include "wx/file.h" +#include "wx/regex.h" // C++ parsing classes #include "cjparser.h" @@ -1977,6 +1977,9 @@ static const wxString GetVersionString() /* $Log$ + Revision 1.15 2001/11/22 21:59:58 GD + use "..." instead of <...> for wx headers + Revision 1.14 2001/07/19 13:51:29 VZ fixes to version string diff --git a/utils/Install/builder/wxib.cpp b/utils/Install/builder/wxib.cpp index c3febebc29..4c1922200d 100644 --- a/utils/Install/builder/wxib.cpp +++ b/utils/Install/builder/wxib.cpp @@ -23,12 +23,12 @@ #endif #ifndef WX_PRECOMP - #include + #include "wx/wx.h" #endif -#include -#include -#include +#include "wx/toolbar.h" +#include "wx/log.h" +#include "wx/image.h" // define this to 1 to use wxToolBarSimple instead of the native one #define USE_GENERIC_TBAR 0 @@ -38,7 +38,7 @@ #error wxToolBarSimple is not compiled in, set wxUSE_TOOLBAR_SIMPLE \ to 1 in setup.h and recompile the library. #else - #include + #include "wx/tbarsmpl.h" #endif #endif // USE_GENERIC_TBAR diff --git a/utils/dialoged/src/dlghndlr.cpp b/utils/dialoged/src/dlghndlr.cpp index 7e494242e0..2be4b234f2 100644 --- a/utils/dialoged/src/dlghndlr.cpp +++ b/utils/dialoged/src/dlghndlr.cpp @@ -432,7 +432,7 @@ void wxResourceEditorDialogHandler::OnMouseEvent(wxMouseEvent& event) firstDragY = y; dragType = wxDRAG_TYPE_BOUNDING_BOX; wxClientDC dc(handlerDialog); - OnDragBegin(x, y, keys, dc, NULL); + OnDragBegin(x, y, keys, dc, 0); dragMode = wxDRAG_MODE_CONTINUE_LEFT; oldDragX = x; oldDragY = y; } diff --git a/utils/dialoged/src/edlist.h b/utils/dialoged/src/edlist.h index 6ab9369f1f..1122fcf7fa 100644 --- a/utils/dialoged/src/edlist.h +++ b/utils/dialoged/src/edlist.h @@ -12,8 +12,8 @@ #ifndef _EDLIST_H_ #define _EDLIST_H_ -#include -#include +#include "wx/listctrl.h" +#include "wx/imaglist.h" class wxResourceEditorControlList: public wxListCtrl { diff --git a/utils/dialoged/src/edtree.h b/utils/dialoged/src/edtree.h index 37b05dcd59..21b1d5e922 100644 --- a/utils/dialoged/src/edtree.h +++ b/utils/dialoged/src/edtree.h @@ -12,7 +12,7 @@ #ifndef _EDTREE_H_ #define _EDTREE_H_ -#include +#include "wx/treectrl.h" class wxResourceEditorProjectTree: public wxTreeCtrl { diff --git a/utils/dialoged/src/reseditr.cpp b/utils/dialoged/src/reseditr.cpp index f4d2e4d600..06ad366005 100644 --- a/utils/dialoged/src/reseditr.cpp +++ b/utils/dialoged/src/reseditr.cpp @@ -175,7 +175,7 @@ bool wxResourceManager::Initialize() #ifdef __WXMSW__ m_bitmapImage = new wxBitmap("WXWINBMP", wxBITMAP_TYPE_BMP_RESOURCE); #endif -#if defined(__WXGTK__) || defined(__WXMOTIF__) +#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) m_bitmapImage = new wxBitmap( wxwin_xpm ); #endif } diff --git a/utils/dialoged/src/symbtabl.cpp b/utils/dialoged/src/symbtabl.cpp index bed48b411d..05c160ac41 100644 --- a/utils/dialoged/src/symbtabl.cpp +++ b/utils/dialoged/src/symbtabl.cpp @@ -24,7 +24,7 @@ #include "wx/wx.h" #endif -#include +#include "wx/file.h" #include #include diff --git a/utils/makegen/makegen.cpp b/utils/makegen/makegen.cpp index d43572aadc..7db8b972a7 100644 --- a/utils/makegen/makegen.cpp +++ b/utils/makegen/makegen.cpp @@ -28,15 +28,15 @@ // headers // ---------------------------------------------------------------------------- -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "wx/string.h" +#include "wx/file.h" +#include "wx/ffile.h" +#include "wx/app.h" +#include "wx/log.h" +#include "wx/dir.h" +#include "wx/textfile.h" +#include "wx/datetime.h" +#include "wx/cmdline.h" // ---------------------------------------------------------------------------- // the application class diff --git a/utils/tex2rtf/src/maths.cpp b/utils/tex2rtf/src/maths.cpp index 8ce01001d3..cba6dc2ece 100644 --- a/utils/tex2rtf/src/maths.cpp +++ b/utils/tex2rtf/src/maths.cpp @@ -15,7 +15,7 @@ #endif #ifndef WX_PRECOMP -#include +#include "wx/wx.h" #endif #include diff --git a/utils/tex2rtf/src/table.cpp b/utils/tex2rtf/src/table.cpp index bf51891a8f..fa41681140 100644 --- a/utils/tex2rtf/src/table.cpp +++ b/utils/tex2rtf/src/table.cpp @@ -24,8 +24,7 @@ #include "wx/wx.h" #endif - -#include +#include "wx/hash.h" #ifdef new #undef new diff --git a/utils/tex2rtf/src/texutils.cpp b/utils/tex2rtf/src/texutils.cpp index ad52f44ef0..f4bb11a9a9 100644 --- a/utils/tex2rtf/src/texutils.cpp +++ b/utils/tex2rtf/src/texutils.cpp @@ -24,7 +24,7 @@ #include "wx/wx.h" #endif -#include +#include "wx/hash.h" #ifdef new #undef new -- 2.45.2