patch 1306473

[wxWidgets.git] / include / wx / gtk / msgdlg.h

diff --git a/include/wx/gtk/msgdlg.h b/include/wx/gtk/msgdlg.h
index a545631340a290070112883f1de158054435bcbb..1b400954546819ead6ae02ed86621ff5fb937118 100644 (file)
--- a/include/wx/gtk/msgdlg.h
+++ b/include/wx/gtk/msgdlg.h
@@ -1,20 +1,16 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msgdlgg.h
-// Purpose:     Generic wxMessageDialog
-// Author:      Julian Smart
+// Name:        wx/gtk/msgdlg.h
+// Purpose:     wxMessageDialog for GTK+2
+// Author:      Vaclav Slavik

 // Modified by:
 // Modified by:

-// Created:     01/02/97
+// Created:     2003/02/28

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c)
-// Licence:    wxWindows licence
+// Copyright:   (c) Vaclav Slavik, 2003
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __MSGDLGH_G__
-#define __MSGDLGH_G__
-
-#ifdef __GNUG__
-#pragma interface "msgdlgg.h"
-#endif
+#ifndef __MSGDLG_H__
+#define __MSGDLG_H__

 
 #include "wx/setup.h"
 #include "wx/dialog.h"
 
 #include "wx/setup.h"
 #include "wx/dialog.h"


@@ -24,33 +20,32 @@
 
 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:
 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);
+    ~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:
 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
 #endif

-       // __MSGDLGH_G__