From a4a162522b875bc7cb23f1d165703f71bd7010f7 Mon Sep 17 00:00:00 2001 From: Stefan Neis Date: Sun, 20 Jan 2002 22:00:11 +0000 Subject: [PATCH] Added various #includes for non-precompiled headers. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/os2/button.cpp | 1 + src/os2/checkbox.cpp | 3 +++ src/os2/choice.cpp | 1 + src/os2/combobox.cpp | 3 ++- src/os2/control.cpp | 1 + src/os2/gauge.cpp | 1 + src/os2/joystick.cpp | 5 +++++ src/os2/listbox.cpp | 1 + src/os2/radiobut.cpp | 2 ++ src/os2/slider.cpp | 1 + src/os2/stattext.cpp | 3 +-- src/os2/toplevel.cpp | 1 + src/os2/window.cpp | 9 ++++++++- 13 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/os2/button.cpp b/src/os2/button.cpp index b4ce9ac0d5..83301398f7 100644 --- a/src/os2/button.cpp +++ b/src/os2/button.cpp @@ -19,6 +19,7 @@ #include "wx/bmpbuttn.h" #include "wx/settings.h" #include "wx/dcscreen.h" + #include "wx/scrolwin.h" #endif #include "wx/os2/private.h" diff --git a/src/os2/checkbox.cpp b/src/os2/checkbox.cpp index 8311751388..eaa7389885 100644 --- a/src/os2/checkbox.cpp +++ b/src/os2/checkbox.cpp @@ -15,6 +15,9 @@ #ifndef WX_PRECOMP #include "wx/checkbox.h" #include "wx/brush.h" + #include "wx/scrolwin.h" + #include "wx/dcscreen.h" + #include "wx/settings.h" #endif #include "wx/os2/private.h" diff --git a/src/os2/choice.cpp b/src/os2/choice.cpp index 96df144bf1..00d0d583e4 100644 --- a/src/os2/choice.cpp +++ b/src/os2/choice.cpp @@ -16,6 +16,7 @@ #include "wx/choice.h" #include "wx/utils.h" #include "wx/log.h" + #include "wx/settings.h" #endif #include "wx/os2/private.h" diff --git a/src/os2/combobox.cpp b/src/os2/combobox.cpp index 7d6565d798..1fd96160e5 100644 --- a/src/os2/combobox.cpp +++ b/src/os2/combobox.cpp @@ -15,7 +15,8 @@ #include "wx/wxprec.h" #ifndef WX_PRECOMP -#include "wx/setup.h" + #include "wx/setup.h" + #include "wx/settings.h" #endif #if wxUSE_COMBOBOX diff --git a/src/os2/control.cpp b/src/os2/control.cpp index 086830056c..f9f19112b9 100644 --- a/src/os2/control.cpp +++ b/src/os2/control.cpp @@ -20,6 +20,7 @@ #include "wx/event.h" #include "wx/app.h" #include "wx/dcclient.h" +#include "wx/scrolwin.h" #endif #include "wx/os2/private.h" #include "wx/control.h" diff --git a/src/os2/gauge.cpp b/src/os2/gauge.cpp index 449788d6a3..b7700f4147 100644 --- a/src/os2/gauge.cpp +++ b/src/os2/gauge.cpp @@ -14,6 +14,7 @@ #ifndef WX_PRECOMP #include "wx/defs.h" #include "wx/utils.h" +#include "wx/scrolwin.h" #endif #include "wx/os2/private.h" diff --git a/src/os2/joystick.cpp b/src/os2/joystick.cpp index 73e82b549b..e40b19826e 100644 --- a/src/os2/joystick.cpp +++ b/src/os2/joystick.cpp @@ -9,6 +9,10 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +#include "wx/defs.h" + +#if wxUSE_JOYSTICK + #include "wx/string.h" #define INCL_PM #define INCL_DOS @@ -280,4 +284,5 @@ bool wxJoystick::ReleaseCapture() // TODO return FALSE; } +#endif // wxUSE_JOYSTICK diff --git a/src/os2/listbox.cpp b/src/os2/listbox.cpp index df1b7cc473..290b46be30 100644 --- a/src/os2/listbox.cpp +++ b/src/os2/listbox.cpp @@ -22,6 +22,7 @@ #include "wx/font.h" #include "wx/dc.h" #include "wx/utils.h" +#include "wx/scrolwin.h" #endif #define INCL_M diff --git a/src/os2/radiobut.cpp b/src/os2/radiobut.cpp index f06181dd45..1f48c70a66 100644 --- a/src/os2/radiobut.cpp +++ b/src/os2/radiobut.cpp @@ -21,6 +21,8 @@ #include "wx/setup.h" #include "wx/radiobut.h" #include "wx/brush.h" +#include "wx/dcscreen.h" +#include "wx/settings.h" #endif #include "wx/os2/private.h" diff --git a/src/os2/slider.cpp b/src/os2/slider.cpp index 7f2ba24e7f..931d848e9d 100644 --- a/src/os2/slider.cpp +++ b/src/os2/slider.cpp @@ -20,6 +20,7 @@ #include #include #include +#include #endif #include "wx/slider.h" diff --git a/src/os2/stattext.cpp b/src/os2/stattext.cpp index 5b214b0987..7f033e228c 100644 --- a/src/os2/stattext.cpp +++ b/src/os2/stattext.cpp @@ -20,6 +20,7 @@ #include "wx/event.h" #include "wx/app.h" #include "wx/brush.h" +#include "wx/scrolwin.h" #endif #include "wx/stattext.h" @@ -241,5 +242,3 @@ MRESULT wxStaticText::OS2WindowProc( ,lParam ); } // end of wxStaticText::OS2WindowProc - - diff --git a/src/os2/toplevel.cpp b/src/os2/toplevel.cpp index 7596ef7dcc..139e96ccfb 100644 --- a/src/os2/toplevel.cpp +++ b/src/os2/toplevel.cpp @@ -35,6 +35,7 @@ #include "wx/log.h" #include "wx/intl.h" #include "wx/frame.h" + #include "wx/control.h" #endif //WX_PRECOMP #include "wx/os2/private.h" diff --git a/src/os2/window.cpp b/src/os2/window.cpp index 397b10c558..1dda24c9c9 100644 --- a/src/os2/window.cpp +++ b/src/os2/window.cpp @@ -34,7 +34,11 @@ #include "wx/button.h" #include "wx/msgdlg.h" #include "wx/scrolwin.h" - + #include "wx/radiobox.h" + #include "wx/slider.h" + #include "wx/statusbr.h" + #include "wx/toolbar.h" + #include "wx/settings.h" #include #endif @@ -2803,6 +2807,8 @@ MRESULT wxWindowOS2::OS2WindowProc( return mResult; } // end of wxWindowOS2::OS2WindowProc +#ifndef __EMX__ +// clashes with wxDlgProc in toplevel.cpp? // // Dialog window proc // @@ -2829,6 +2835,7 @@ MRESULT wxDlgProc( return (MRESULT)0; } } // end of wxDlgProc +#endif wxWindow* wxFindWinFromHandle( WXHWND hWnd -- 2.47.2