X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/include/wx/gtk/msgdlg.h diff --git a/include/wx/gtk/msgdlg.h b/include/wx/gtk/msgdlg.h index 6e74529d83..98c48c80a8 100644 --- a/include/wx/gtk/msgdlg.h +++ b/include/wx/gtk/msgdlg.h @@ -1,30 +1,18 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: msgdlg.h +// Name: wx/gtk/msgdlg.h // Purpose: wxMessageDialog for GTK+2 // Author: Vaclav Slavik // Modified by: // Created: 2003/02/28 // RCS-ID: $Id$ // Copyright: (c) Vaclav Slavik, 2003 -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __MSGDLG_H__ -#define __MSGDLG_H__ +#ifndef _WX_GTK_MSGDLG_H_ +#define _WX_GTK_MSGDLG_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "msgdlg.h" -#endif - -#include "wx/setup.h" -#include "wx/dialog.h" - -// type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO -// Returns wxYES/NO/OK/CANCEL - -WXDLLEXPORT_DATA(extern const wxChar*) wxMessageBoxCaptionStr; - -class WXDLLEXPORT wxMessageDialog: public wxDialog +class WXDLLEXPORT wxMessageDialog : public wxMessageDialogBase { public: wxMessageDialog(wxWindow *parent, const wxString& message, @@ -32,15 +20,24 @@ public: long style = wxOK|wxCENTRE, const wxPoint& pos = wxDefaultPosition); - int ShowModal(); + virtual int ShowModal(); + virtual bool Show( bool WXUNUSED(show) = true ) { return false; }; + +protected: + // implement some base class methods to do nothing to avoid asserts and + // GTK warnings, since this is not a real wxDialog. + virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y), + int WXUNUSED(width), int WXUNUSED(height), + int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {} + virtual void DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), + int WXUNUSED(width), int WXUNUSED(height)) {} private: - wxString m_caption; - wxString m_message; - long m_dialogStyle; - wxWindow *m_parent; + // create the real GTK+ dialog: this is done from ShowModal() to allow + // changing the message between constructing the dialog and showing it + void GTKCreateMsgDialog(); DECLARE_DYNAMIC_CLASS(wxMessageDialog) }; -#endif +#endif // _WX_GTK_MSGDLG_H_