fix watcom 64 bug (openwatcom1.1) (second try)

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

diff --git a/src/generic/msgdlgg.cpp b/src/generic/msgdlgg.cpp
index f5abedfa17dd30abc1f5fcf5af0cf91e235fd41e..7e2d9de6c0021ee5d75740f398ec53144e9429ca 100644 (file)
--- a/src/generic/msgdlgg.cpp
+++ b/src/generic/msgdlgg.cpp
@@ -5,11 +5,11 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart, Markus Holzem, Robert Roebling
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart and Robert Roebling
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "msgdlgg.h"
 #endif
 
 #pragma implementation "msgdlgg.h"
 #endif
 


@@ -20,6 +20,8 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

+#if wxUSE_MSGDLG && !defined(__WXGTK20__)
+

 #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,8 @@
 #include <string.h>
 
 #include "wx/generic/msgdlgg.h"
 #include <string.h>
 
 #include "wx/generic/msgdlgg.h"

+#include "wx/artprov.h"
+#include "wx/settings.h"

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


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

+#if wxUSE_STATIC_BITMAP
+    bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
+#endif
+

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


@@ -70,15 +78,44 @@ 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 )
+        {
+            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;
+        }
+#if wxUSE_STATIC_BITMAP
+        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 );
+#endif

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

+#if wxUSE_STATTEXT // && wxUSE_TEXTCTRL

     icon_text->Add( CreateTextSizer( message ), 0, wxCENTER | wxLEFT, 10 );
     icon_text->Add( CreateTextSizer( message ), 0, wxCENTER | wxLEFT, 10 );

+#endif

 
 

-    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
 
 #if wxUSE_STATLINE
     // 3) static line


@@ -86,7 +123,9 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent,
 #endif
 
     // 4) buttons
 #endif
 
     // 4) buttons

+#if wxUSE_BUTTON

     topsizer->Add( CreateButtonSizer( style ), 0, wxCENTRE | wxALL, 10 );
     topsizer->Add( CreateButtonSizer( style ), 0, wxCENTRE | wxALL, 10 );

+ #endif

 
     SetAutoLayout( TRUE );
     SetSizer( topsizer );
 
     SetAutoLayout( TRUE );
     SetSizer( topsizer );


@@ -115,12 +154,13 @@ void wxGenericMessageDialog::OnNo(wxCommandEvent& WXUNUSED(event))
 
 void wxGenericMessageDialog::OnCancel(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 );
     }
 }
 
     if ( (m_dialogStyle & wxYES_NO) != wxYES_NO || (m_dialogStyle & wxCANCEL) )
     {
         EndModal( wxID_CANCEL );
     }
 }
 

+#endif // wxUSE_MSGDLG && !defined(__WXGTK20__)