Further wxUniv fixes

[wxWidgets.git] / include / wx / wx.h

diff --git a/include/wx/wx.h b/include/wx/wx.h
index 6221ac02bed03544611b2e6cf07703efe3c4b92d..e53cfcdddb23fd5b7f13ece8b8286c348a2b045c 100644 (file)
--- a/include/wx/wx.h
+++ b/include/wx/wx.h
@@ -47,8 +47,11 @@
 #include "wx/msgdlg.h"
 #include "wx/cmndata.h"
 
+#include "wx/control.h"
+#include "wx/ctrlsub.h"
 #include "wx/bmpbuttn.h"
 #include "wx/checkbox.h"
+#include "wx/checklst.h"
 #include "wx/choice.h"
 #include "wx/scrolbar.h"
 #include "wx/stattext.h"
@@ -59,12 +62,10 @@
 #include "wx/radiobut.h"
 #include "wx/textctrl.h"
 #include "wx/slider.h"
-#if !defined(__VISAGECPP__) // cyclic dependency
 #include "wx/gauge.h"
 #include "wx/scrolwin.h"
 #include "wx/dirdlg.h"
 #include "wx/toolbar.h"
-#endif
 #include "wx/combobox.h"
 #include "wx/layout.h"
 #include "wx/sizer.h"
@@ -78,8 +79,6 @@
 
 #include "wx/validate.h"        // always include, even if !wxUSE_VALIDATORS
 
-#if !defined(__VISAGECPP__) // cyclic dependency
-
 #if wxUSE_VALIDATORS
     #include "wx/valtext.h"
 #endif // wxUSE_VALIDATORS
@@ -89,8 +88,6 @@
     #include "wx/serbase.h"
 #endif // wxUSE_SERIAL
 
-#endif // __VISAGECPP__
-
 #endif // wxUSE_GUI
 
 #endif