X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/96c5bd7fc45bdebc013e0621574840294e3ecfa0..7d4194184e83bbccf1a88325cca59d8d0d2faef1:/src/generic/msgdlgg.cpp diff --git a/src/generic/msgdlgg.cpp b/src/generic/msgdlgg.cpp index 996646d915..2f4aeb5425 100644 --- a/src/generic/msgdlgg.cpp +++ b/src/generic/msgdlgg.cpp @@ -21,13 +21,11 @@ #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 @@ -35,15 +33,12 @@ #include "wx/generic/msgdlgg.h" -#ifdef __WXGTK__ -#include "wx/statline.h" +#if wxUSE_STATLINE + #include "wx/statline.h" #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; @@ -95,6 +90,8 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent, const wxString { m_dialogStyle = style; + wxBeginBusyCursor(); + wxSize message_size( wxSplitMessage2( message, this ) ); wxButton *ok = (wxButton *) NULL; @@ -158,13 +155,15 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent, const wxString n++; } -#if wxUSE_STATICLINE +#if wxUSE_STATLINE (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))