Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/gtk/dialog.h b/include/wx/gtk/dialog.h
index 8bf37778eefeb8819afd969968d6cf3c0057268c..120611ac983934a6ef32602fc673521bf707fbdc 100644 (file)
--- a/include/wx/gtk/dialog.h
+++ b/include/wx/gtk/dialog.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dialog.h
+// Name:        wx/gtk/dialog.h
 // Purpose:
 // Author:      Robert Roebling
 // Created:
@@ -8,22 +8,10 @@
 // Licence:           wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GTKDIALOGH__
-#define __GTKDIALOGH__
+#ifndef _WX_GTKDIALOG_H_
+#define _WX_GTKDIALOG_H_
 
-#include "wx/defs.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxDialog;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern WXDLLIMPEXP_CORE const wxChar wxDialogNameStr[];
+class WXDLLIMPEXP_FWD_CORE wxGUIEventLoop;
 
 //-----------------------------------------------------------------------------
 // wxDialog
@@ -45,13 +33,12 @@ public:
             const wxSize &size = wxDefaultSize,
             long style = wxDEFAULT_DIALOG_STYLE,
             const wxString &name = wxDialogNameStr );
-    ~wxDialog() {}
+    virtual ~wxDialog();
 
-    virtual bool Show( bool show = TRUE );
+    virtual bool Show( bool show = true );
     virtual int ShowModal();
     virtual void EndModal( int retCode );
     virtual bool IsModal() const;
-    void SetModal( bool modal );
 
     // implementation
     // --------------
@@ -61,8 +48,8 @@ public:
 private:
     // common part of all ctors
     void Init();
-
+    wxGUIEventLoop *m_modalLoop;
     DECLARE_DYNAMIC_CLASS(wxDialog)
 };
 
-#endif // __GTKDIALOGH__
+#endif // _WX_GTKDIALOG_H_