fix typo in drawing slider ticks; added assert to check for it (slightly modified...

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

diff --git a/include/wx/wx.h b/include/wx/wx.h
index 6221ac02bed03544611b2e6cf07703efe3c4b92d..233ebcd16edf988bfbe4e7a18d61a1cf23078f68 100644 (file)
--- a/include/wx/wx.h
+++ b/include/wx/wx.h
@@ -23,6 +23,7 @@
 #include "wx/event.h"
 #include "wx/app.h"
 #include "wx/utils.h"
 #include "wx/event.h"
 #include "wx/app.h"
 #include "wx/utils.h"

+#include "wx/stream.h"

 
 #if wxUSE_GUI
 
 
 #if wxUSE_GUI
 


@@ -47,8 +48,11 @@
 #include "wx/msgdlg.h"
 #include "wx/cmndata.h"
 
 #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/bmpbuttn.h"
 #include "wx/checkbox.h"

+#include "wx/checklst.h"

 #include "wx/choice.h"
 #include "wx/scrolbar.h"
 #include "wx/stattext.h"
 #include "wx/choice.h"
 #include "wx/scrolbar.h"
 #include "wx/stattext.h"


@@ -59,12 +63,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,19 +80,10 @@
 
 #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
 

-#if wxUSE_SERIAL
-    #include "wx/objstrm.h"
-    #include "wx/serbase.h"
-#endif // wxUSE_SERIAL
-
-#endif // __VISAGECPP__
-

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