Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/gtk/msgdlg.h b/include/wx/gtk/msgdlg.h
index dbbcf9eb932126b27355bfb29bbf07dbf832687e..670d7f9782590bf95461ea10ddaa26a617d22042 100644 (file)
--- a/include/wx/gtk/msgdlg.h
+++ b/include/wx/gtk/msgdlg.h
@@ -4,33 +4,23 @@
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     2003/02/28
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     2003/02/28

-// RCS-ID:      $Id$

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

-#ifndef __MSGDLG_H__
-#define __MSGDLG_H__
+#ifndef _WX_GTK_MSGDLG_H_
+#define _WX_GTK_MSGDLG_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[];
-
-class WXDLLEXPORT wxMessageDialog: public wxDialog, public wxMessageDialogBase
+class WXDLLIMPEXP_CORE wxMessageDialog : public wxMessageDialogBase

 {
 public:
     wxMessageDialog(wxWindow *parent, const wxString& message,
                     const wxString& caption = wxMessageBoxCaptionStr,
                     long style = wxOK|wxCENTRE,
                     const wxPoint& pos = wxDefaultPosition);
 {
 public:
     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; };
+    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
 
 protected:
     // implement some base class methods to do nothing to avoid asserts and


@@ -40,12 +30,22 @@ protected:
                            int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {}
     virtual void DoMoveWindow(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)) {}

+    // override to convert wx mnemonics to GTK+ ones and handle stock ids
+    virtual void DoSetCustomLabel(wxString& var, const ButtonLabel& label);

 
 private:
 
 private:

-    wxString m_caption;
-    wxString m_message;
+    // override to use stock GTK+ defaults instead of just string ones
+    virtual wxString GetDefaultYesLabel() const;
+    virtual wxString GetDefaultNoLabel() const;
+    virtual wxString GetDefaultOKLabel() const;
+    virtual wxString GetDefaultCancelLabel() const;
+    virtual wxString GetDefaultHelpLabel() const;
+
+    // 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)
 };
 
 
     DECLARE_DYNAMIC_CLASS(wxMessageDialog)
 };
 

-#endif
+#endif // _WX_GTK_MSGDLG_H_