Added various #includes for non-precompiled headers.

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

diff --git a/src/os2/button.cpp b/src/os2/button.cpp
index b4ce9ac0d51364139558929f07506bd572244dda..83301398f7ffbed054116a2f22aa8c8130004fe8 100644 (file)
--- 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 83117513887cdfb363c35635af9339c59bb2aad3..eaa7389885d9f23c3537e46114e276114ec6f9b6 100644 (file)
--- 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 96df144bf15320426ad3227e3ff651a6b5612532..00d0d583e48576a7a8af7c620227992607354fac 100644 (file)
--- 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 7d6565d7982d8c61dceec4b90eb94da48616fb50..1fd96160e517223c94162a30b2b9389e51e06bf2 100644 (file)
--- 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 086830056c05947ceb0d58e870c56336e85bc322..f9f19112b98d86ee2606f852da5d69af6dbab63a 100644 (file)
--- 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 449788d6a32c687a564330e30c3dc1d6be74edd7..b7700f4147cbf29e2a47ea18f36c0bc5305aaf63 100644 (file)
--- 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 73e82b549b76ab4d4268924a5e2b7c5989bad4fe..e40b19826e9d8de14392cc01e45390f5bd4f5d4e 100644 (file)
--- 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 df1b7cc473d7e48f451c348e78e0413a439c3810..290b46be3016a6304a8bf6bdb08f91a9e176420f 100644 (file)
--- 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 f06181dd45bea2884a5301a65ab3f6ee76e3febc..1f48c70a66e373496d707daccde91b9ea0108750 100644 (file)
--- 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 7f2ba24e7f9303f17319903becf29e359deec1e3..931d848e9d6f4b5ba55a88658bfadfee10a0c2a3 100644 (file)
--- a/src/os2/slider.cpp
+++ b/src/os2/slider.cpp
@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <wx/utils.h>
 #include <wx/brush.h>
+#include <wx/scrolwin.h>
 #endif
 
 #include "wx/slider.h"

diff --git a/src/os2/stattext.cpp b/src/os2/stattext.cpp
index 5b214b098733d69fb65e94d114d3ddd10298f114..7f033e228cde316ff9f501902babf63c177e0d08 100644 (file)
--- 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 7596ef7dccac1f32e42f4b80ee4b7d44ab660eaa..139e96ccfbee3547cdede723ba4af6d6a9ebb1e9 100644 (file)
--- 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 397b10c5580d632c63dc0a976899dbdc03a701ec..1dda24c9c9dc4e3080498e527f6fffbaa31935d7 100644 (file)
--- 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 <stdio.h>
 #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