buttons now become default when they have focus

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

diff --git a/src/generic/msgdlgg.cpp b/src/generic/msgdlgg.cpp
index a62f4797484538a356683b647c6e19d7fe0773de..2f4aeb5425c60eb3c289e7804ece0f58424ab23b 100644 (file)
--- a/src/generic/msgdlgg.cpp
+++ b/src/generic/msgdlgg.cpp
@@ -21,13 +21,11 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #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/intl.h"

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


@@ -35,15 +33,12 @@
 
 #include "wx/generic/msgdlgg.h"
 
 
 #include "wx/generic/msgdlgg.h"
 

-#ifdef __WXGTK__
-#include "wx/statline.h"
+#if wxUSE_STATLINE
+  #include "wx/statline.h"

 #endif
 
 #endif
 

-///////////////////////////////////////////////////////////////////
-// New dialog box implementations
-
-// Split message, using constraints to position controls
-wxSize wxSplitMessage2( const wxString &message, wxWindow *parent )
+/* Split message, using constraints to position controls */
+static wxSize wxSplitMessage2( const wxString &message, wxWindow *parent )

 {
     int y = 10;
     int w = 50;
 {
     int y = 10;
     int w = 50;


@@ -95,6 +90,8 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent, const wxString
 {
     m_dialogStyle = style;
 
 {
     m_dialogStyle = style;
 

+    wxBeginBusyCursor();
+

     wxSize message_size( wxSplitMessage2( message, this ) );
 
     wxButton *ok = (wxButton *) NULL;
     wxSize message_size( wxSplitMessage2( message, this ) );
 
     wxButton *ok = (wxButton *) NULL;


@@ -131,8 +128,16 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent, const wxString
     }
     else if (yes)
     {
     }
     else if (yes)
     {

-        yes->SetDefault();
-        yes->SetFocus();
+       if(style & wxNO_DEFAULT)
+       {
+          no->SetDefault();
+          no->SetFocus();
+       }
+       else
+       {
+          yes->SetDefault();
+          yes->SetFocus();
+       }

     }
     
     int w = m_buttons.GetCount() * 100;
     }
     
     int w = m_buttons.GetCount() * 100;


@@ -150,13 +155,15 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent, const wxString
         n++;
     }
     
         n++;
     }
     

-#ifdef __WXGTK__
+#if wxUSE_STATLINE

     (void) new wxStaticLine( this, -1, wxPoint(0,y-20), wxSize(w+30, 5) );
 #endif
     
     SetSize( w+30, y+40 );
 
     Centre( wxBOTH );
     (void) new wxStaticLine( this, -1, wxPoint(0,y-20), wxSize(w+30, 5) );
 #endif
     
     SetSize( w+30, y+40 );
 
     Centre( wxBOTH );

+    
+    wxEndBusyCursor();

 }
 
 void wxGenericMessageDialog::OnYes(wxCommandEvent& WXUNUSED(event))
 }
 
 void wxGenericMessageDialog::OnYes(wxCommandEvent& WXUNUSED(event))