X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/57dde4bd5860cda4666326b611f535dfc28139f2..04453a9e1e53ff185f26b1979a2febe1df7c656a:/include/wx/gtk1/msgdlg.h?ds=inline diff --git a/include/wx/gtk1/msgdlg.h b/include/wx/gtk1/msgdlg.h index a545631340..2e2879af5e 100644 --- a/include/wx/gtk1/msgdlg.h +++ b/include/wx/gtk1/msgdlg.h @@ -1,56 +1,51 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: msgdlgg.h -// Purpose: Generic wxMessageDialog -// Author: Julian Smart +// Name: wx/gtk1/msgdlg.h +// Purpose: wxMessageDialog for GTK+2 +// Author: Vaclav Slavik // Modified by: -// Created: 01/02/97 +// Created: 2003/02/28 // RCS-ID: $Id$ -// Copyright: (c) -// Licence: wxWindows licence +// Copyright: (c) Vaclav Slavik, 2003 +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __MSGDLGH_G__ -#define __MSGDLGH_G__ +#ifndef __MSGDLG_H__ +#define __MSGDLG_H__ -#ifdef __GNUG__ -#pragma interface "msgdlgg.h" -#endif - -#include "wx/setup.h" +#include "wx/defs.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; +WXDLLEXPORT_DATA(extern const wxChar) wxMessageBoxCaptionStr[]; -class WXDLLEXPORT wxGenericMessageDialog: public wxDialog +class WXDLLEXPORT wxMessageDialog: public wxDialog, public wxMessageDialogBase { -DECLARE_DYNAMIC_CLASS(wxGenericMessageDialog) - public: - wxGenericMessageDialog(wxWindow *parent, const wxString& message, - const wxString& caption = wxMessageBoxCaptionStr, - long style = wxOK|wxCENTRE, const wxPoint& pos = wxDefaultPosition); - - void OnYes(wxCommandEvent& event); - void OnNo(wxCommandEvent& event); - void OnCancel(wxCommandEvent& event); - + wxMessageDialog(wxWindow *parent, const wxString& message, + const wxString& caption = wxMessageBoxCaptionStr, + long style = wxOK|wxCENTRE, + const wxPoint& pos = wxDefaultPosition); + virtual ~wxMessageDialog(); + + 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: - wxList m_buttons; - int m_dialogStyle; + wxString m_caption; + wxString m_message; -DECLARE_EVENT_TABLE() + DECLARE_DYNAMIC_CLASS(wxMessageDialog) }; -#if !defined( __WXMSW__ ) && !defined( __WXMAC__) -#define wxMessageDialog wxGenericMessageDialog - -int wxMessageBox(const wxString& message, const wxString& caption = wxMessageBoxCaptionStr, - long style = wxOK|wxCENTRE, wxWindow *parent = (wxWindow *) NULL, int x = -1, int y = -1); - -#endif - #endif - // __MSGDLGH_G__