Fixed typo.

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

diff --git a/include/wx/osx/dialog.h b/include/wx/osx/dialog.h
index 17195a318a8db9b168fbdd08c61b6d9da3003eac..8b7a24f2bd4d986ede83cc51aed07f6459e17795 100644 (file)
--- a/include/wx/osx/dialog.h
+++ b/include/wx/osx/dialog.h
@@ -14,9 +14,8 @@
 
 #include "wx/panel.h"
 
 
 #include "wx/panel.h"
 

-WXDLLIMPEXP_DATA_CORE(extern const char) wxDialogNameStr[];
-

 class WXDLLIMPEXP_FWD_CORE wxMacToolTip ;
 class WXDLLIMPEXP_FWD_CORE wxMacToolTip ;

+class WXDLLIMPEXP_FWD_CORE wxModalEventLoop ;

 
 // Dialog boxes
 class WXDLLIMPEXP_CORE wxDialog : public wxDialogBase
 
 // Dialog boxes
 class WXDLLIMPEXP_CORE wxDialog : public wxDialogBase


@@ -55,34 +54,42 @@ public:
 
     // show the dialog modally and return the value passed to EndModal()
     virtual int ShowModal();
 
     // show the dialog modally and return the value passed to EndModal()
     virtual int ShowModal();

-    
+

     virtual void ShowWindowModal();
 
     // may be called to terminate the dialog with the given return code
     virtual void EndModal(int retCode);
 
     virtual void ShowWindowModal();
 
     // may be called to terminate the dialog with the given return code
     virtual void EndModal(int retCode);
 

+    static bool OSXHasModalDialogsOpen();
+    static void OSXBeginModalDialog();
+    static void OSXEndModalDialog();
+

     // implementation
     // --------------
 
     wxDialogModality GetModality() const;
     // implementation
     // --------------
 
     wxDialogModality GetModality() const;

-    
+
+#if wxOSX_USE_COCOA
+    virtual void ModalFinishedCallback(void* WXUNUSED(panel), int WXUNUSED(returnCode)) {}
+#endif
+

 protected:
 protected:

-    // show modal dialog and enter modal loop
-    void DoShowModal();
-    
-    // show modal dialog and enter modal loop
+    // show window modal dialog

     void DoShowWindowModal();
 
     void DoShowWindowModal();
 

+    // end window modal dialog.
+    void EndWindowModal();
+

     // mac also takes command-period as cancel
     virtual bool IsEscapeKey(const wxKeyEvent& event);
 
     // mac also takes command-period as cancel
     virtual bool IsEscapeKey(const wxKeyEvent& event);
 

-    // needed for cleanup on the Cocoa side.
-    void EndWindowModal();
+
+    wxDialogModality m_modality;
+
+    wxModalEventLoop* m_eventLoop;

 
 private:
     void Init();
 
 private:
     void Init();

-
-    wxDialogModality m_modality;

 };
 
 #endif
 };
 
 #endif