Various wxUniversal/wxMicroWindows fixes

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

src/univ/themes/win32.cpp

@@ -35,6 +35,7 @@
     #include "wx/button.h"
     #include "wx/listbox.h"
     #include "wx/checklst.h"
+    #include "wx/combobox.h"
     #include "wx/scrolbar.h"
     #include "wx/slider.h"
     #include "wx/textctrl.h"
@@ -42,6 +43,7 @@
 
 #include "wx/notebook.h"
 #include "wx/spinbutt.h"
+#include "wx/settings.h"
 
 #include "wx/univ/scrtimer.h"