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

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

diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h
index 397642e1897b47b6c497605a503025c50f296b3c..8c367fb9b6347ff6a1873cdff1e6eb88b623b73a 100644 (file)
--- a/include/wx/msgdlg.h
+++ b/include/wx/msgdlg.h
@@ -1,18 +1,18 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/msgdlgg.h
 // Purpose:     common header and base class for wxMessageDialog
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/msgdlgg.h
 // Purpose:     common header and base class for wxMessageDialog

-// Author:      wxWidgets Team
+// Author:      Julian Smart

 // Modified by:
 // Created:
 // RCS-ID:      $Id$
 // Modified by:
 // Created:
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWidgets
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSGDLG_H_BASE_
 #define _WX_MSGDLG_H_BASE_
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSGDLG_H_BASE_
 #define _WX_MSGDLG_H_BASE_
 

-#include "wx/setup.h"
+#include "wx/defs.h"

 
 #if wxUSE_MSGDLG
 
 
 #if wxUSE_MSGDLG
 


@@ -39,7 +39,9 @@ private:
     long m_dialogStyle;
 };
 
     long m_dialogStyle;
 };
 

-#if defined(__WXUNIVERSAL__) || defined(__WXGPE__)
+#if defined(__WX_COMPILING_MSGDLGG_CPP__)
+#include "wx/generic/msgdlgg.h"
+#elif defined(__WXUNIVERSAL__) || defined(__WXGPE__)

 #include "wx/generic/msgdlgg.h"
 #elif defined(__WXPALMOS__)
 #include "wx/palmos/msgdlg.h"
 #include "wx/generic/msgdlgg.h"
 #elif defined(__WXPALMOS__)
 #include "wx/palmos/msgdlg.h"


@@ -47,10 +49,12 @@ private:
 #include "wx/msw/msgdlg.h"
 #elif defined(__WXMOTIF__)
 #include "wx/motif/msgdlg.h"
 #include "wx/msw/msgdlg.h"
 #elif defined(__WXMOTIF__)
 #include "wx/motif/msgdlg.h"

-#elif defined(__WXGTK__) && defined(__WXGTK20__)
+#elif defined(__WXGTK20__)

 #include "wx/gtk/msgdlg.h"
 #elif defined(__WXGTK__)
 #include "wx/generic/msgdlgg.h"
 #include "wx/gtk/msgdlg.h"
 #elif defined(__WXGTK__)
 #include "wx/generic/msgdlgg.h"

+#elif defined(__WXGTK__)
+#include "wx/generic/msgdlgg.h"

 #elif defined(__WXMAC__)
 #include "wx/mac/msgdlg.h"
 #elif defined(__WXCOCOA__)
 #elif defined(__WXMAC__)
 #include "wx/mac/msgdlg.h"
 #elif defined(__WXCOCOA__)