no real change; just add the standard separator where it's missing

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

diff --git a/src/generic/msgdlgg.cpp b/src/generic/msgdlgg.cpp
index deb4be56779fe823c4c94a12e50a70178260f6eb..d479248158ec6ea848b71ab9342be4e30b4cca5c 100644 (file)
--- a/src/generic/msgdlgg.cpp
+++ b/src/generic/msgdlgg.cpp
@@ -1,18 +1,14 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msgdlgg.cpp
+// Name:        src/generic/msgdlgg.cpp

 // Purpose:     wxGenericMessageDialog
 // Author:      Julian Smart, Robert Roebling
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Purpose:     wxGenericMessageDialog
 // Author:      Julian Smart, Robert Roebling
 // 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__
-#pragma implementation "msgdlgg.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


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

+#if wxUSE_MSGDLG && (!defined(__WXGTK20__) || defined(__WXUNIVERSAL__) || defined(__WXGPE__))
+

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


@@ -31,15 +29,18 @@
     #include "wx/icon.h"
     #include "wx/sizer.h"
     #include "wx/app.h"
     #include "wx/icon.h"
     #include "wx/sizer.h"
     #include "wx/app.h"

+    #include "wx/settings.h"

 #endif
 
 #include <stdio.h>
 #include <string.h>
 
 #endif
 
 #include <stdio.h>
 #include <string.h>
 

-#include "wx/generic/msgdlgg.h"
+#define __WX_COMPILING_MSGDLGG_CPP__ 1
+#include "wx/msgdlg.h"
+#include "wx/artprov.h"

 
 #if wxUSE_STATLINE
 
 #if wxUSE_STATLINE

-  #include "wx/statline.h"
+    #include "wx/statline.h"

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


@@ -59,38 +60,58 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent,
                                                 const wxString& caption,
                                                 long style,
                                                 const wxPoint& pos)
                                                 const wxString& caption,
                                                 long style,
                                                 const wxPoint& pos)

-                      : wxDialog( parent, -1, caption, pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE )
+                      : wxMessageDialogBase(GetParentForModalDialog(parent),
+                                            message,
+                                            caption,
+                                            style),
+                        m_pos(pos)
+{
+    m_created = false;
+}
+
+void wxGenericMessageDialog::DoCreateMsgdialog()

 {
 {

-    m_dialogStyle = style;
+    wxDialog::Create(m_parent, wxID_ANY, m_caption, m_pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE);

 
 

-    wxBeginBusyCursor();
+    bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);

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

+#if wxUSE_STATBMP

     // 1) icon
     // 1) icon

-    if (style & wxICON_MASK)
+    if (m_dialogStyle & wxICON_MASK)

     {
     {

-         wxStaticBitmap *icon = new wxStaticBitmap(
-            this, -1, wxTheApp->GetStdIcon((int)(style & wxICON_MASK)));
-         icon_text->Add( icon, 0, wxCENTER );
+        wxStaticBitmap *icon = new wxStaticBitmap
+                                   (
+                                    this,
+                                    wxID_ANY,
+                                    wxArtProvider::GetMessageBoxIcon(m_dialogStyle)
+                                   );
+        if (is_pda)
+            topsizer->Add( icon, 0, wxTOP|wxLEFT|wxRIGHT | wxALIGN_LEFT, 10 );
+        else
+            icon_text->Add( icon, 0, wxCENTER );

     }
     }

+#endif // wxUSE_STATBMP

 
 

+#if wxUSE_STATTEXT

     // 2) text
     // 2) text

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

 
 

-    topsizer->Add( icon_text, 0, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 );
+    topsizer->Add( icon_text, 1, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 );
+#endif // wxUSE_STATTEXT

 
 

-#if wxUSE_STATLINE
-    // 3) static line
-    topsizer->Add( new wxStaticLine( this, -1 ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
-#endif
+    // 3) buttons
+    int center_flag = wxEXPAND;
+    if (m_dialogStyle & wxYES_NO)
+        center_flag = wxALIGN_CENTRE;
+    wxSizer *sizerBtn = CreateSeparatedButtonSizer(m_dialogStyle & ButtonSizerFlags);
+    if ( sizerBtn )
+        topsizer->Add(sizerBtn, 0, center_flag | wxALL, 10 );

 
 

-    // 4) buttons
-    topsizer->Add( CreateButtonSizer( style ), 0, wxCENTRE | wxALL, 10 );
-
-    SetAutoLayout( TRUE );
+    SetAutoLayout( true );

     SetSizer( topsizer );
 
     topsizer->SetSizeHints( this );
     SetSizer( topsizer );
 
     topsizer->SetSizeHints( this );


@@ -99,12 +120,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))


@@ -119,12 +138,24 @@ 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. */
-    if ( (m_dialogStyle & wxYES_NO) != wxYES_NO || (m_dialogStyle & wxCANCEL) )
+    // Allow cancellation via ESC/Close button except if
+    // only YES and NO are specified.
+    const long style = GetMessageDialogStyle();
+    if ( (style & wxYES_NO) != wxYES_NO || (style & wxCANCEL) )

     {
         EndModal( wxID_CANCEL );
     }
 }
 
     {
         EndModal( wxID_CANCEL );
     }
 }
 

+int wxGenericMessageDialog::ShowModal()
+{
+    if ( !m_created )
+    {
+        m_created = true;
+        DoCreateMsgdialog();
+    }
+
+    return wxMessageDialogBase::ShowModal();
+}

 
 

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