// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "msgdlgg.h"
#endif
#pragma hdrstop
#endif
-#if wxUSE_MSGDLG
+#if wxUSE_MSGDLG && (!defined(__WXGTK20__) || defined(__WXUNIVERSAL__) || defined(__WXGPE__))
#ifndef WX_PRECOMP
#include "wx/utils.h"
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;
bitmap = wxArtProvider::GetIcon(wxART_QUESTION, wxART_MESSAGE_BOX);
break;
}
-#if wxUSE_STATIC_BITMAP
- 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
icon_text->Add( icon, 0, wxCENTER );
-#endif
}
// 2) text
-#if wxUSE_STATTEXT // && wxUSE_TEXTCTRL
icon_text->Add( CreateTextSizer( message ), 0, wxCENTER | wxLEFT, 10 );
-#endif
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
-#if wxUSE_BUTTON
- topsizer->Add( CreateButtonSizer( style ), 0, wxCENTRE | wxALL, 10 );
- #endif
+ topsizer->Add( CreateButtonSizer( style & (wxOK|wxCANCEL|wxYES_NO|wxYES_DEFAULT|wxNO_DEFAULT) ),
+ 0, wxCENTRE | wxALL, 10 );
- SetAutoLayout( TRUE );
+ SetAutoLayout( true );
SetSizer( topsizer );
topsizer->SetSizeHints( this );
}
}
-#endif // wxUSE_MSGDLG
+#endif // wxUSE_MSGDLG && !defined(__WXGTK20__)