X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dfad0599246651d4994e348d868a3e65613c7379..92749d6a371775580dde81fb6144f61f84a046d1:/src/generic/msgdlgg.cpp

diff --git a/src/generic/msgdlgg.cpp b/src/generic/msgdlgg.cpp
index 498dccc0b6..f4f383f676 100644
--- a/src/generic/msgdlgg.cpp
+++ b/src/generic/msgdlgg.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        msgdlgg.cpp
 // Purpose:     wxGenericMessageDialog
-// Author:      Julian Smart
+// Author:      Julian Smart, Robert Roebling
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart, Markus Holzem, Robert Roebling
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -20,14 +20,19 @@
 #pragma hdrstop
 #endif
 
+#if wxUSE_MSGDLG
+
 #ifndef WX_PRECOMP
-#include "wx/utils.h"
-#include "wx/dialog.h"
-#include "wx/listbox.h"
-#include "wx/button.h"
-#include "wx/stattext.h"
-#include "wx/layout.h"
-#include "wx/intl.h"
+    #include "wx/utils.h"
+    #include "wx/dialog.h"
+    #include "wx/button.h"
+    #include "wx/stattext.h"
+    #include "wx/statbmp.h"
+    #include "wx/layout.h"
+    #include "wx/intl.h"
+    #include "wx/icon.h"
+    #include "wx/sizer.h"
+    #include "wx/app.h"
 #endif
 
 #include <stdio.h>
@@ -35,147 +40,90 @@
 
 #include "wx/generic/msgdlgg.h"
 
-///////////////////////////////////////////////////////////////////
-// New dialog box implementations
+#if wxUSE_STATLINE
+  #include "wx/statline.h"
+#endif
 
-// Split message, using constraints to position controls
-void wxSplitMessage2(const char *message, wxList *messageList, wxWindow *parent, wxRowColSizer *sizer)
-{
-  char *copyMessage = copystring(message);
-  size_t i = 0;
-  size_t len = strlen(copyMessage);
-  char *currentMessage = copyMessage;
-
-//  wxWindow *lastWindow = parent;
-
-  while (i < len) {
-    while ((i < len) && (copyMessage[i] != '\n')) i++;
-    if (i < len) copyMessage[i] = 0;
-    wxStaticText *mess = new wxStaticText(parent, -1, currentMessage);
-
-/*
-    wxLayoutConstraints *c = new wxLayoutConstraints;
-    c->left.SameAs       	(parent, wxLeft, 10);
-    c->top.SameAs        	(lastWindow, wxBottom, 5);
-    c->right.AsIs      		();
-    c->height.AsIs			();
-
-    mess->SetConstraints(c);
-*/
-    sizer->AddSizerChild(mess);
-
-    messageList->Append(mess);
-
-    currentMessage = copyMessage + i + 1;
-  }
-  delete[] copyMessage;
-}
+// ----------------------------------------------------------------------------
+// icons
+// ----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARY
 BEGIN_EVENT_TABLE(wxGenericMessageDialog, wxDialog)
-	EVT_BUTTON(wxID_YES, wxGenericMessageDialog::OnYes)
-	EVT_BUTTON(wxID_NO, wxGenericMessageDialog::OnNo)
-	EVT_BUTTON(wxID_CANCEL, wxGenericMessageDialog::OnCancel)
+        EVT_BUTTON(wxID_YES, wxGenericMessageDialog::OnYes)
+        EVT_BUTTON(wxID_NO, wxGenericMessageDialog::OnNo)
+        EVT_BUTTON(wxID_CANCEL, wxGenericMessageDialog::OnCancel)
 END_EVENT_TABLE()
 
 IMPLEMENT_CLASS(wxGenericMessageDialog, wxDialog)
-#endif
 
