don't define WINVER as 0x0400 in configure, it's defined in the headers as 0x0600...

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

diff --git a/include/wx/mdi.h b/include/wx/mdi.h
index 9f17e533d686295545f7aa2461cf9dd462add7d4..29c861e1014f5961d35c3cbf991f8610a4e2b259 100644 (file)
--- a/include/wx/mdi.h
+++ b/include/wx/mdi.h
@@ -1,9 +1,20 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/mdi.h
+// Purpose:     wxMDI base header
+// Author:      Julian Smart
+// Modified by:
+// Created:
+// Copyright:   (c) Julian Smart
+// RCS-ID:      $Id$
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
 #ifndef _WX_MDI_H_BASE_
 #define _WX_MDI_H_BASE_
 
-#include "wx/setup.h"
+#include "wx/defs.h"
 
-#if wxUSE_MDI_ARCHITECTURE
+#if wxUSE_MDI
 
 #if defined(__WXUNIVERSAL__)
     #include "wx/generic/mdig.h"
@@ -11,8 +22,10 @@
     #include "wx/msw/mdi.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/mdi.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
     #include "wx/gtk/mdi.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/mdi.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/mdi.h"
 #elif defined(__WXCOCOA__)
@@ -21,7 +34,7 @@
     #include "wx/generic/mdig.h"
 #endif
 
-#endif // wxUSE_MDI_ARCHITECTURE
+#endif // wxUSE_MDI
 
 #endif
     // _WX_MDI_H_BASE_