Avoid CRT deprecation warnings for MSVC build using makefiles too.

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

diff --git a/include/wx/gtk/dialog.h b/include/wx/gtk/dialog.h
index 8d7e7a33fc1373032094e18a540b99a0264b1653..8f2b3284ede8d3ca51d0054ff2a56198bec4a0db 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:
 // Purpose:
 // Author:      Robert Roebling
 // Created:


@@ -8,22 +8,10 @@
 // Licence:           wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:           wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKDIALOGH__
-#define __GTKDIALOGH__
+#ifndef _WX_GTKDIALOG_H_
+#define _WX_GTKDIALOG_H_

 
 

-#include "wx/defs.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_CORE wxDialog;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern WXDLLIMPEXP_CORE const wxChar wxDialogNameStr[];
+class WXDLLIMPEXP_FWD_CORE wxGUIEventLoop;

 
 //-----------------------------------------------------------------------------
 // wxDialog
 
 //-----------------------------------------------------------------------------
 // wxDialog


@@ -45,9 +33,9 @@ public:
             const wxSize &size = wxDefaultSize,
             long style = wxDEFAULT_DIALOG_STYLE,
             const wxString &name = wxDialogNameStr );
             const wxSize &size = wxDefaultSize,
             long style = wxDEFAULT_DIALOG_STYLE,
             const wxString &name = wxDialogNameStr );

-    virtual ~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;
     virtual int ShowModal();
     virtual void EndModal( int retCode );
     virtual bool IsModal() const;


@@ -61,8 +49,8 @@ public:
 private:
     // common part of all ctors
     void Init();
 private:
     // common part of all ctors
     void Init();

-
+    wxGUIEventLoop *m_modalLoop;

     DECLARE_DYNAMIC_CLASS(wxDialog)
 };
 
     DECLARE_DYNAMIC_CLASS(wxDialog)
 };
 

-#endif // __GTKDIALOGH__
+#endif // _WX_GTKDIALOG_H_