new makefile

[wxWidgets.git] / src / generic / msgdlgg.cpp

diff --git a/src/generic/msgdlgg.cpp b/src/generic/msgdlgg.cpp
index deb4be56779fe823c4c94a12e50a70178260f6eb..0326abef58c385f7cbd8a0a3f2dc9997c5ff051a 100644 (file)
--- a/src/generic/msgdlgg.cpp
+++ b/src/generic/msgdlgg.cpp
@@ -20,6 +20,8 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

+#if wxUSE_MSGDLG
+

 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dialog.h"
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dialog.h"


@@ -37,6 +39,7 @@
 #include <string.h>
 
 #include "wx/generic/msgdlgg.h"
 #include <string.h>
 
 #include "wx/generic/msgdlgg.h"

+#include "wx/artprov.h"

 
 #if wxUSE_STATLINE
   #include "wx/statline.h"
 
 #if wxUSE_STATLINE
   #include "wx/statline.h"


@@ -63,8 +66,6 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent,
 {
     m_dialogStyle = style;
 
 {
     m_dialogStyle = style;
 

-    wxBeginBusyCursor();
-

     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 
     wxBoxSizer *icon_text = new wxBoxSizer( wxHORIZONTAL );
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 
     wxBoxSizer *icon_text = new wxBoxSizer( wxHORIZONTAL );


@@ -72,9 +73,22 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent,
     // 1) icon
     if (style & wxICON_MASK)
     {
     // 1) icon
     if (style & wxICON_MASK)
     {

-         wxStaticBitmap *icon = new wxStaticBitmap(
-            this, -1, wxTheApp->GetStdIcon((int)(style & wxICON_MASK)));
-         icon_text->Add( icon, 0, wxCENTER );
+        wxBitmap bitmap;
+        switch ( style & wxICON_MASK )
+        {
+            case wxICON_ERROR:
+                bitmap = wxArtProvider::GetIcon(wxART_ERROR, wxART_MESSAGE_BOX); break;
+            case wxICON_INFORMATION:
+                bitmap = wxArtProvider::GetIcon(wxART_INFORMATION, wxART_MESSAGE_BOX); break;
+            case wxICON_WARNING:
+                bitmap = wxArtProvider::GetIcon(wxART_WARNING, wxART_MESSAGE_BOX); break;
+            case wxICON_QUESTION:
+                bitmap = wxArtProvider::GetIcon(wxART_QUESTION, wxART_MESSAGE_BOX); break;
+            default:
+                wxFAIL_MSG(_T("incorrect log style"));
+        }
+        wxStaticBitmap *icon = new wxStaticBitmap(this, -1, bitmap);
+        icon_text->Add( icon, 0, wxCENTER );

     }
 
     // 2) text
     }
 
     // 2) text


@@ -99,12 +113,10 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent,
     if (size.x < size.y*3/2)
     {
         size.x = size.y*3/2;
     if (size.x < size.y*3/2)
     {
         size.x = size.y*3/2;

-       SetSize( size );
+        SetSize( size );

     }
 
     Centre( wxBOTH | wxCENTER_FRAME);
     }
 
     Centre( wxBOTH | wxCENTER_FRAME);

-
-    wxEndBusyCursor();

 }
 
 void wxGenericMessageDialog::OnYes(wxCommandEvent& WXUNUSED(event))
 }
 
 void wxGenericMessageDialog::OnYes(wxCommandEvent& WXUNUSED(event))


@@ -127,4 +139,5 @@ void wxGenericMessageDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
     }
 }
 
     }
 }
 

+#endif // wxUSE_MSGDLG