Use wxMenuBar::Attach/Detach() instead of SetInvokingWindow() in wxGTK1.

[wxWidgets.git] / src / common / dlgcmn.cpp

diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index 31c5aa60ec4ad4111ca0c76e45466646ee4c2fd0..0ba3bc7d3308ca6cfe5f267c57aa93e2a8a64bcf 100644 (file)
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -40,8 +40,9 @@
 #include "wx/statline.h"
 #include "wx/sysopt.h"
 #include "wx/module.h"
 #include "wx/statline.h"
 #include "wx/sysopt.h"
 #include "wx/module.h"

-#include "wx/private/stattext.h"

 #include "wx/bookctrl.h"
 #include "wx/bookctrl.h"

+#include "wx/scrolwin.h"
+#include "wx/textwrapper.h"

 
 #if wxUSE_DISPLAY
 #include "wx/display.h"
 
 #if wxUSE_DISPLAY
 #include "wx/display.h"


@@ -77,32 +78,65 @@ void wxDialogBase::Init()
     SetExtraStyle(GetExtraStyle() | wxWS_EX_BLOCK_EVENTS);
 }
 
     SetExtraStyle(GetExtraStyle() | wxWS_EX_BLOCK_EVENTS);
 }
 

-// helper of GetParentForModalDialog()
-static bool CanBeUsedAsParent(wxWindow *parent)
+wxWindow *wxDialogBase::CheckIfCanBeUsedAsParent(wxWindow *parent) const

 {
 {

-    extern WXDLLIMPEXP_DATA_CORE(wxList) wxPendingDelete;
+    if ( !parent )
+        return NULL;
+
+    extern WXDLLIMPEXP_DATA_BASE(wxList) wxPendingDelete;
+    if ( wxPendingDelete.Member(parent) || parent->IsBeingDeleted() )
+    {
+        // this window is being deleted and we shouldn't create any children
+        // under it
+        return NULL;
+    }
+
+    if ( parent->HasExtraStyle(wxWS_EX_TRANSIENT) )
+    {
+        // this window is not being deleted yet but it's going to disappear
+        // soon so still don't parent this window under it
+        return NULL;
+    }
+
+    if ( !parent->IsShownOnScreen() )
+    {
+        // using hidden parent won't work correctly neither
+        return NULL;
+    }
+
+    // FIXME-VC6: this compiler requires an explicit const cast or it fails
+    //            with error C2446
+    if ( const_cast<const wxWindow *>(parent) == this )
+    {
+        // not sure if this can really happen but it doesn't hurt to guard
+        // against this clearly invalid situation
+        return NULL;
+    }

 
 

-    return !parent->HasExtraStyle(wxWS_EX_TRANSIENT) &&
-                parent->IsShownOnScreen() &&
-                    !wxPendingDelete.Member(parent) &&
-                        !parent->IsBeingDeleted();
+    return parent;

 }
 
 }
 

-wxWindow *wxDialogBase::GetParentForModalDialog(wxWindow *parent) const
+wxWindow *
+wxDialogBase::GetParentForModalDialog(wxWindow *parent, long style) const

 {
     // creating a parent-less modal dialog will result (under e.g. wxGTK2)
 {
     // creating a parent-less modal dialog will result (under e.g. wxGTK2)

-    // in an unfocused dialog, so try to find a valid parent for it:
+    // in an unfocused dialog, so try to find a valid parent for it unless we
+    // were explicitly asked not to
+    if ( style & wxDIALOG_NO_PARENT )
+        return NULL;
+
+    // first try the given parent

     if ( parent )
     if ( parent )

-        parent = wxGetTopLevelParent(parent);
+        parent = CheckIfCanBeUsedAsParent(wxGetTopLevelParent(parent));

 
 

-    if ( !parent || !CanBeUsedAsParent(parent) )
-        parent = wxTheApp->GetTopWindow();
+    // then the currently active window
+    if ( !parent )
+        parent = CheckIfCanBeUsedAsParent(
+                    wxGetTopLevelParent(wxGetActiveWindow()));

 
 

-    if ( parent && !CanBeUsedAsParent(parent) )
-    {
-        // can't use this one, it's going to disappear
-        parent = NULL;
-    }
+    // and finally the application main window
+    if ( !parent )
+        parent = CheckIfCanBeUsedAsParent(wxTheApp->GetTopWindow());

 
     return parent;
 }
 
     return parent;
 }


