don't assign string literals to a char * variable

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

diff --git a/src/generic/msgdlgg.cpp b/src/generic/msgdlgg.cpp
index a574efd37423096d1ff3b1e7aa2e6afceb385b06..f4f383f6763991eccc4e1db452580a6284a52296 100644 (file)
--- a/src/generic/msgdlgg.cpp
+++ b/src/generic/msgdlgg.cpp
@@ -20,6 +20,8 @@
 #pragma hdrstop
 #endif
 
+#if wxUSE_MSGDLG
+
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dialog.h"
@@ -63,8 +65,6 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent,
 {
     m_dialogStyle = style;
 
-    wxBeginBusyCursor();
-
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 
     wxBoxSizer *icon_text = new wxBoxSizer( wxHORIZONTAL );
@@ -73,7 +73,7 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent,
     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 );
     }
 
@@ -99,12 +99,10 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent,
     if (size.x < size.y*3/2)
     {
         size.x = size.y*3/2;
-       SetSize( size );
+        SetSize( size );
     }
 
     Centre( wxBOTH | wxCENTER_FRAME);
-
-    wxEndBusyCursor();
 }
 
 void wxGenericMessageDialog::OnYes(wxCommandEvent& WXUNUSED(event))
@@ -127,4 +125,5 @@ void wxGenericMessageDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
     }
 }
 
+#endif // wxUSE_MSGDLG