* prgodlgg.h: Update() use wxString instead of 'char *'

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

diff --git a/src/generic/msgdlgg.cpp b/src/generic/msgdlgg.cpp
index d2339efb44526dff2404daf985f003cf5adc250f..a62f4797484538a356683b647c6e19d7fe0773de 100644 (file)
--- a/src/generic/msgdlgg.cpp
+++ b/src/generic/msgdlgg.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart, Markus Holzem, Robert Roebling
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart, Markus Holzem, Robert Roebling

-// Licence:    wxWindows license
+// Licence:           wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -35,6 +35,10 @@
 
 #include "wx/generic/msgdlgg.h"
 
 
 #include "wx/generic/msgdlgg.h"
 

+#ifdef __WXGTK__
+#include "wx/statline.h"
+#endif
+

 ///////////////////////////////////////////////////////////////////
 // New dialog box implementations
 
 ///////////////////////////////////////////////////////////////////
 // New dialog box implementations
 


@@ -47,29 +51,29 @@ wxSize wxSplitMessage2( const wxString &message, wxWindow *parent )
     for (uint pos = 0; pos < message.Len(); pos++)
     {
         if (message[pos] == _T('\n'))
     for (uint pos = 0; pos < message.Len(); pos++)
     {
         if (message[pos] == _T('\n'))

-       {
-           if (!line.IsEmpty())
-           {
-               wxStaticText *s1 = new wxStaticText( parent, -1, line, wxPoint(15,y) );
-               wxSize size1( s1->GetSize() );
-               if (size1.x > w) w = size1.x;
-               line = _T("");
-           }
-           y += 18;
-       }
-       else
-       {
-           line += message[pos];
-       }
+        {
+            if (!line.IsEmpty())
+            {
+                wxStaticText *s1 = new wxStaticText( parent, -1, line, wxPoint(15,y) );
+                wxSize size1( s1->GetSize() );
+                if (size1.x > w) w = size1.x;
+                line = _T("");
+            }
+            y += 18;
+        }
+        else
+        {
+            line += message[pos];
+        }

     }
     
     if (!line.IsEmpty())
     {
     }
     
     if (!line.IsEmpty())
     {

-       wxStaticText *s2 = new wxStaticText( parent, -1, line, wxPoint(15,y) );
-       wxSize size2( s2->GetSize() );
-       if (size2.x > w) w = size2.x;
+        wxStaticText *s2 = new wxStaticText( parent, -1, line, wxPoint(15,y) );
+        wxSize size2( s2->GetSize() );
+        if (size2.x > w) w = size2.x;

     }
     }

-       
+        

     y += 18;
     
     return wxSize(w+30,y);
     y += 18;
     
     return wxSize(w+30,y);


@@ -77,9 +81,9 @@ wxSize wxSplitMessage2( const wxString &message, wxWindow *parent )
 
 #if !USE_SHARED_LIBRARY
 BEGIN_EVENT_TABLE(wxGenericMessageDialog, wxDialog)
 
 #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)
 END_EVENT_TABLE()
 
 IMPLEMENT_CLASS(wxGenericMessageDialog, wxDialog)


@@ -87,7 +91,7 @@ IMPLEMENT_CLASS(wxGenericMessageDialog, wxDialog)
 
 wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent, const wxString& message, 
    const wxString& caption, long style, const wxPoint& pos) :
 
 wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent, const wxString& message, 
    const wxString& caption, long style, const wxPoint& pos) :

-  wxDialog( parent, -1, caption, pos, wxDefaultSize )
+  wxDialog( parent, -1, caption, pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE )

 {
     m_dialogStyle = style;
 
 {
     m_dialogStyle = style;
 


@@ -103,21 +107,21 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent, const wxString
     if (style & wxYES_NO) 
     {
         yes = new wxButton( this, wxID_YES, _("Yes"), wxPoint(-1,y), wxSize(80,-1) );
     if (style & wxYES_NO) 
     {
         yes = new wxButton( this, wxID_YES, _("Yes"), wxPoint(-1,y), wxSize(80,-1) );

-       m_buttons.Append( yes );
+        m_buttons.Append( yes );

         no = new wxButton( this, wxID_NO, _("No"), wxPoint(-1,y), wxSize(80,-1) );
         no = new wxButton( this, wxID_NO, _("No"), wxPoint(-1,y), wxSize(80,-1) );

-       m_buttons.Append( no );
+        m_buttons.Append( no );

     }
 
     if (style & wxOK) 
     {
         ok = new wxButton( this, wxID_OK, _("OK"), wxPoint(-1,y), wxSize(80,-1) );
     }
 
     if (style & wxOK) 
     {
         ok = new wxButton( this, wxID_OK, _("OK"), wxPoint(-1,y), wxSize(80,-1) );

-       m_buttons.Append( ok );
+        m_buttons.Append( ok );

     }
 
     if (style & wxCANCEL) 
     {
         cancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxPoint(-1,y), wxSize(80,-1) );
     }
 
     if (style & wxCANCEL) 
     {
         cancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxPoint(-1,y), wxSize(80,-1) );

-       m_buttons.Append( cancel );
+        m_buttons.Append( cancel );

     }
 
     if (ok)
     }
 
     if (ok)


@@ -140,12 +144,16 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent, const wxString
     while (node)
     {
         wxWindow *win = (wxWindow*)node->Data();
     while (node)
     {
         wxWindow *win = (wxWindow*)node->Data();

-       int x = (n*2+1)*space - 40 + 15;
-       win->Move( x, -1 );
+        int x = (n*2+1)*space - 40 + 15;
+        win->Move( x, -1 );

         node = node->Next();
         node = node->Next();

-       n++;
+        n++;

     }
     
     }
     

+#ifdef __WXGTK__
+    (void) new wxStaticLine( this, -1, wxPoint(0,y-20), wxSize(w+30, 5) );
+#endif
+    

     SetSize( w+30, y+40 );
 
     Centre( wxBOTH );
     SetSize( w+30, y+40 );
 
     Centre( wxBOTH );