new file added

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

diff --git a/src/generic/msgdlgg.cpp b/src/generic/msgdlgg.cpp
index 9ba2ee10d89746e2360e2aeac56fbce435bf338a..c3dd7a8067f28e0ec8b74adbc634c28870bc3af1 100644 (file)
--- a/src/generic/msgdlgg.cpp
+++ b/src/generic/msgdlgg.cpp
@@ -74,6 +74,7 @@ protected:
 BEGIN_EVENT_TABLE(wxGenericMessageDialog, wxDialog)
         EVT_BUTTON(wxID_YES, wxGenericMessageDialog::OnYes)
         EVT_BUTTON(wxID_NO, wxGenericMessageDialog::OnNo)
 BEGIN_EVENT_TABLE(wxGenericMessageDialog, wxDialog)
         EVT_BUTTON(wxID_YES, wxGenericMessageDialog::OnYes)
         EVT_BUTTON(wxID_NO, wxGenericMessageDialog::OnNo)

+        EVT_BUTTON(wxID_HELP, wxGenericMessageDialog::OnHelp)

         EVT_BUTTON(wxID_CANCEL, wxGenericMessageDialog::OnCancel)
 END_EVENT_TABLE()
 
         EVT_BUTTON(wxID_CANCEL, wxGenericMessageDialog::OnCancel)
 END_EVENT_TABLE()
 


@@ -133,6 +134,13 @@ wxSizer *wxGenericMessageDialog::CreateMsgDlgButtonSizer()
                 btnDef = yes;
         }
 
                 btnDef = yes;
         }
 

+        if ( m_dialogStyle & wxHELP )
+        {
+            wxButton * const
+                help = new wxButton(this, wxID_HELP, GetCustomHelpLabel());
+            sizerStd->AddButton(help);
+        }
+

         if ( btnDef )
         {
             btnDef->SetDefault();
         if ( btnDef )
         {
             btnDef->SetDefault();


@@ -148,7 +156,7 @@ wxSizer *wxGenericMessageDialog::CreateMsgDlgButtonSizer()
     // Use standard labels for all buttons
     return CreateSeparatedButtonSizer
            (
     // Use standard labels for all buttons
     return CreateSeparatedButtonSizer
            (

-                m_dialogStyle & (wxOK | wxCANCEL | wxYES_NO |
+                m_dialogStyle & (wxOK | wxCANCEL | wxHELP | wxYES_NO |

                                  wxNO_DEFAULT | wxCANCEL_DEFAULT)
            );
 }
                                  wxNO_DEFAULT | wxCANCEL_DEFAULT)
            );
 }


@@ -205,7 +213,7 @@ void wxGenericMessageDialog::DoCreateMsgdialog()
     textsizer->Add(CreateTextSizer(lowerMessage));
 
     icon_text->Add(textsizer, 0, wxALIGN_CENTER, 10);
     textsizer->Add(CreateTextSizer(lowerMessage));
 
     icon_text->Add(textsizer, 0, wxALIGN_CENTER, 10);

-    topsizer->Add( icon_text, 1, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 );
+    topsizer->Add( icon_text, 1, wxLEFT|wxRIGHT|wxTOP, 10 );

 #endif // wxUSE_STATTEXT
 
     // 3) optional checkbox and detailed text
 #endif // wxUSE_STATTEXT
 
     // 3) optional checkbox and detailed text


@@ -213,12 +221,9 @@ void wxGenericMessageDialog::DoCreateMsgdialog()
     AddMessageDialogDetails( topsizer );
 
     // 4) buttons
     AddMessageDialogDetails( topsizer );
 
     // 4) buttons

-    int center_flag = wxEXPAND;
-    if (m_dialogStyle & wxYES_NO)
-        center_flag = wxALIGN_CENTRE;

     wxSizer *sizerBtn = CreateMsgDlgButtonSizer();
     if ( sizerBtn )
     wxSizer *sizerBtn = CreateMsgDlgButtonSizer();
     if ( sizerBtn )

-        topsizer->Add(sizerBtn, 0, center_flag | wxALL, 10 );
+        topsizer->Add(sizerBtn, 0, wxEXPAND | wxALL, 10 );

 
     SetAutoLayout( true );
     SetSizer( topsizer );
 
     SetAutoLayout( true );
     SetSizer( topsizer );


@@ -245,6 +250,11 @@ void wxGenericMessageDialog::OnNo(wxCommandEvent& WXUNUSED(event))
     EndModal( wxID_NO );
 }
 
     EndModal( wxID_NO );
 }
 

+void wxGenericMessageDialog::OnHelp(wxCommandEvent& WXUNUSED(event))
+{
+    EndModal( wxID_HELP );
+}
+

 void wxGenericMessageDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
 {
     // Allow cancellation via ESC/Close button except if
 void wxGenericMessageDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
 {
     // Allow cancellation via ESC/Close button except if