Support using GetTextExtent() with empty string to get descent in wxOSX.

[wxWidgets.git] / src / cocoa / dialog.mm

diff --git a/src/cocoa/dialog.mm b/src/cocoa/dialog.mm
index 9c2be1a64fec2a949afa99364479c8fccbc01a77..72a380243cfde788d03dbb7978a05cb9cc4f8542 100644 (file)
--- a/src/cocoa/dialog.mm
+++ b/src/cocoa/dialog.mm
@@ -6,7 +6,7 @@
 // Created:     2002/12/15
 // RCS-ID:      $Id$
 // Copyright:   2002 David Elliott
 // Created:     2002/12/15
 // RCS-ID:      $Id$
 // Copyright:   2002 David Elliott

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"


@@ -19,6 +19,7 @@
     #include "wx/settings.h"
 #endif //WX_PRECOMP
 
     #include "wx/settings.h"
 #endif //WX_PRECOMP
 

+#include "wx/modalhook.h"

 #include "wx/cocoa/autorelease.h"
 #include "wx/cocoa/string.h"
 
 #include "wx/cocoa/autorelease.h"
 #include "wx/cocoa/string.h"
 


@@ -127,6 +128,8 @@ bool wxDialog::Show(bool show)
 // is stopped (via EndModal()) it returns the exit code.
 int wxDialog::ShowModal()
 {
 // is stopped (via EndModal()) it returns the exit code.
 int wxDialog::ShowModal()
 {

+    WX_HOOK_MODAL_DIALOG();
+

     wxCHECK_MSG(!IsModal(),GetReturnCode(),wxT("wxDialog::ShowModal called within its own modal loop"));
 
     // Show(true) will set m_isShown = true
     wxCHECK_MSG(!IsModal(),GetReturnCode(),wxT("wxDialog::ShowModal called within its own modal loop"));
 
     // Show(true) will set m_isShown = true