-wxGenericMessageDialog::wxGenericMessageDialog(wxWindow *parent, const wxString& message, const wxString& caption,
-        long style, const wxPoint& pos):
-	wxDialog(parent, -1, caption, pos,
-#ifdef __WXMOTIF_
-           wxSize(400, 300),
-#else
-           wxDefaultSize,
-#endif
-           wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL)
+wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent,
+                                                const wxString& message,
+                                                const wxString& caption,
+                                                long style,
+                                                const wxPoint& pos)
+                      : wxDialog( parent, -1, caption, pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE )
 {
     m_dialogStyle = style;
 
-    wxBeginBusyCursor();
-
-    wxSizer *topSizer = new wxSizer(this, wxSizerShrink);
-    topSizer->SetBorder(10, 10);
-
-    wxRowColSizer *messageSizer = new wxRowColSizer(topSizer, wxSIZER_COLS, 100);
-    messageSizer->SetName("messageSizer");
-
-//    bool centre = ((style & wxCENTRE) == wxCENTRE);
-
-    wxList messageList;
-    wxSplitMessage2(message, &messageList, this, messageSizer);
-
-    // Insert a spacer
-    wxSpacingSizer *spacingSizer = new wxSpacingSizer(topSizer, wxBelow, messageSizer, 20);
+    wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 
-    wxRowColSizer *buttonSizer = new wxRowColSizer(topSizer, wxSIZER_ROWS);
-    buttonSizer->SetName("buttonSizer");
+    wxBoxSizer *icon_text = new wxBoxSizer( wxHORIZONTAL );
 
-    // Specify constraints for the button sizer
-    wxLayoutConstraints *c = new wxLayoutConstraints;
-    c->width.AsIs		();
-    c->height.AsIs		();
-    c->top.Below		(spacingSizer);
-    c->centreX.SameAs	(spacingSizer, wxCentreX);
-    buttonSizer->SetConstraints(c);
+    // 1) icon
+    if (style & wxICON_MASK)
+    {
+         wxStaticBitmap *icon = new wxStaticBitmap(
+            this, -1, wxTheApp->GetStdIcon((int)(style & wxICON_MASK)));
+         icon_text->Add( icon, 0, wxCENTER );
+    }
 
-    wxButton *ok = (wxButton *) NULL;
-    wxButton *cancel = (wxButton *) NULL;
-    wxButton *yes = (wxButton *) NULL;
-    wxButton *no = (wxButton *) NULL;
+    // 2) text
+    icon_text->Add( CreateTextSizer( message ), 0, wxCENTER | wxLEFT, 10 );
 
-    if (style & wxYES_NO) {
-       yes = new wxButton(this, wxID_YES, _("Yes"));
-       no = new wxButton(this, wxID_NO, _("No"));
+    topsizer->Add( icon_text, 0, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 );
 
-       buttonSizer->AddSizerChild(yes);
-       buttonSizer->AddSizerChild(no);
-    }
+#if wxUSE_STATLINE
+    // 3) static line
+    topsizer->Add( new wxStaticLine( this, -1 ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
+#endif
 
-    if (style & wxOK) {
-        ok = new wxButton(this, wxID_OK, _("OK"));
-        buttonSizer->AddSizerChild(ok);
-    }
+    // 4) buttons
+    topsizer->Add( CreateButtonSizer( style ), 0, wxCENTRE | wxALL, 10 );
 
-    if (style & wxCANCEL) {
-        cancel = new wxButton(this, wxID_CANCEL, _("Cancel"));
-        buttonSizer->AddSizerChild(cancel);
-    }
+    SetAutoLayout( TRUE );
+    SetSizer( topsizer );
 
-    if (ok)
+    topsizer->SetSizeHints( this );
+    topsizer->Fit( this );
+    wxSize size( GetSize() );
+    if (size.x < size.y*3/2)
     {
-      ok->SetDefault();
-      ok->SetFocus();
+        size.x = size.y*3/2;
+        SetSize( size );
     }
-    else if (yes)
-    {
-      yes->SetDefault();
-      yes->SetFocus();
-    }
-
-    Layout();
-    Centre(wxBOTH);
 
-    wxEndBusyCursor();
+    Centre( wxBOTH | wxCENTER_FRAME);
 }
 
 void wxGenericMessageDialog::OnYes(wxCommandEvent& WXUNUSED(event))
 {
-    EndModal(wxID_YES);
+    EndModal( wxID_YES );
 }
 
 void wxGenericMessageDialog::OnNo(wxCommandEvent& WXUNUSED(event))
 {
-    EndModal(wxID_NO);
+    EndModal( wxID_NO );
 }
 
 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);
+    {
+        EndModal( wxID_CANCEL );
+    }
 }
 
+#endif // wxUSE_MSGDLG