Silence warning about truncation since the comment says it ok

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

diff --git a/src/generic/msgdlgg.cpp b/src/generic/msgdlgg.cpp
index fa5ae065f8d5949bb76b40083e4674b7210a8f74..869cb97c4d14931acd26377d5a3d841340ff7d1a 100644 (file)
--- a/src/generic/msgdlgg.cpp
+++ b/src/generic/msgdlgg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msgdlgg.cpp
+// Name:        src/generic/msgdlgg.cpp

 // Purpose:     wxGenericMessageDialog
 // Author:      Julian Smart, Robert Roebling
 // Modified by:
 // Purpose:     wxGenericMessageDialog
 // Author:      Julian Smart, Robert Roebling
 // Modified by:


@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "msgdlgg.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -20,7 +16,7 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#if wxUSE_MSGDLG
+#if wxUSE_MSGDLG && (!defined(__WXGTK20__) || defined(__WXUNIVERSAL__) || defined(__WXGPE__))

 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"


@@ -38,7 +34,8 @@
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>
 

-#include "wx/generic/msgdlgg.h"
+#define __WX_COMPILING_MSGDLGG_CPP__ 1
+#include "wx/msgdlg.h"

 #include "wx/artprov.h"
 #include "wx/settings.h"
 
 #include "wx/artprov.h"
 #include "wx/settings.h"
 


@@ -63,9 +60,9 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent,
                                                 const wxString& caption,
                                                 long style,
                                                 const wxPoint& pos)
                                                 const wxString& caption,
                                                 long style,
                                                 const wxPoint& pos)

-                      : wxDialog( parent, -1, caption, pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE )
+                      : wxDialog( parent, wxID_ANY, caption, pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE )

 {
 {

-    m_dialogStyle = style;
+    SetMessageDialogStyle(style);

 
     bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
 
 
     bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
 


@@ -99,7 +96,7 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent,
                 bitmap = wxArtProvider::GetIcon(wxART_QUESTION, wxART_MESSAGE_BOX);
                 break;
         }
                 bitmap = wxArtProvider::GetIcon(wxART_QUESTION, wxART_MESSAGE_BOX);
                 break;
         }

-        wxStaticBitmap *icon = new wxStaticBitmap(this, -1, bitmap);
+        wxStaticBitmap *icon = new wxStaticBitmap(this, wxID_ANY, bitmap);

         if (is_pda)
             topsizer->Add( icon, 0, wxTOP|wxLEFT|wxRIGHT | wxALIGN_LEFT, 10 );
         else
         if (is_pda)
             topsizer->Add( icon, 0, wxTOP|wxLEFT|wxRIGHT | wxALIGN_LEFT, 10 );
         else


@@ -107,19 +104,22 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent,
     }
 
     // 2) text
     }
 
     // 2) text

-    icon_text->Add( CreateTextSizer( message ), 0, wxCENTER | wxLEFT, 10 );
+    icon_text->Add( CreateTextSizer( message ), 0, wxALIGN_CENTER | wxLEFT, 10 );

 
     topsizer->Add( icon_text, 1, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 );
 
 #if wxUSE_STATLINE
     // 3) static line
 
     topsizer->Add( icon_text, 1, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 );
 
 #if wxUSE_STATLINE
     // 3) static line

-    topsizer->Add( new wxStaticLine( this, -1 ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
-#endif
+    topsizer->Add( new wxStaticLine( this, wxID_ANY ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
+#endif // wxUSE_STATLINE

 
     // 4) buttons
 
     // 4) buttons

-    topsizer->Add( CreateButtonSizer( style ), 0, wxCENTRE | wxALL, 10 );
+    int center_flag = wxEXPAND;
+    if (style & wxYES_NO) center_flag = wxALIGN_CENTRE;
+    topsizer->Add( CreateButtonSizer( style & (wxOK|wxCANCEL|wxYES_NO|wxYES_DEFAULT|wxNO_DEFAULT) ),
+                   0, center_flag | wxALL, 10 );

 
 

-    SetAutoLayout( TRUE );
+    SetAutoLayout( true );

     SetSizer( topsizer );
 
     topsizer->SetSizeHints( this );
     SetSizer( topsizer );
 
     topsizer->SetSizeHints( this );


@@ -148,11 +148,12 @@ void wxGenericMessageDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
 {
     // Allow cancellation via ESC/Close button except if
     // only YES and NO are specified.
 {
     // Allow cancellation via ESC/Close button except if
     // only YES and NO are specified.

-    if ( (m_dialogStyle & wxYES_NO) != wxYES_NO || (m_dialogStyle & wxCANCEL) )
+    const long style = GetMessageDialogStyle();
+    if ( (style & wxYES_NO) != wxYES_NO || (style & wxCANCEL) )

     {
         EndModal( wxID_CANCEL );
     }
 }
 
     {
         EndModal( wxID_CANCEL );
     }
 }
 

-#endif // wxUSE_MSGDLG
+#endif // wxUSE_MSGDLG && !defined(__WXGTK20__)