X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/585266618c27ac77a5e5316c03e06ffc514715c9..94311eef78b66304c9a2f78bcbdd396c798f19a6:/src/generic/msgdlgg.cpp

diff --git a/src/generic/msgdlgg.cpp b/src/generic/msgdlgg.cpp
index f5abedfa17..467ce46b18 100644
--- a/src/generic/msgdlgg.cpp
+++ b/src/generic/msgdlgg.cpp
@@ -20,6 +20,8 @@
 #pragma hdrstop
 #endif
 
+#if wxUSE_MSGDLG
+
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dialog.h"
@@ -37,6 +39,8 @@
 #include <string.h>
 
 #include "wx/generic/msgdlgg.h"
+#include "wx/artprov.h"
+#include "wx/settings.h"
 
 #if wxUSE_STATLINE
   #include "wx/statline.h"
@@ -63,6 +67,8 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent,
 {
     m_dialogStyle = style;
 
+    bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
+
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 
     wxBoxSizer *icon_text = new wxBoxSizer( wxHORIZONTAL );
@@ -70,15 +76,40 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent,
     // 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 )
+        {
+            default:
+                wxFAIL_MSG(_T("incorrect log style"));
+                // fall through
+
+            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;
+        }
+        wxStaticBitmap *icon = new wxStaticBitmap(this, -1, bitmap);
+        if (is_pda)
+            topsizer->Add( icon, 0, wxTOP|wxLEFT|wxRIGHT | wxALIGN_LEFT, 10 );
+        else
+            icon_text->Add( icon, 0, wxCENTER );
     }
 
     // 2) text
     icon_text->Add( CreateTextSizer( message ), 0, wxCENTER | wxLEFT, 10 );
 
-    topsizer->Add( icon_text, 0, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 );
+    topsizer->Add( icon_text, 1, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 );
 
 #if wxUSE_STATLINE
     // 3) static line
@@ -115,12 +146,13 @@ void wxGenericMessageDialog::OnNo(wxCommandEvent& WXUNUSED(event))
 
 void wxGenericMessageDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
 {
-    /* Allow cancellation via ESC/Close button except if
-       only YES and NO are specified. */
+    // Allow cancellation via ESC/Close button except if
+    // only YES and NO are specified.
     if ( (m_dialogStyle & wxYES_NO) != wxYES_NO || (m_dialogStyle & wxCANCEL) )
     {
         EndModal( wxID_CANCEL );
     }
 }
 
+#endif // wxUSE_MSGDLG