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

@@ -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"

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"

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"

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

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"

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"

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
 

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

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"

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"

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
-
-

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"

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