projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed debug comments
[wxWidgets.git]
/
src
/
generic
/
msgdlgg.cpp
diff --git
a/src/generic/msgdlgg.cpp
b/src/generic/msgdlgg.cpp
index 1fea61eafe63cc149a36ae301b63f220ff4790c4..f4f383f6763991eccc4e1db452580a6284a52296 100644
(file)
--- a/
src/generic/msgdlgg.cpp
+++ b/
src/generic/msgdlgg.cpp
@@
-20,6
+20,8
@@
#pragma hdrstop
#endif
#pragma hdrstop
#endif
+#if wxUSE_MSGDLG
+
#ifndef WX_PRECOMP
#include "wx/utils.h"
#include "wx/dialog.h"
#ifndef WX_PRECOMP
#include "wx/utils.h"
#include "wx/dialog.h"
@@
-63,25
+65,23
@@
wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent,
{
m_dialogStyle = style;
{
m_dialogStyle = style;
- wxBeginBusyCursor();
-
wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
wxBoxSizer *icon_text = new wxBoxSizer( wxHORIZONTAL );
wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
wxBoxSizer *icon_text = new wxBoxSizer( wxHORIZONTAL );
-
+
// 1) icon
if (style & wxICON_MASK)
{
wxStaticBitmap *icon = new wxStaticBitmap(
// 1) icon
if (style & wxICON_MASK)
{
wxStaticBitmap *icon = new wxStaticBitmap(
- this, -1, wxTheApp->GetStdIcon(
style & wxICON_MASK
));
+ this, -1, wxTheApp->GetStdIcon(
(int)(style & wxICON_MASK)
));
icon_text->Add( icon, 0, wxCENTER );
}
icon_text->Add( icon, 0, wxCENTER );
}
-
+
// 2) text
icon_text->Add( CreateTextSizer( message ), 0, wxCENTER | wxLEFT, 10 );
// 2) text
icon_text->Add( CreateTextSizer( message ), 0, wxCENTER | wxLEFT, 10 );
-
+
topsizer->Add( icon_text, 0, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 );
topsizer->Add( icon_text, 0, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 );
-
+
#if wxUSE_STATLINE
// 3) static line
topsizer->Add( new wxStaticLine( this, -1 ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
#if wxUSE_STATLINE
// 3) static line
topsizer->Add( new wxStaticLine( this, -1 ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
@@
-92,19
+92,17
@@
wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent,
SetAutoLayout( TRUE );
SetSizer( topsizer );
SetAutoLayout( TRUE );
SetSizer( topsizer );
-
+
topsizer->SetSizeHints( this );
topsizer->Fit( this );
wxSize size( GetSize() );
if (size.x < size.y*3/2)
{
size.x = size.y*3/2;
topsizer->SetSizeHints( this );
topsizer->Fit( this );
wxSize size( GetSize() );
if (size.x < size.y*3/2)
{
size.x = size.y*3/2;
- SetSize( size );
+
SetSize( size );
}
Centre( wxBOTH | wxCENTER_FRAME);
}
Centre( wxBOTH | wxCENTER_FRAME);
-
- wxEndBusyCursor();
}
void wxGenericMessageDialog::OnYes(wxCommandEvent& WXUNUSED(event))
}
void wxGenericMessageDialog::OnYes(wxCommandEvent& WXUNUSED(event))
@@
-127,4
+125,5
@@
void wxGenericMessageDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
}
}
}
}
+#endif // wxUSE_MSGDLG