Applied patch [ 858324 ] Calling EndModal inside an EVT_INIT_DIALOG event handler

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

diff --git a/include/wx/mac/dialog.h b/include/wx/mac/dialog.h
index 6ae557e92764c1f65751ba3fe2c359f782f55830..e6834011c5979fc6bf71b51d62d69016a9e6717f 100644 (file)
--- a/include/wx/mac/dialog.h
+++ b/include/wx/mac/dialog.h
@@ -1,24 +1,24 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dialog.h
 // Purpose:     wxDialog class
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIALOG_H_
 #define _WX_DIALOG_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "dialog.h"
 #endif
 
 #include "wx/panel.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
 
@@ -64,8 +64,8 @@ public:
 
     ~wxDialog();
 
-    virtual bool Destroy();
-    bool Show(bool show);
+//    virtual bool Destroy();
+    bool Show(bool show = true);
 
     void SetModal(bool flag);
     virtual bool IsModal() const;
@@ -79,15 +79,10 @@ public:
     // returns TRUE if we're in a modal loop
     bool IsModalShowing() const;
 
-#if WXWIN_COMPATIBILITY
-    bool Iconized() const { return IsIconized(); };
-#endif
-
     // implementation
     // --------------
 
     // event handlers
-    bool OnClose();
     void OnCharHook(wxKeyEvent& event);
     void OnCloseWindow(wxCloseEvent& event);
 
@@ -99,10 +94,6 @@ public:
     // Responds to colour changes
     void OnSysColourChanged(wxSysColourChangedEvent& event);
 
-    // override more base class virtuals
-    virtual void DoGetPosition(int *x, int *y) const;
-    virtual void DoSetClientSize(int width, int height);
-
     // show modal dialog and enter modal loop
     void DoShowModal();