From 3096bd2fa7b88105bc54c08e3c878585de1a9b91 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 2 Nov 1999 15:50:22 +0000 Subject: [PATCH] include => include "wx/..." git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4301 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/cmndata.cpp | 2 +- src/common/dbtable.cpp | 2 +- src/common/dynarray.cpp | 4 ++-- src/common/file.cpp | 8 ++++---- src/common/filefn.cpp | 2 +- src/common/fs_inet.cpp | 4 ++-- src/common/fs_zip.cpp | 4 ++-- src/common/imaggif.cpp | 2 +- src/common/memory.cpp | 2 +- src/common/mstream.cpp | 4 ++-- src/common/sckaddr.cpp | 10 +++++----- src/common/sckfile.cpp | 4 ++-- src/common/stream.cpp | 6 +++--- src/common/string.cpp | 2 +- src/common/url.cpp | 8 ++++---- src/generic/fontdlgg.cpp | 2 +- src/generic/grid.cpp | 2 +- src/generic/prntdlgg.cpp | 2 +- src/gtk/mdi.cpp | 2 +- src/gtk/treegtk.cpp | 2 +- src/gtk/wave.cpp | 2 +- src/gtk1/mdi.cpp | 2 +- src/gtk1/treegtk.cpp | 2 +- src/gtk1/wave.cpp | 2 +- src/html/helpfrm.cpp | 2 +- src/html/htmlpars.cpp | 4 ++-- src/html/htmltag.cpp | 4 ++-- src/html/htmlwin.cpp | 6 +++--- src/html/m_fonts.cpp | 4 ++-- src/html/m_hline.cpp | 4 ++-- src/html/m_image.cpp | 2 +- src/html/m_list.cpp | 2 +- src/html/m_pre.cpp | 6 +++--- src/html/m_tables.cpp | 4 ++-- src/html/winpars.cpp | 4 ++-- src/motif/dcscreen.cpp | 2 +- src/motif/gauge.cpp | 2 +- src/motif/joystick.cpp | 2 +- src/motif/radiobox.cpp | 2 +- src/motif/radiobut.cpp | 2 +- src/motif/scrolbar.cpp | 2 +- src/motif/slider.cpp | 2 +- src/motif/statbmp.cpp | 2 +- src/motif/statbox.cpp | 2 +- src/motif/taskbar.cpp | 2 +- src/msw/frame.cpp | 2 +- src/msw/helpwin.cpp | 2 +- src/msw/iniconf.cpp | 18 +++++++++--------- src/msw/joystick.cpp | 6 +++--- src/msw/listbox.cpp | 2 +- src/msw/mdi.cpp | 2 +- src/msw/notebook.cpp | 14 +++++++------- src/msw/ole/oleutils.cpp | 8 ++++---- src/msw/ole/uuid.cpp | 4 ++-- src/msw/pnghand.cpp | 2 +- src/msw/slider95.cpp | 4 ++-- src/msw/taskbar.cpp | 6 +++--- src/msw/window.cpp | 2 +- 58 files changed, 108 insertions(+), 108 deletions(-) diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp index 7b45f2f1a4..3d0f4aab6b 100644 --- a/src/common/cmndata.cpp +++ b/src/common/cmndata.cpp @@ -54,7 +54,7 @@ #ifdef __WXMSW__ #include - #include + #include "wx/msw/private.h" #if !defined(__WIN32__) #include diff --git a/src/common/dbtable.cpp b/src/common/dbtable.cpp index f5bc7f5b29..1bec4d64fb 100644 --- a/src/common/dbtable.cpp +++ b/src/common/dbtable.cpp @@ -49,7 +49,7 @@ #if wxMAJOR_VERSION == 2 # ifndef WX_PRECOMP -# include +# include "wx/wx.h" # endif //WX_PRECOMP #endif diff --git a/src/common/dynarray.cpp b/src/common/dynarray.cpp index c6ad4ae29d..04d89832e1 100644 --- a/src/common/dynarray.cpp +++ b/src/common/dynarray.cpp @@ -17,14 +17,14 @@ #pragma implementation "dynarray.h" #endif -#include +#include "wx/wxprec.h" #ifdef __BORLANDC__ #pragma hdrstop #endif #include "wx/dynarray.h" -#include +#include "wx/intl.h" #include #include // for memmove diff --git a/src/common/file.cpp b/src/common/file.cpp index 4ec2c612ec..39e03cddf4 100644 --- a/src/common/file.cpp +++ b/src/common/file.cpp @@ -132,10 +132,10 @@ #endif // wxWindows -#include -#include -#include -#include +#include "wx/string.h" +#include "wx/intl.h" +#include "wx/file.h" +#include "wx/log.h" #ifndef MAX_PATH #define MAX_PATH 512 diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index e65513fc99..d65147d76d 100644 --- a/src/common/filefn.cpp +++ b/src/common/filefn.cpp @@ -34,7 +34,7 @@ #endif #include "wx/utils.h" -#include +#include "wx/intl.h" // there are just too many of those... #ifdef __VISUALC__ diff --git a/src/common/fs_inet.cpp b/src/common/fs_inet.cpp index 55677f10ff..0a1e19d31a 100644 --- a/src/common/fs_inet.cpp +++ b/src/common/fs_inet.cpp @@ -23,7 +23,7 @@ limitation) #pragma implementation #endif -#include +#include "wx/wxprec.h" #ifdef __BORDLANDC__ #pragma hdrstop @@ -37,7 +37,7 @@ limitation) #if wxUSE_FS_INET #ifndef WXPRECOMP -#include +#include "wx/wx.h" #endif #include "wx/wfstream.h" diff --git a/src/common/fs_zip.cpp b/src/common/fs_zip.cpp index a9939637d2..96985ddc65 100644 --- a/src/common/fs_zip.cpp +++ b/src/common/fs_zip.cpp @@ -11,7 +11,7 @@ #pragma implementation #endif -#include +#include "wx/wxprec.h" #ifdef __BORDLANDC__ #pragma hdrstop @@ -20,7 +20,7 @@ #if wxUSE_FS_ZIP #ifndef WXPRECOMP -#include +#include "wx/wx.h" #endif #include "wx/filesys.h" diff --git a/src/common/imaggif.cpp b/src/common/imaggif.cpp index 94f404a507..b15fff887e 100644 --- a/src/common/imaggif.cpp +++ b/src/common/imaggif.cpp @@ -13,7 +13,7 @@ */ // For compilers that support precompilation, includes "wx.h". -#include +#include "wx/wxprec.h" #ifdef __BORLANDC__ # pragma hdrstop diff --git a/src/common/memory.cpp b/src/common/memory.cpp index 0f51b89b6d..d7d6c07461 100644 --- a/src/common/memory.cpp +++ b/src/common/memory.cpp @@ -35,7 +35,7 @@ #include "wx/app.h" #endif -#include +#include "wx/log.h" #include #include "wx/ioswrap.h" diff --git a/src/common/mstream.cpp b/src/common/mstream.cpp index 5d13a0a2e0..3e656ba3e8 100644 --- a/src/common/mstream.cpp +++ b/src/common/mstream.cpp @@ -23,8 +23,8 @@ #if wxUSE_STREAMS #include -#include -#include +#include "wx/stream.h" +#include "wx/mstream.h" // ---------------------------------------------------------------------------- // wxMemoryInputStream diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp index fff40bef7d..398a3cf016 100644 --- a/src/common/sckaddr.cpp +++ b/src/common/sckaddr.cpp @@ -30,11 +30,11 @@ #include #endif -#include -#include -#include -#include -#include +#include "wx/defs.h" +#include "wx/object.h" +#include "wx/log.h" +#include "wx/gsocket.h" +#include "wx/sckaddr.h" #if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxSockAddress, wxObject) diff --git a/src/common/sckfile.cpp b/src/common/sckfile.cpp index b3f4737c6a..f5ddc187ea 100644 --- a/src/common/sckfile.cpp +++ b/src/common/sckfile.cpp @@ -24,8 +24,8 @@ #endif #include -#include -#include +#include "wx/wfstream.h" +#include "wx/protocol/file.h" #if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxFileProto, wxProtocol) diff --git a/src/common/stream.cpp b/src/common/stream.cpp index 6698b43ad8..31760bb582 100644 --- a/src/common/stream.cpp +++ b/src/common/stream.cpp @@ -27,9 +27,9 @@ #if wxUSE_STREAMS #include -#include -#include -#include +#include "wx/stream.h" +#include "wx/datstrm.h" +#include "wx/objstrm.h" #define BUF_TEMP_SIZE 10000 diff --git a/src/common/string.cpp b/src/common/string.cpp index 32350af033..c18e35f606 100644 --- a/src/common/string.cpp +++ b/src/common/string.cpp @@ -36,7 +36,7 @@ #include "wx/string.h" #include "wx/intl.h" #if wxUSE_THREADS - #include + #include "wx/thread.h" #endif #endif diff --git a/src/common/url.cpp b/src/common/url.cpp index 813ac542e5..203beef31d 100644 --- a/src/common/url.cpp +++ b/src/common/url.cpp @@ -23,10 +23,10 @@ #include #include -#include -#include -#include -#include +#include "wx/string.h" +#include "wx/list.h" +#include "wx/utils.h" +#include "wx/url.h" #if !USE_SHARED_LIBRARY IMPLEMENT_CLASS(wxProtoInfo, wxObject) diff --git a/src/generic/fontdlgg.cpp b/src/generic/fontdlgg.cpp index 38e54e9209..2257f4bcf1 100644 --- a/src/generic/fontdlgg.cpp +++ b/src/generic/fontdlgg.cpp @@ -31,7 +31,7 @@ #include "wx/dcclient.h" #include "wx/choice.h" #include "wx/checkbox.h" -#include +#include "wx/intl.h" #endif #include diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index dcced22a41..4d9ee47b80 100644 --- a/src/generic/grid.cpp +++ b/src/generic/grid.cpp @@ -184,7 +184,7 @@ wxGridTableMessage::wxGridTableMessage( wxGridTableBase *table, int id, // this is a magic incantation which must be done! -#include +#include "wx/arrimpl.cpp" WX_DEFINE_OBJARRAY(wxGridStringArray) diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp index df57a25ad4..e3fec631d5 100644 --- a/src/generic/prntdlgg.cpp +++ b/src/generic/prntdlgg.cpp @@ -46,7 +46,7 @@ #include "wx/filedlg.h" #include "wx/choice.h" #include "wx/combobox.h" - #include + #include "wx/intl.h" #include "wx/sizer.h" #endif diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp index c8e3e8001f..ef10bb6cfc 100644 --- a/src/gtk/mdi.cpp +++ b/src/gtk/mdi.cpp @@ -17,7 +17,7 @@ #include "wx/dialog.h" #include "wx/menu.h" -#include +#include "wx/intl.h" #include "glib.h" #include "gdk/gdk.h" diff --git a/src/gtk/treegtk.cpp b/src/gtk/treegtk.cpp index 6d8fa194e1..771e96b078 100644 --- a/src/gtk/treegtk.cpp +++ b/src/gtk/treegtk.cpp @@ -25,7 +25,7 @@ #endif #include "wx/gtk/treectrl.h" -#include +#include "wx/textctrl.h" #include "wx/log.h" #include diff --git a/src/gtk/wave.cpp b/src/gtk/wave.cpp index b100588180..382c1db09b 100644 --- a/src/gtk/wave.cpp +++ b/src/gtk/wave.cpp @@ -13,7 +13,7 @@ #pragma implementation "wave.h" #endif -#include +#include "wx/setup.h" #if wxUSE_WAVE diff --git a/src/gtk1/mdi.cpp b/src/gtk1/mdi.cpp index c8e3e8001f..ef10bb6cfc 100644 --- a/src/gtk1/mdi.cpp +++ b/src/gtk1/mdi.cpp @@ -17,7 +17,7 @@ #include "wx/dialog.h" #include "wx/menu.h" -#include +#include "wx/intl.h" #include "glib.h" #include "gdk/gdk.h" diff --git a/src/gtk1/treegtk.cpp b/src/gtk1/treegtk.cpp index 6d8fa194e1..771e96b078 100644 --- a/src/gtk1/treegtk.cpp +++ b/src/gtk1/treegtk.cpp @@ -25,7 +25,7 @@ #endif #include "wx/gtk/treectrl.h" -#include +#include "wx/textctrl.h" #include "wx/log.h" #include diff --git a/src/gtk1/wave.cpp b/src/gtk1/wave.cpp index b100588180..382c1db09b 100644 --- a/src/gtk1/wave.cpp +++ b/src/gtk1/wave.cpp @@ -13,7 +13,7 @@ #pragma implementation "wave.h" #endif -#include +#include "wx/setup.h" #if wxUSE_WAVE diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp index 5391df1b7d..ab3d99bf44 100644 --- a/src/html/helpfrm.cpp +++ b/src/html/helpfrm.cpp @@ -25,7 +25,7 @@ #if wxUSE_HTML #ifndef WXPRECOMP -#include +#include "wx/wx.h" #endif #include "wx/html/helpfrm.h" diff --git a/src/html/htmlpars.cpp b/src/html/htmlpars.cpp index 1d9b99c7f6..3a5d300ee6 100644 --- a/src/html/htmlpars.cpp +++ b/src/html/htmlpars.cpp @@ -12,7 +12,7 @@ #pragma implementation #endif -#include +#include "wx/wxprec.h" #include "wx/defs.h" #if wxUSE_HTML @@ -22,7 +22,7 @@ #endif #ifndef WXPRECOMP -#include +#include "wx/wx.h" #endif #include "wx/tokenzr.h" diff --git a/src/html/htmltag.cpp b/src/html/htmltag.cpp index 386bb98a59..454ccafcaf 100644 --- a/src/html/htmltag.cpp +++ b/src/html/htmltag.cpp @@ -12,7 +12,7 @@ #pragma implementation #endif -#include +#include "wx/wxprec.h" #include "wx/defs.h" #if wxUSE_HTML @@ -22,7 +22,7 @@ #endif #ifndef WXPRECOMP -#include +#include "wx/wx.h" #endif #include "wx/html/htmltag.h" diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp index e7b07636cf..53921edc61 100644 --- a/src/html/htmlwin.cpp +++ b/src/html/htmlwin.cpp @@ -12,7 +12,7 @@ #pragma implementation #endif -#include +#include "wx/wxprec.h" #include "wx/defs.h" #if wxUSE_HTML @@ -22,7 +22,7 @@ #endif #ifndef WXPRECOMP -#include +#include "wx/wx.h" #endif #include "wx/html/htmlwin.h" @@ -37,7 +37,7 @@ -#include +#include "wx/arrimpl.cpp" WX_DEFINE_OBJARRAY(HtmlHistoryArray) diff --git a/src/html/m_fonts.cpp b/src/html/m_fonts.cpp index a4e82ba7d4..afc454bc80 100644 --- a/src/html/m_fonts.cpp +++ b/src/html/m_fonts.cpp @@ -11,7 +11,7 @@ #pragma implementation #endif -#include +#include "wx/wxprec.h" #include "wx/defs.h" #if wxUSE_HTML @@ -21,7 +21,7 @@ #endif #ifndef WXPRECOMP -#include +#include "wx/wx.h" #endif #include "wx/html/forcelnk.h" diff --git a/src/html/m_hline.cpp b/src/html/m_hline.cpp index 9cc57b8ede..5a58178972 100644 --- a/src/html/m_hline.cpp +++ b/src/html/m_hline.cpp @@ -11,7 +11,7 @@ #pragma implementation #endif -#include +#include "wx/wxprec.h" #include "wx/defs.h" @@ -21,7 +21,7 @@ #endif #ifndef WXPRECOMP -#include +#include "wx/wx.h" #endif diff --git a/src/html/m_image.cpp b/src/html/m_image.cpp index 9ee14ff798..d7b4566bdf 100644 --- a/src/html/m_image.cpp +++ b/src/html/m_image.cpp @@ -40,7 +40,7 @@ FORCE_LINK_ME(mod_image) WX_DECLARE_OBJARRAY(int, CoordArray); -#include // this is a magic incantation which must be done! +#include "wx/arrimpl.cpp" // this is a magic incantation which must be done! WX_DEFINE_OBJARRAY(CoordArray); diff --git a/src/html/m_list.cpp b/src/html/m_list.cpp index 875e6a7122..9640d52685 100644 --- a/src/html/m_list.cpp +++ b/src/html/m_list.cpp @@ -21,7 +21,7 @@ #endif #ifndef WXPRECOMP -#include +#include "wx/wx.h" #endif diff --git a/src/html/m_pre.cpp b/src/html/m_pre.cpp index fdeaaf4a1f..61cafb7b7b 100644 --- a/src/html/m_pre.cpp +++ b/src/html/m_pre.cpp @@ -11,7 +11,7 @@ #pragma implementation #endif -#include +#include "wx/wxprec.h" #include "wx/defs.h" #if wxUSE_HTML @@ -20,7 +20,7 @@ #endif #ifndef WXPRECOMP -#include +#include "wx/wx.h" #endif @@ -28,7 +28,7 @@ #include "wx/html/m_templ.h" #include "wx/html/htmlcell.h" -#include +#include "wx/tokenzr.h" FORCE_LINK_ME(mod_pre) diff --git a/src/html/m_tables.cpp b/src/html/m_tables.cpp index 73c1fd651e..ad387825f0 100644 --- a/src/html/m_tables.cpp +++ b/src/html/m_tables.cpp @@ -11,7 +11,7 @@ #pragma implementation #endif -#include +#include "wx/wxprec.h" #include "wx/defs.h" #if wxUSE_HTML @@ -20,7 +20,7 @@ #endif #ifndef WXPRECOMP -#include +#include "wx/wx.h" #endif diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp index c985d1aa44..b03d4d256a 100644 --- a/src/html/winpars.cpp +++ b/src/html/winpars.cpp @@ -12,7 +12,7 @@ #pragma implementation #endif -#include +#include "wx/wxprec.h" #include "wx/defs.h" #if wxUSE_HTML @@ -22,7 +22,7 @@ #endif #ifndef WXPRECOMP -#include +#include "wx/wx.h" #endif #include "wx/html/htmldefs.h" diff --git a/src/motif/dcscreen.cpp b/src/motif/dcscreen.cpp index df547fe628..5b9274e45a 100644 --- a/src/motif/dcscreen.cpp +++ b/src/motif/dcscreen.cpp @@ -19,7 +19,7 @@ #include -#include +#include "wx/motif/private.h" #if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC) diff --git a/src/motif/gauge.cpp b/src/motif/gauge.cpp index a8977bb11f..cadbfafb35 100644 --- a/src/motif/gauge.cpp +++ b/src/motif/gauge.cpp @@ -16,7 +16,7 @@ #include "wx/gauge.h" #include -#include +#include "wx/motif/private.h" #if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl) diff --git a/src/motif/joystick.cpp b/src/motif/joystick.cpp index d6fc022e8d..415165fe6b 100644 --- a/src/motif/joystick.cpp +++ b/src/motif/joystick.cpp @@ -13,7 +13,7 @@ #pragma implementation "joystick.h" #endif -#include +#include "wx/joystick.h" IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject) diff --git a/src/motif/radiobox.cpp b/src/motif/radiobox.cpp index 6845b047db..33b1ab2f25 100644 --- a/src/motif/radiobox.cpp +++ b/src/motif/radiobox.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include "wx/motif/private.h" void wxRadioBoxCallback (Widget w, XtPointer clientData, XmToggleButtonCallbackStruct * cbs); diff --git a/src/motif/radiobut.cpp b/src/motif/radiobut.cpp index 7be3126b54..ccce0c9309 100644 --- a/src/motif/radiobut.cpp +++ b/src/motif/radiobut.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include "wx/motif/private.h" void wxRadioButtonCallback (Widget w, XtPointer clientData, XmToggleButtonCallbackStruct * cbs); diff --git a/src/motif/scrolbar.cpp b/src/motif/scrolbar.cpp index 143eb3823d..f0f4440583 100644 --- a/src/motif/scrolbar.cpp +++ b/src/motif/scrolbar.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include "wx/motif/private.h" static void wxScrollBarCallback(Widget widget, XtPointer clientData, XmScaleCallbackStruct *cbs); diff --git a/src/motif/slider.cpp b/src/motif/slider.cpp index 5a141dc7cb..2ea8f37e36 100644 --- a/src/motif/slider.cpp +++ b/src/motif/slider.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include "wx/motif/private.h" void wxSliderCallback (Widget widget, XtPointer clientData, XmScaleCallbackStruct * cbs); diff --git a/src/motif/statbmp.cpp b/src/motif/statbmp.cpp index fa4d5eb5de..6cc81fe57f 100644 --- a/src/motif/statbmp.cpp +++ b/src/motif/statbmp.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include "wx/motif/private.h" #if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl) diff --git a/src/motif/statbox.cpp b/src/motif/statbox.cpp index 660c43b6e8..09c330a017 100644 --- a/src/motif/statbox.cpp +++ b/src/motif/statbox.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include "wx/motif/private.h" #if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl) diff --git a/src/motif/taskbar.cpp b/src/motif/taskbar.cpp index 75f12c0d58..02024c5ea3 100644 --- a/src/motif/taskbar.cpp +++ b/src/motif/taskbar.cpp @@ -14,7 +14,7 @@ #pragma implementation "taskbar.h" #endif -#include +#include "wx/taskbar.h" wxTaskBarIcon::wxTaskBarIcon() { diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp index 5cb1ff43a6..b6d4bd5ccc 100644 --- a/src/msw/frame.cpp +++ b/src/msw/frame.cpp @@ -38,7 +38,7 @@ #include "wx/log.h" #if wxUSE_NATIVE_STATUSBAR - #include + #include "wx/msw/statbr95.h" #endif extern wxWindowList wxModelessWindows; diff --git a/src/msw/helpwin.cpp b/src/msw/helpwin.cpp index 63d62492e0..1a376ba5a6 100644 --- a/src/msw/helpwin.cpp +++ b/src/msw/helpwin.cpp @@ -30,7 +30,7 @@ #include #ifdef __WXMSW__ -#include +#include "wx/msw/private.h" #endif #include diff --git a/src/msw/iniconf.cpp b/src/msw/iniconf.cpp index 1adae8ce22..f3d0a6727b 100644 --- a/src/msw/iniconf.cpp +++ b/src/msw/iniconf.cpp @@ -21,18 +21,18 @@ #endif #ifndef WX_PRECOMP - #include - #include - #include - #include - #include + #include "wx/string.h" + #include "wx/intl.h" + #include "wx/event.h" + #include "wx/app.h" + #include "wx/utils.h" #endif //WX_PRECOMP -#include -#include -#include +#include "wx/dynarray.h" +#include "wx/log.h" +#include "wx/config.h" -#include +#include "wx/msw/iniconf.h" // _WINDOWS_ is defined when windows.h is included, // __WXMSW__ is defined for MS Windows compilation diff --git a/src/msw/joystick.cpp b/src/msw/joystick.cpp index 58b7631915..cd636fba81 100644 --- a/src/msw/joystick.cpp +++ b/src/msw/joystick.cpp @@ -35,7 +35,7 @@ typedef UINT MMRESULT; #ifndef __TWIN32__ #ifdef __GNUWIN32__ #ifndef wxUSE_NORLANDER_HEADERS -#include +#include "wx/msw/gnuwin32/extra.h" #endif #endif #endif @@ -45,8 +45,8 @@ typedef UINT MMRESULT; #define NO_JOYGETPOSEX #endif -#include -#include +#include "wx/window.h" +#include "wx/msw/joystick.h" IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject) diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp index 5b2e30ab63..2168734e01 100644 --- a/src/msw/listbox.cpp +++ b/src/msw/listbox.cpp @@ -50,7 +50,7 @@ #ifndef __TWIN32__ #if defined(__GNUWIN32__) #ifndef wxUSE_NORLANDER_HEADERS - #include + #include "wx/msw/gnuwin32/extra.h" #endif #endif #endif diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp index 39ccc4c884..d59e323f81 100644 --- a/src/msw/mdi.cpp +++ b/src/msw/mdi.cpp @@ -45,7 +45,7 @@ #include "wx/msw/private.h" #if wxUSE_NATIVE_STATUSBAR - #include + #include "wx/msw/statbr95.h" #endif #include diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp index 4dd386361c..aec8a9979a 100644 --- a/src/msw/notebook.cpp +++ b/src/msw/notebook.cpp @@ -22,16 +22,16 @@ // wxWindows #ifndef WX_PRECOMP - #include + #include "wx/string.h" #endif // WX_PRECOMP -#include -#include -#include -#include -#include +#include "wx/log.h" +#include "wx/imaglist.h" +#include "wx/event.h" +#include "wx/control.h" +#include "wx/notebook.h" -#include +#include "wx/msw/private.h" // Windows standard headers #ifndef __WIN95__ diff --git a/src/msw/ole/oleutils.cpp b/src/msw/ole/oleutils.cpp index 34f1109c68..38519d4f9b 100644 --- a/src/msw/ole/oleutils.cpp +++ b/src/msw/ole/oleutils.cpp @@ -28,14 +28,14 @@ #pragma hdrstop #endif -#include -#include +#include "wx/setup.h" +#include "wx/log.h" #include // OLE -#include -#include +#include "wx/msw/ole/uuid.h" +#include "wx/msw/ole/oleutils.h" #if defined(__VISUALC__) && (__VISUALC__ > 1000) #include diff --git a/src/msw/ole/uuid.cpp b/src/msw/ole/uuid.cpp index 67f2d2710f..cc912a6d1d 100644 --- a/src/msw/ole/uuid.cpp +++ b/src/msw/ole/uuid.cpp @@ -24,14 +24,14 @@ #pragma hdrstop #endif -#include +#include "wx/setup.h" #if wxUSE_DRAG_AND_DROP // standard headers #include // UUID related functions -#include +#include "wx/msw/ole/uuid.h" diff --git a/src/msw/pnghand.cpp b/src/msw/pnghand.cpp index 9e1d34945c..833dd0a0f2 100644 --- a/src/msw/pnghand.cpp +++ b/src/msw/pnghand.cpp @@ -765,7 +765,7 @@ bool wxPNGReader::SaveXPM(wxChar *filename, wxChar *name) return TRUE; } -#include +#include "wx/msw/pnghand.h" IMPLEMENT_DYNAMIC_CLASS(wxPNGFileHandler, wxBitmapHandler) diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp index bd75e7fd85..da73283d1c 100644 --- a/src/msw/slider95.cpp +++ b/src/msw/slider95.cpp @@ -22,8 +22,8 @@ #ifndef WX_PRECOMP #include -#include -#include +#include "wx/utils.h" +#include "wx/brush.h" #endif #ifdef __WIN95__ diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp index 89246bd8a2..9b2f4eeb50 100644 --- a/src/msw/taskbar.cpp +++ b/src/msw/taskbar.cpp @@ -33,13 +33,13 @@ #include #include -#include -#include +#include "wx/msw/taskbar.h" +#include "wx/msw/private.h" #ifndef __TWIN32__ #ifdef __GNUWIN32__ #ifndef wxUSE_NORLANDER_HEADERS -#include +#include "wx/msw/gnuwin32/extra.h" #endif #endif #endif diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 0459634737..32ce024c38 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -95,7 +95,7 @@ #ifndef __TWIN32__ #ifdef __GNUWIN32__ #ifndef wxUSE_NORLANDER_HEADERS - #include + #include "wx/msw/gnuwin32/extra.h" #endif #endif #endif -- 2.45.2