fixed gcc warnings and reformatted some pieces of code to be a bit readable

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

diff --git a/include/wx/mdi.h b/include/wx/mdi.h
index 40d7abf66c5f8d68d63728ad923824ebcbcce7d5..3223c7cb2e63c73fe3f3755833849b8fc8b5cd22 100644 (file)
--- a/include/wx/mdi.h
+++ b/include/wx/mdi.h
@@ -1,21 +1,27 @@
 #ifndef _WX_MDI_H_BASE_
 #define _WX_MDI_H_BASE_
 
 #ifndef _WX_MDI_H_BASE_
 #define _WX_MDI_H_BASE_
 

-#if defined(__WXMSW__)
-#include "wx/msw/mdi.h"
+#include "wx/setup.h"
+
+#if wxUSE_MDI_ARCHITECTURE
+
+#if defined(__WXUNIVERSAL__)
+    #include "wx/generic/mdig.h"
+#elif defined(__WXMSW__)
+    #include "wx/msw/mdi.h"

 #elif defined(__WXMOTIF__)
 #elif defined(__WXMOTIF__)

-#include "wx/motif/mdi.h"
+    #include "wx/motif/mdi.h"

 #elif defined(__WXGTK__)
 #elif defined(__WXGTK__)

-#include "wx/gtk/mdi.h"
-#elif defined(__WXQT__)
-#include "wx/qt/mdi.h"
+    #include "wx/gtk/mdi.h"

 #elif defined(__WXMAC__)
 #elif defined(__WXMAC__)

-#include "wx/mac/mdi.h"
+    #include "wx/mac/mdi.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/generic/mdig.h"

 #elif defined(__WXPM__)
 #elif defined(__WXPM__)

-#include "wx/os2/mdi.h"
-#elif defined(__WXSTUBS__)
-#include "wx/stubs/mdi.h"
+    #include "wx/generic/mdig.h"

 #endif
 
 #endif
 

+#endif // wxUSE_MDI_ARCHITECTURE
+

 #endif
     // _WX_MDI_H_BASE_
 #endif
     // _WX_MDI_H_BASE_