adding hook, but unfortunately no solution yet for wxComboBox::SetEditable

[wxWidgets.git] / src / osx / iphone / dialog.mm

diff --git a/src/osx/iphone/dialog.mm b/src/osx/iphone/dialog.mm
index 6073f6b322355fea2ba0f981d9de13489d4ba716..a1a728e11f2c8ece8d58cb25a40a17ddba07f0f2 100644 (file)
--- a/src/osx/iphone/dialog.mm
+++ b/src/osx/iphone/dialog.mm
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/osx/cocoa/dialog.cpp
+// Name:        src/osx/iphone/dialog.mm

 // Purpose:     wxDialog class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // Purpose:     wxDialog class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01

-// RCS-ID:      $Id: dialog.cpp 54820 2008-07-29 20:04:11Z SC $
+// RCS-ID:      $Id$

 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -24,39 +24,13 @@
 
 extern wxList wxModalDialogs;
 
 
 extern wxList wxModalDialogs;
 

-void wxDialog::ShowWindowModal()
+void wxDialog::DoShowWindowModal()

 {   
 {   

+    m_modality = wxDIALOG_MODALITY_APP_MODAL;
+    ShowModal();
+    SendWindowModalDialogEvent ( wxEVT_WINDOW_MODAL_DIALOG_CLOSED  );

 }
 
 void wxDialog::EndWindowModal()
 {
 }
 }
 
 void wxDialog::EndWindowModal()
 {
 }

-
-void wxDialog::DoShowModal()
-{
-    wxCHECK_RET( !IsModal(), wxT("DoShowModal() called twice") );
-
-    wxModalDialogs.Append(this);
-
-    SetFocus() ;
-/*
-    WindowGroupRef windowGroup;
-    WindowGroupRef formerParentGroup;
-    bool resetGroupParent = false;
-
-    if ( GetParent() == NULL )
-    {
-        windowGroup = GetWindowGroup(windowRef) ;
-        formerParentGroup = GetWindowGroupParent( windowGroup );
-        SetWindowGroupParent( windowGroup, GetWindowGroupOfClass( kMovableModalWindowClass ) );
-        resetGroupParent = true;
-    }
-*/
-
-/*
-    if ( resetGroupParent )
-    {
-        SetWindowGroupParent( windowGroup , formerParentGroup );
-    }
-*/
-}