@@ -162,7 +196,7 @@ wxSizer *wxDialogBase::CreateTextSizer(const wxString& message)
     // the static messages created by CreateTextSizer() (used by wxMessageBox,
     // for example), we don't want this special meaning, so we need to quote it
     wxString text(message);
     // the static messages created by CreateTextSizer() (used by wxMessageBox,
     // for example), we don't want this special meaning, so we need to quote it
     wxString text(message);

-    text.Replace(_T("&"), _T("&&"));
+    text.Replace(wxT("&"), wxT("&&"));

 
     wxTextSizerWrapper wrapper(this);
 
 
     wxTextSizerWrapper wrapper(this);
 


@@ -173,8 +207,6 @@ wxSizer *wxDialogBase::CreateTextSizer(const wxString& message)
 
 wxSizer *wxDialogBase::CreateButtonSizer(long flags)
 {
 
 wxSizer *wxDialogBase::CreateButtonSizer(long flags)
 {

-    wxSizer *sizer = NULL;
-

 #ifdef __SMARTPHONE__
     wxDialog* dialog = (wxDialog*) this;
     if ( flags & wxOK )
 #ifdef __SMARTPHONE__
     wxDialog* dialog = (wxDialog*) this;
     if ( flags & wxOK )


@@ -188,6 +220,8 @@ wxSizer *wxDialogBase::CreateButtonSizer(long flags)
 
     if ( flags & wxNO )
         dialog->SetRightMenu(wxID_NO);
 
     if ( flags & wxNO )
         dialog->SetRightMenu(wxID_NO);

+
+    return NULL;

 #else // !__SMARTPHONE__
 
 #if wxUSE_BUTTON
 #else // !__SMARTPHONE__
 
 #if wxUSE_BUTTON


@@ -201,15 +235,19 @@ wxSizer *wxDialogBase::CreateButtonSizer(long flags)
             wxSystemOptions::GetOptionInt(wxT("wince.dialog.real-ok-cancel")) )
 #endif // __POCKETPC__
     {
             wxSystemOptions::GetOptionInt(wxT("wince.dialog.real-ok-cancel")) )
 #endif // __POCKETPC__
     {

-        sizer = CreateStdDialogButtonSizer(flags);
+        return CreateStdDialogButtonSizer(flags);

     }
     }

+#ifdef __POCKETPC__
+    return NULL;
+#endif // __POCKETPC__
+

 #else // !wxUSE_BUTTON
     wxUnusedVar(flags);
 #else // !wxUSE_BUTTON
     wxUnusedVar(flags);

+
+    return NULL;

 #endif // wxUSE_BUTTON/!wxUSE_BUTTON
 
 #endif // __SMARTPHONE__/!__SMARTPHONE__
 #endif // wxUSE_BUTTON/!wxUSE_BUTTON
 
 #endif // __SMARTPHONE__/!__SMARTPHONE__

-
-    return sizer;

 }
 
 wxSizer *wxDialogBase::CreateSeparatedButtonSizer(long flags)
 }
 
 wxSizer *wxDialogBase::CreateSeparatedButtonSizer(long flags)


@@ -427,6 +465,41 @@ void wxDialogBase::OnButton(wxCommandEvent& event)
     }
 }
 
     }
 }
 

+// ----------------------------------------------------------------------------
+// compatibility methods for supporting the modality API
+// ----------------------------------------------------------------------------
+
+wxDEFINE_EVENT( wxEVT_WINDOW_MODAL_DIALOG_CLOSED , wxWindowModalDialogEvent  );
+
+IMPLEMENT_DYNAMIC_CLASS(wxWindowModalDialogEvent, wxCommandEvent)
+
+void wxDialogBase::ShowWindowModal ()
+{
+    ShowModal();
+    SendWindowModalDialogEvent ( wxEVT_WINDOW_MODAL_DIALOG_CLOSED  );
+}
+
+void wxDialogBase::SendWindowModalDialogEvent ( wxEventType type )
+{
+    wxWindowModalDialogEvent event ( type, GetId());
+    event.SetEventObject(this);
+
+    if ( !GetEventHandler()->ProcessEvent(event) )
+    {
+        // the event is not propagated upwards to the parent automatically
+        // because the dialog is a top level window, so do it manually as
+        // in 9 cases of 10 the message must be processed by the dialog
+        // owner and not the dialog itself
+        (void)GetParent()->GetEventHandler()->ProcessEvent(event);
+    }
+}
+
+
+wxDialogModality wxDialogBase::GetModality() const
+{
+    return IsModal() ? wxDIALOG_MODALITY_APP_MODAL : wxDIALOG_MODALITY_NONE;
+}
+

 // ----------------------------------------------------------------------------
 // other event handlers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // other event handlers
 // ----------------------------------------------------------------------------


