Applied [ 716064 ] Second part of wxFileCtrl & wxDirCtrl patch

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

diff --git a/include/wx/wx.h b/include/wx/wx.h
index 719a25e9641ca716480a9f7a07babe0a8dbe63d0..ea22b3b1bf0502ec354a0f14dbd6655311d3475b 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
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx.h
 // Purpose:     wxWindows main include file


@@ -9,9 +12,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef _WX_WXH__
-#define _WX_WXH__
-

 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/dynarray.h"
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/dynarray.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"


@@ -60,31 +64,25 @@
 #include "wx/textctrl.h"
 #include "wx/slider.h"
 #include "wx/gauge.h"
 #include "wx/textctrl.h"
 #include "wx/slider.h"
 #include "wx/gauge.h"

+#include "wx/scrolwin.h"
+#include "wx/dirdlg.h"
+#include "wx/toolbar.h"

 #include "wx/combobox.h"
 #include "wx/layout.h"
 #include "wx/sizer.h"
 #include "wx/memory.h"
 #include "wx/mdi.h"
 #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/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 wxUSE_VALIDATORS
     #include "wx/valtext.h"
 #endif // wxUSE_VALIDATORS
 
 #include "wx/validate.h"        // always include, even if !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 // wxUSE_GUI
 
 #endif
 #endif // wxUSE_GUI
 
 #endif