OS/2 updates for debugging and statusbar processing

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

diff --git a/include/wx/wx.h b/include/wx/wx.h
index 719a25e9641ca716480a9f7a07babe0a8dbe63d0..6221ac02bed03544611b2e6cf07703efe3c4b92d 100644 (file)
--- a/include/wx/wx.h
+++ b/include/wx/wx.h
@@ -1,3 +1,6 @@
+#ifndef _WX_WXH__
+#define _WX_WXH__
+
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx.h
 // Purpose:     wxWindows main include file
@@ -9,9 +12,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_WXH__
-#define _WX_WXH__
-
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/dynarray.h"
@@ -59,23 +59,27 @@
 #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"
 #include "wx/memory.h"
 #include "wx/mdi.h"
-#include "wx/scrolwin.h"
 #include "wx/statusbr.h"
 #include "wx/scrolbar.h"
 #include "wx/choicdlg.h"
 #include "wx/textdlg.h"
 #include "wx/filedlg.h"
-#include "wx/dirdlg.h"
-#include "wx/toolbar.h"
 
 #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
@@ -85,6 +89,8 @@
     #include "wx/serbase.h"
 #endif // wxUSE_SERIAL
 
+#endif // __VISAGECPP__
+
 #endif // wxUSE_GUI
 
 #endif