rewrote wxFileName::Normalize(), added a few methods, general clean up,

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

diff --git a/include/wx/wx.h b/include/wx/wx.h
index 6221ac02bed03544611b2e6cf07703efe3c4b92d..5cdeec77c43a159afe9ca944f60a0757b3b15453 100644 (file)
--- a/include/wx/wx.h
+++ b/include/wx/wx.h
@@ -59,12 +59,10 @@
 #include "wx/radiobut.h"
 #include "wx/textctrl.h"
 #include "wx/slider.h"
 #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"
 #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/combobox.h"
 #include "wx/layout.h"
 #include "wx/sizer.h"


@@ -78,8 +76,6 @@
 
 #include "wx/validate.h"        // always include, even if !wxUSE_VALIDATORS
 
 
 #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
 #if wxUSE_VALIDATORS
     #include "wx/valtext.h"
 #endif // wxUSE_VALIDATORS


@@ -89,8 +85,6 @@
     #include "wx/serbase.h"
 #endif // wxUSE_SERIAL
 
     #include "wx/serbase.h"
 #endif // wxUSE_SERIAL
 

-#endif // __VISAGECPP__
-

 #endif // wxUSE_GUI
 
 #endif
 #endif // wxUSE_GUI
 
 #endif