Added GetBitmap, GetIcon to wxImageList

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

diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h
index 48d1a3c214d686684817822772c0114ca841a5ad..0223e2911561ce8776251b5560a83fc8abce6d75 100644 (file)
--- a/include/wx/msgdlg.h
+++ b/include/wx/msgdlg.h
@@ -1,22 +1,28 @@
 #ifndef _WX_MSGDLG_H_BASE_
 #define _WX_MSGDLG_H_BASE_
 
 #ifndef _WX_MSGDLG_H_BASE_
 #define _WX_MSGDLG_H_BASE_
 

+#include "wx/setup.h"
+

 #if wxUSE_MSGDLG
 
 #if wxUSE_MSGDLG
 

-#if defined(__WXMSW__)
+#if defined(__WXUNIVERSAL__) || defined(__WXGPE__)
+#include "wx/generic/msgdlgg.h"
+#elif defined(__WXPALMOS__)
+#include "wx/palmos/msgdlg.h"
+#elif defined(__WXMSW__)

 #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__)
+#include "wx/gtk/msgdlg.h"

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

-#elif defined(__WXQT__)
-#include "wx/generic/msgdlgg.h"

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

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

 #elif defined(__WXPM__)
 #include "wx/os2/msgdlg.h"
 #elif defined(__WXPM__)
 #include "wx/os2/msgdlg.h"

-#elif defined(__WXSTUBS__)
-#include "wx/generic/msgdlgg.h"

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -27,7 +33,7 @@ int WXDLLEXPORT wxMessageBox(const wxString& message,
                             const wxString& caption = wxMessageBoxCaptionStr,
                             long style = wxOK | wxCENTRE,
                             wxWindow *parent = NULL,
                             const wxString& caption = wxMessageBoxCaptionStr,
                             long style = wxOK | wxCENTRE,
                             wxWindow *parent = NULL,

-                            int x = -1, int y = -1);
+                            int x = wxDefaultCoord, int y = wxDefaultCoord);

 
 #endif // wxUSE_MSGDLG
 
 
 #endif // wxUSE_MSGDLG