X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/255c07b4df512ff4f844f4d604787b5ea8999530..a5655d37db9baabce654849fd66173f95f74e230:/src/common/dlgcmn.cpp

diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index 7c5ef85837..a335b7efaa 100644
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -83,7 +83,7 @@ wxWindow *wxDialogBase::CheckIfCanBeUsedAsParent(wxWindow *parent) const
     if ( !parent )
         return NULL;
 
-    extern WXDLLIMPEXP_DATA_CORE(wxList) wxPendingDelete;
+    extern WXDLLIMPEXP_DATA_BASE(wxList) wxPendingDelete;
     if ( wxPendingDelete.Member(parent) || parent->IsBeingDeleted() )
     {
         // this window is being deleted and we shouldn't create any children
@@ -116,12 +116,13 @@ wxWindow *wxDialogBase::CheckIfCanBeUsedAsParent(wxWindow *parent) const
     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)
     // in an unfocused dialog, so try to find a valid parent for it unless we
     // were explicitly asked not to
-    if ( HasFlag(wxDIALOG_NO_PARENT) )
+    if ( style & wxDIALOG_NO_PARENT )
         return NULL;
 
     // first try the given parent
@@ -142,45 +143,15 @@ wxWindow *wxDialogBase::GetParentForModalDialog(wxWindow *parent) const
 
 #if wxUSE_STATTEXT
 
-class wxTextSizerWrapper : public wxTextWrapper
+wxSizer *wxDialogBase::CreateTextSizer(const wxString& message)
 {
-public:
-    wxTextSizerWrapper(wxWindow *win)
-    {
-        m_win = win;
-        m_hLine = 0;
-    }
-
-    wxSizer *CreateSizer(const wxString& text, int widthMax)
-    {
-        m_sizer = new wxBoxSizer(wxVERTICAL);
-        Wrap(m_win, text, widthMax);
-        return m_sizer;
-    }
-
-protected:
-    virtual void OnOutputLine(const wxString& line)
-    {
-        if ( !line.empty() )
-        {
-            m_sizer->Add(new wxStaticText(m_win, wxID_ANY, line));
-        }
-        else // empty line, no need to create a control for it
-        {
-            if ( !m_hLine )
-                m_hLine = m_win->GetCharHeight();
-
-            m_sizer->Add(5, m_hLine);
-        }
-    }
+    wxTextSizerWrapper wrapper(this);
 
-private:
-    wxWindow *m_win;
-    wxSizer *m_sizer;
-    int m_hLine;
-};
+    return CreateTextSizer(message, wrapper);
+}
 
-wxSizer *wxDialogBase::CreateTextSizer(const wxString& message)
+wxSizer *wxDialogBase::CreateTextSizer(const wxString& message,
+                                       wxTextSizerWrapper& wrapper)
 {
     // I admit that this is complete bogus, but it makes
     // message boxes work for pda screens temporarily..
@@ -195,9 +166,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);
-    text.Replace(_T("&"), _T("&&"));
-
-    wxTextSizerWrapper wrapper(this);
+    text.Replace(wxT("&"), wxT("&&"));
 
     return wrapper.CreateSizer(text, widthMax);
 }
@@ -249,12 +218,8 @@ wxSizer *wxDialogBase::CreateButtonSizer(long flags)
 #endif // __SMARTPHONE__/!__SMARTPHONE__
 }
 
-wxSizer *wxDialogBase::CreateSeparatedButtonSizer(long flags)
+wxSizer *wxDialogBase::CreateSeparatedSizer(wxSizer *sizer)
 {
-    wxSizer *sizer = CreateButtonSizer(flags);
-    if ( !sizer )
-        return NULL;
-
     // Mac Human Interface Guidelines recommend not to use static lines as
     // grouping elements
 #if wxUSE_STATLINE && !defined(__WXMAC__)
@@ -268,6 +233,15 @@ wxSizer *wxDialogBase::CreateSeparatedButtonSizer(long flags)
     return sizer;
 }
 
+wxSizer *wxDialogBase::CreateSeparatedButtonSizer(long flags)
+{
+    wxSizer *sizer = CreateButtonSizer(flags);
+    if ( !sizer )
+        return NULL;
+
+    return CreateSeparatedSizer(sizer);
+}
+
 #if wxUSE_BUTTON
 
 wxStdDialogButtonSizer *wxDialogBase::CreateStdDialogButtonSizer( long flags )
@@ -465,25 +439,24 @@ void wxDialogBase::OnButton(wxCommandEvent& event)
 }
 
 // ----------------------------------------------------------------------------
-// compatibility methods for supporting the modality API 
+// compatibility methods for supporting the modality API
 // ----------------------------------------------------------------------------
 
 wxDEFINE_EVENT( wxEVT_WINDOW_MODAL_DIALOG_CLOSED , wxWindowModalDialogEvent  );
 
 IMPLEMENT_DYNAMIC_CLASS(wxWindowModalDialogEvent, wxCommandEvent)
 
-bool wxDialogBase::ShowWindowModal ()
+void wxDialogBase::ShowWindowModal ()
 {
     ShowModal();
     SendWindowModalDialogEvent ( wxEVT_WINDOW_MODAL_DIALOG_CLOSED  );
-    return true;
 }
 
 void wxDialogBase::SendWindowModalDialogEvent ( wxEventType type )
 {
-    wxCommandEvent event ( type, GetId());
+    wxWindowModalDialogEvent event ( type, GetId());
     event.SetEventObject(this);
-    
+
     if ( !GetEventHandler()->ProcessEvent(event) )
     {
         // the event is not propagated upwards to the parent automatically
@@ -491,7 +464,7 @@ void wxDialogBase::SendWindowModalDialogEvent ( wxEventType type )
         // in 9 cases of 10 the message must be processed by the dialog
         // owner and not the dialog itself
         (void)GetParent()->GetEventHandler()->ProcessEvent(event);
-    }    
+    }
 }
 
 
@@ -680,8 +653,7 @@ bool wxStandardDialogLayoutAdapter::DoLayoutAdaptation(wxDialog* dialog)
                     stdButtonSizer->Realize();
                 else
                 {
-                    delete buttonSizer;
-                    buttonSizer = NULL;
+                    wxDELETE(buttonSizer);
                 }
             }