-#if defined(__WXMSW__)
- #include "wx/msw/frame.h"
-#elif defined(__WXMOTIF__)
- #include "wx/motif/frame.h"
-#elif defined(__WXGTK__)
- #include "wx/gtk/frame.h"
-#elif defined(__WXQT__)
- #include "wx/qt/frame.h"
-#elif defined(__WXMAC__)
- #include "wx/mac/frame.h"
-#elif defined(__WXPM__)
- #include "wx/os2/frame.h"
-#elif defined(__WXSTUBS__)
- #include "wx/stubs/frame.h"
+#if defined(__WXUNIVERSAL__) // && !defined(__WXMICROWIN__)
+ #include "wx/univ/frame.h"
+#else // !__WXUNIVERSAL__
+ #if defined(__WXMSW__)
+ #include "wx/msw/frame.h"
+ #elif defined(__WXGTK20__)
+ #include "wx/gtk/frame.h"
+ #elif defined(__WXGTK__)
+ #include "wx/gtk1/frame.h"
+ #elif defined(__WXMOTIF__)
+ #include "wx/motif/frame.h"
+ #elif defined(__WXMAC__)
+ #include "wx/osx/frame.h"
+ #elif defined(__WXCOCOA__)
+ #include "wx/cocoa/frame.h"
+ #elif defined(__WXPM__)
+ #include "wx/os2/frame.h"
+ #endif