removed wxDCWindowImpl::m_win; use wxDCImpl::m_window instead (fixes caret-related...

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

diff --git a/include/wx/gtk/msgdlg.h b/include/wx/gtk/msgdlg.h
index 58f240319453eef54c27700973dfc750aa142a33..97998869d04869c9560a174807d1061db69c15c5 100644 (file)
--- a/include/wx/gtk/msgdlg.h
+++ b/include/wx/gtk/msgdlg.h
@@ -9,27 +9,18 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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);

-    virtual ~wxMessageDialog();

 
 

-    int ShowModal();
+    virtual int ShowModal();

     virtual bool Show( bool WXUNUSED(show) = true ) { return false; };
 
 protected:
     virtual bool Show( bool WXUNUSED(show) = true ) { return false; };
 
 protected:


@@ -42,10 +33,11 @@ protected:
                               int WXUNUSED(width), int WXUNUSED(height)) {}
 
 private:
                               int WXUNUSED(width), int WXUNUSED(height)) {}
 
 private:

-    wxString m_caption;
-    wxString m_message;
+    // 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_