@@ -445,6 +518,12 @@ void wxDialogBase::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
     // destroy the dialog. The default OnCancel (above) simply ends a modal
     // dialog, and hides a modeless dialog.
 
     // destroy the dialog. The default OnCancel (above) simply ends a modal
     // dialog, and hides a modeless dialog.
 

+    int idCancel = GetEscapeId();
+    if ( idCancel == wxID_NONE )
+        return;
+    if ( idCancel == wxID_ANY )
+        idCancel = wxID_CANCEL;
+

     // VZ: this is horrible and MT-unsafe. Can't we reuse some of these global
     //     lists here? don't dare to change it now, but should be done later!
     static wxList closing;
     // VZ: this is horrible and MT-unsafe. Can't we reuse some of these global
     //     lists here? don't dare to change it now, but should be done later!
     static wxList closing;


@@ -454,7 +533,7 @@ void wxDialogBase::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 
     closing.Append(this);
 
 
     closing.Append(this);
 

-    wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
+    wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, idCancel);

     cancelEvent.SetEventObject( this );
     GetEventHandler()->ProcessEvent(cancelEvent); // This may close the dialog
 
     cancelEvent.SetEventObject( this );
     GetEventHandler()->ProcessEvent(cancelEvent); // This may close the dialog
 


@@ -475,7 +554,17 @@ void wxDialogBase::OnSysColourChanged(wxSysColourChangedEvent& event)
 bool wxDialogBase::DoLayoutAdaptation()
 {
     if (GetLayoutAdapter())
 bool wxDialogBase::DoLayoutAdaptation()
 {
     if (GetLayoutAdapter())

-        return GetLayoutAdapter()->DoLayoutAdaptation((wxDialog*) this);
+    {
+        wxWindow* focusWindow = wxFindFocusDescendant(this); // from event.h
+        if (GetLayoutAdapter()->DoLayoutAdaptation((wxDialog*) this))
+        {
+            if (focusWindow)
+                focusWindow->SetFocus();
+            return true;
+        }
+        else
+            return false;
+    }

     else
         return false;
 }
     else
         return false;
 }


@@ -528,6 +617,7 @@ bool wxStandardDialogLayoutAdapter::DoLayoutAdaptation(wxDialog* dialog)
 {
     if (dialog->GetSizer())
     {
 {
     if (dialog->GetSizer())
     {

+#if wxUSE_BOOKCTRL

         wxBookCtrlBase* bookContentWindow = wxDynamicCast(dialog->GetContentWindow(), wxBookCtrlBase);
 
         if (bookContentWindow)
         wxBookCtrlBase* bookContentWindow = wxDynamicCast(dialog->GetContentWindow(), wxBookCtrlBase);
 
         if (bookContentWindow)


@@ -563,6 +653,7 @@ bool wxStandardDialogLayoutAdapter::DoLayoutAdaptation(wxDialog* dialog)
             FitWithScrolling(dialog, windows);
         }
         else
             FitWithScrolling(dialog, windows);
         }
         else

+#endif // wxUSE_BOOKCTRL

         {
             // If we have an arbitrary dialog, create a scrolling area for the main content, and a button sizer
             // for the main buttons.
         {
             // If we have an arbitrary dialog, create a scrolling area for the main content, and a button sizer
             // for the main buttons.


@@ -766,7 +857,7 @@ int wxStandardDialogLayoutAdapter::DoMustScroll(wxDialog* dialog, wxSize& window
 #if wxUSE_DISPLAY
     displaySize = wxDisplay(wxDisplay::GetFromWindow(dialog)).GetClientArea().GetSize();
 #else
 #if wxUSE_DISPLAY
     displaySize = wxDisplay(wxDisplay::GetFromWindow(dialog)).GetClientArea().GetSize();
 #else

-    displaySize = wxGetClientDisplayRect();
+    displaySize = wxGetClientDisplayRect().GetSize();

 #endif
 
     int flags = 0;
 #endif
 
     int flags = 0;