Replaced SOCKLEN_T by WX_SOCKLEN_T to resolve conflict with AIX system headers.

[wxWidgets.git] / src / mac / carbon / dialog.cpp

diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp
index 9881fac0bdeac636ea22c687437931dce80b8286..830ab7f87538839f4f4a2035ad217d14710bd5ab 100644 (file)
--- a/src/mac/carbon/dialog.cpp
+++ b/src/mac/carbon/dialog.cpp
@@ -9,10 +9,12 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "dialog.h"
 #endif
 
 #pragma implementation "dialog.h"
 #endif
 

+#include "wx/wxprec.h"
+

 #include "wx/dialog.h"
 #include "wx/utils.h"
 #include "wx/frame.h"
 #include "wx/dialog.h"
 #include "wx/utils.h"
 #include "wx/frame.h"


@@ -27,7 +29,6 @@ wxList wxModalDialogs;
 //wxList wxModelessWindows;  // Frames and modeless dialogs
 extern wxList wxPendingDelete;
 
 //wxList wxModelessWindows;  // Frames and modeless dialogs
 extern wxList wxPendingDelete;
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
 
 BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)
 IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
 
 BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)


@@ -42,11 +43,9 @@ BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)
   EVT_CLOSE(wxDialog::OnCloseWindow)
 END_EVENT_TABLE()
 
   EVT_CLOSE(wxDialog::OnCloseWindow)
 END_EVENT_TABLE()
 

-#endif
-
-wxDialog::wxDialog()
+void wxDialog::Init()

 {
 {

-    m_isShown = FALSE;
+    m_isModalStyle = false;

 }
 
 bool wxDialog::Create(wxWindow *parent, wxWindowID id,
 }
 
 bool wxDialog::Create(wxWindow *parent, wxWindowID id,


@@ -71,7 +70,7 @@ void wxDialog::SetModal(bool flag)
 {
     if ( flag )
     {
 {
     if ( flag )
     {

-        m_windowStyle |= wxDIALOG_MODAL;
+        m_isModalStyle = true;

 
         wxModelessWindows.DeleteObject(this);
 #if TARGET_CARBON
 
         wxModelessWindows.DeleteObject(this);
 #if TARGET_CARBON


@@ -80,7 +79,7 @@ void wxDialog::SetModal(bool flag)
     }
     else
     {
     }
     else
     {

-        m_windowStyle &= ~wxDIALOG_MODAL;
+        m_isModalStyle = false;

 
         wxModelessWindows.Append(this);
     }
 
         wxModelessWindows.Append(this);
     }


@@ -113,7 +112,7 @@ void wxDialog::OnCharHook(wxKeyEvent& event)
 
 bool wxDialog::IsModal() const
 {
 
 bool wxDialog::IsModal() const
 {

-    return (GetWindowStyleFlag() & wxDIALOG_MODAL) != 0;
+    return m_isModalStyle;

 }
 
 
 }
 
 


@@ -163,8 +162,10 @@ void wxDialog::DoShowModal()
 
     wxModalDialogs.Append(this);
 
 
     wxModalDialogs.Append(this);
 

+    SetFocus() ;
+    

 #if TARGET_CARBON
 #if TARGET_CARBON

-//    BeginAppModalStateForWindow(  (WindowRef) MacGetWindowRef()) ;
+    BeginAppModalStateForWindow(  (WindowRef) MacGetWindowRef()) ;

 #else
     // TODO : test whether parent gets disabled
     bool formerModal = s_macIsInModalLoop ;
 #else
     // TODO : test whether parent gets disabled
     bool formerModal = s_macIsInModalLoop ;


@@ -177,7 +178,7 @@ void wxDialog::DoShowModal()
     }
 
 #if TARGET_CARBON
     }
 
 #if TARGET_CARBON

-//    EndAppModalStateForWindow( (WindowRef) MacGetWindowRef() ) ;
+    EndAppModalStateForWindow( (WindowRef) MacGetWindowRef() ) ;

 #else
     // TODO probably reenable the parent window if any
     s_macIsInModalLoop = formerModal ;
 #else
     // TODO probably reenable the parent window if any
     s_macIsInModalLoop = formerModal ;