]> git.saurik.com Git - wxWidgets.git/blobdiff - src/common/dlgcmn.cpp
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
added vendor display name (for consistency with app display name &c) (patch 1831303)
[wxWidgets.git] / src / common / dlgcmn.cpp
diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index ec34631b674f4477bd9b18b319b5db9bf5734b86..5621cbc6a978991b91aa58ef451a9829a013d54d 100644 (file)
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -27,6 +27,7 @@
 #include "wx/dialog.h"
 
 #ifndef WX_PRECOMP
 #include "wx/dialog.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/app.h"
     #include "wx/button.h"
     #include "wx/dcclient.h"
     #include "wx/intl.h"
     #include "wx/button.h"
     #include "wx/dcclient.h"
     #include "wx/intl.h"
@@ -38,80 +39,21 @@
 
 #include "wx/statline.h"
 #include "wx/sysopt.h"
 
 #include "wx/statline.h"
 #include "wx/sysopt.h"
+#include "wx/private/stattext.h"
 
 
-#if wxUSE_STATTEXT
-
-// ----------------------------------------------------------------------------
-// wxTextWrapper
-// ----------------------------------------------------------------------------
-
-// this class is used to wrap the text on word boundary: wrapping is done by
-// calling OnStartLine() and OnOutputLine() functions
-class wxTextWrapper
-{
-public:
-    wxTextWrapper() { m_eol = false; }
-
-    // win is used for getting the font, text is the text to wrap, width is the
-    // max line width or -1 to disable wrapping
-    void Wrap(wxWindow *win, const wxString& text, int widthMax);
-
-    // we don't need it, but just to avoid compiler warnings
-    virtual ~wxTextWrapper() { }
-
-protected:
-    // line may be empty
-    virtual void OnOutputLine(const wxString& line) = 0;
-
-    // called at the start of every new line (except the very first one)
-    virtual void OnNewLine() { }
-
-private:
-    // call OnOutputLine() and set m_eol to true
-    void DoOutputLine(const wxString& line)
-    {
-        OnOutputLine(line);
-
-        m_eol = true;
-    }
-
-    // this function is a destructive inspector: when it returns true it also
-    // resets the flag to false so calling it again woulnd't return true any
-    // more
-    bool IsStartOfNewLine()
-    {
-        if ( !m_eol )
-            return false;
-
-        m_eol = false;
-
-        return true;
-    }
-
-
-    bool m_eol;
-};
-
-#endif // wxUSE_STATTEXT
 
 // ----------------------------------------------------------------------------
 // wxDialogBase
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(wxDialogBase, wxTopLevelWindow)
 
 // ----------------------------------------------------------------------------
 // wxDialogBase
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(wxDialogBase, wxTopLevelWindow)
-    EVT_BUTTON(wxID_OK, wxDialogBase::OnAffirmativeButton)
-    EVT_BUTTON(wxID_APPLY, wxDialogBase::OnApply)
-    EVT_BUTTON(wxID_CANCEL, wxDialogBase::OnCancelButton)
+    EVT_BUTTON(wxID_ANY, wxDialogBase::OnButton)
 
     EVT_CLOSE(wxDialogBase::OnCloseWindow)
 
     EVT_CHAR_HOOK(wxDialogBase::OnCharHook)
 
     EVT_CLOSE(wxDialogBase::OnCloseWindow)
 
     EVT_CHAR_HOOK(wxDialogBase::OnCharHook)
-
-    WX_EVENT_TABLE_CONTROL_CONTAINER(wxDialogBase)
 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 
-WX_DELEGATE_TO_CONTROL_CONTAINER(wxDialogBase, wxTopLevelWindow)
-
 void wxDialogBase::Init()
 {
     m_returnCode = 0;
 void wxDialogBase::Init()
 {
     m_returnCode = 0;
@@ -122,64 +64,40 @@ void wxDialogBase::Init()
     // dialog controls from reaching the parent frame which is usually
     // undesirable and can lead to unexpected and hard to find bugs
     SetExtraStyle(GetExtraStyle() | wxWS_EX_BLOCK_EVENTS);
     // dialog controls from reaching the parent frame which is usually
     // undesirable and can lead to unexpected and hard to find bugs
     SetExtraStyle(GetExtraStyle() | wxWS_EX_BLOCK_EVENTS);
-
-    m_container.SetContainerWindow(this);
 }
 
 }
 
-#if wxUSE_STATTEXT
-
-void wxTextWrapper::Wrap(wxWindow *win, const wxString& text, int widthMax)
+// helper of GetParentForModalDialog()
+static bool CanBeUsedAsParent(wxWindow *parent)
 {
 {
-    const wxChar *lastSpace = NULL;
-    wxString line;
+    extern WXDLLIMPEXP_DATA_CORE(wxList) wxPendingDelete;
 
 
-    const wxChar *lineStart = text.c_str();
-    for ( const wxChar *p = lineStart; ; p++ )
-    {
-        if ( IsStartOfNewLine() )
-        {
-            OnNewLine();
+    return !parent->HasExtraStyle(wxWS_EX_TRANSIENT) &&
+                parent->IsShownOnScreen() &&
+                    !wxPendingDelete.Member(parent) &&
+                        !parent->IsBeingDeleted();
+}
 
 
-            lastSpace = NULL;
-            line.clear();
-            lineStart = p;
-        }
+wxWindow *wxDialogBase::GetParentForModalDialog(wxWindow *parent) 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:
+    if ( parent )
+        parent = wxGetTopLevelParent(parent);
 
 
-        if ( *p == _T('\n') || *p == _T('\0') )
-        {
-            DoOutputLine(line);
+    if ( !parent || !CanBeUsedAsParent(parent) )
+        parent = wxTheApp->GetTopWindow();
 
 
-            if ( *p == _T('\0') )
-                break;
-        }
-        else // not EOL
-        {
-            if ( *p == _T(' ') )
-                lastSpace = p;
-
-            line += *p;
-
-            if ( widthMax >= 0 && lastSpace )
-            {
-                int width;
-                win->GetTextExtent(line, &width, NULL);
-
-                if ( width > widthMax )
-                {
-                    // remove the last word from this line
-                    line.erase(lastSpace - lineStart, p + 1 - lineStart);
-                    DoOutputLine(line);
-
-                    // go back to the last word of this line which we didn't
-                    // output yet
-                    p = lastSpace;
-                }
-            }
-            //else: no wrapping at all or impossible to wrap
-        }
+    if ( parent && !CanBeUsedAsParent(parent) )
+    {
+        // can't use this one, it's going to disappear
+        parent = NULL;
     }
     }
+
+    return parent;
 }
 
 }
 
+#if wxUSE_STATTEXT
+
 class wxTextSizerWrapper : public wxTextWrapper
 {
 public:
 class wxTextSizerWrapper : public wxTextWrapper
 {
 public:
@@ -240,121 +158,66 @@ wxSizer *wxDialogBase::CreateTextSizer(const wxString& message)
     return wrapper.CreateSizer(text, widthMax);
 }
 
     return wrapper.CreateSizer(text, widthMax);
 }
 
-class wxLabelWrapper : public wxTextWrapper
-{
-public:
-    void WrapLabel(wxWindow *text, int widthMax)
-    {
-        m_text.clear();
-        Wrap(text, text->GetLabel(), widthMax);
-        text->SetLabel(m_text);
-    }
-
-protected:
-    virtual void OnOutputLine(const wxString& line)
-    {
-        m_text += line;
-    }
-
-    virtual void OnNewLine()
-    {
-        m_text += _T('\n');
-    }
-
-private:
-    wxString m_text;
-};
-
-// NB: don't "factor out" the scope operator, SGI MIPSpro 7.3 (but not 7.4)
-//     gets confused if it doesn't immediately follow the class name
-void
-#if defined(__WXGTK__) && !defined(__WXUNIVERSAL__)
-wxStaticText::
-#else
-wxStaticTextBase::
-#endif
-Wrap(int width)
-{
-    wxLabelWrapper wrapper;
-    wrapper.WrapLabel(this, width);
-}
-
 #endif // wxUSE_STATTEXT
 
 #endif // wxUSE_STATTEXT
 
-wxSizer *wxDialogBase::CreateButtonSizer( long flags, bool separated, wxCoord distance )
+wxSizer *wxDialogBase::CreateButtonSizer(long flags)
 {
 {
-#ifdef __SMARTPHONE__
-    wxUnusedVar(separated);
-    wxUnusedVar(distance);
+    wxSizer *sizer = NULL;
 
 
+#ifdef __SMARTPHONE__
     wxDialog* dialog = (wxDialog*) this;
     wxDialog* dialog = (wxDialog*) this;
-    if (flags & wxOK){
+    if ( flags & wxOK )
         dialog->SetLeftMenu(wxID_OK);
         dialog->SetLeftMenu(wxID_OK);
-    }
 
 
-    if (flags & wxCANCEL){
+    if ( flags & wxCANCEL )
         dialog->SetRightMenu(wxID_CANCEL);
         dialog->SetRightMenu(wxID_CANCEL);
-    }
 
 
-    if (flags & wxYES){
+    if ( flags & wxYES )
         dialog->SetLeftMenu(wxID_YES);
         dialog->SetLeftMenu(wxID_YES);
-    }
-
-    if (flags & wxNO){
-        dialog->SetLeftMenu(wxID_NO);
-    }
-    wxBoxSizer* sizer = new wxBoxSizer(wxHORIZONTAL);
-    return sizer;
 
 
+    if ( flags & wxNO )
+        dialog->SetRightMenu(wxID_NO);
 #else // !__SMARTPHONE__
 
 #else // !__SMARTPHONE__
 
+#if wxUSE_BUTTON
+
 #ifdef __POCKETPC__
 #ifdef __POCKETPC__
-    // PocketPC guidelines recommend for Ok/Cancel dialogs to use
-    // OK button located inside caption bar and implement Cancel functionality
-    // through Undo outside dialog. As native behaviour this will be default
-    // here but can be easily replaced with real wxButtons
-    // with "wince.dialog.real-ok-cancel" option set to 1
-    if ( ((flags & ~(wxCANCEL|wxNO_DEFAULT))== wxOK) &&
-         (wxSystemOptions::GetOptionInt(wxT("wince.dialog.real-ok-cancel"))==0)
-       )
+    // PocketPC guidelines recommend for Ok/Cancel dialogs to use OK button
+    // located inside caption bar and implement Cancel functionality through
+    // Undo outside dialog. As native behaviour this will be default here but
+    // can be replaced with real wxButtons by setting the option below to 1
+    if ( (flags & ~(wxCANCEL|wxNO_DEFAULT)) != wxOK ||
+            wxSystemOptions::GetOptionInt(wxT("wince.dialog.real-ok-cancel")) )
+#endif // __POCKETPC__
     {
     {
-        wxBoxSizer* sizer = new wxBoxSizer(wxHORIZONTAL);
-        return sizer;
+        sizer = CreateStdDialogButtonSizer(flags);
     }
     }
-#endif // __POCKETPC__
-
-#if wxUSE_BUTTON
-
-    wxSizer* buttonSizer = CreateStdDialogButtonSizer( flags );
-
-    // Mac Human Interface Guidelines recommend not to use static lines as grouping elements
-#if wxUSE_STATLINE && !defined(__WXMAC__)
-    if(!separated)
-        return buttonSizer;
-
-    wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
-    topsizer->Add( new wxStaticLine( this, wxID_ANY ), 0, wxEXPAND | wxBOTTOM, distance );
-    topsizer->Add( buttonSizer, 0, wxEXPAND );
-    return topsizer;
+#else // !wxUSE_BUTTON
+    wxUnusedVar(flags);
+#endif // wxUSE_BUTTON/!wxUSE_BUTTON
 
 
-#else // !wxUSE_STATLINE
+#endif // __SMARTPHONE__/!__SMARTPHONE__
 
 
-    wxUnusedVar(separated);
-    wxUnusedVar(distance);
-    return buttonSizer;
+    return sizer;
+}
 
 
-#endif // wxUSE_STATLINE/!wxUSE_STATLINE
+wxSizer *wxDialogBase::CreateSeparatedButtonSizer(long flags)
+{
+    wxSizer *sizer = CreateButtonSizer(flags);
+    if ( !sizer )
+        return NULL;
 
 
-#else // !wxUSE_BUTTON
+    // Mac Human Interface Guidelines recommend not to use static lines as
+    // grouping elements
+#if wxUSE_STATLINE && !defined(__WXMAC__)
+    wxBoxSizer *topsizer = new wxBoxSizer(wxVERTICAL);
+    topsizer->Add(new wxStaticLine(this),
+                   wxSizerFlags().Expand().DoubleBorder(wxBOTTOM));
+    topsizer->Add(sizer, wxSizerFlags().Expand());
+    sizer = topsizer;
+#endif // wxUSE_STATLINE
 
 
-    wxUnusedVar(separated);
-    wxUnusedVar(distance);
-    wxBoxSizer* sizer = new wxBoxSizer(wxHORIZONTAL);
     return sizer;
     return sizer;
-
-#endif // wxUSE_BUTTON/!wxUSE_BUTTON
-
-#endif // __SMARTPHONE__/!__SMARTPHONE__
 }
 
 #if wxUSE_BUTTON
 }
 
 #if wxUSE_BUTTON
@@ -367,27 +230,44 @@ wxStdDialogButtonSizer *wxDialogBase::CreateStdDialogButtonSizer( long flags )
     wxButton *yes = NULL;
     wxButton *no = NULL;
 
     wxButton *yes = NULL;
     wxButton *no = NULL;
 
-    if (flags & wxOK){
+    if (flags & wxOK)
+    {
         ok = new wxButton(this, wxID_OK);
         sizer->AddButton(ok);
     }
 
         ok = new wxButton(this, wxID_OK);
         sizer->AddButton(ok);
     }
 
-    if (flags & wxCANCEL){
+    if (flags & wxCANCEL)
+    {
         wxButton *cancel = new wxButton(this, wxID_CANCEL);
         sizer->AddButton(cancel);
     }
 
         wxButton *cancel = new wxButton(this, wxID_CANCEL);
         sizer->AddButton(cancel);
     }
 
-    if (flags & wxYES){
+    if (flags & wxYES)
+    {
         yes = new wxButton(this, wxID_YES);
         sizer->AddButton(yes);
     }
 
         yes = new wxButton(this, wxID_YES);
         sizer->AddButton(yes);
     }
 
-    if (flags & wxNO){
+    if (flags & wxNO)
+    {
         no = new wxButton(this, wxID_NO);
         sizer->AddButton(no);
     }
 
         no = new wxButton(this, wxID_NO);
         sizer->AddButton(no);
     }
 
-    if (flags & wxHELP){
+    if (flags & wxAPPLY)
+    {
+        wxButton *apply = new wxButton(this, wxID_APPLY);
+        sizer->AddButton(apply);
+    }
+
+    if (flags & wxCLOSE)
+    {
+        wxButton *close = new wxButton(this, wxID_CLOSE);
+        sizer->AddButton(close);
+    }
+
+    if (flags & wxHELP)
+    {
         wxButton *help = new wxButton(this, wxID_HELP);
         sizer->AddButton(help);
     }
         wxButton *help = new wxButton(this, wxID_HELP);
         sizer->AddButton(help);
     }
@@ -427,87 +307,38 @@ wxStdDialogButtonSizer *wxDialogBase::CreateStdDialogButtonSizer( long flags )
 #endif // wxUSE_BUTTON
 
 // ----------------------------------------------------------------------------
 #endif // wxUSE_BUTTON
 
 // ----------------------------------------------------------------------------
-// escape/affirmatives button handling
+// standard buttons handling
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 
+void wxDialogBase::EndDialog(int rc)
+{
+    if ( IsModal() )
+        EndModal(rc);
+    else
+        Hide();
+}
+
 void wxDialogBase::AcceptAndClose()
 {
     if ( Validate() && TransferDataFromWindow() )
     {
 void wxDialogBase::AcceptAndClose()
 {
     if ( Validate() && TransferDataFromWindow() )
     {
-        EndDialog(wxID_OK);
+        EndDialog(m_affirmativeId);
     }
 }
 
 void wxDialogBase::SetAffirmativeId(int affirmativeId)
 {
     }
 }
 
 void wxDialogBase::SetAffirmativeId(int affirmativeId)
 {
-    if ( affirmativeId == m_affirmativeId )
-        return;
-
-    // disconnect the handler for the old affirmative button
-    if ( m_affirmativeId != wxID_NONE && m_affirmativeId != wxID_OK )
-    {
-        if ( !Disconnect
-              (
-                m_affirmativeId,
-                wxEVT_COMMAND_BUTTON_CLICKED,
-                wxCommandEventHandler(wxDialogBase::OnAffirmativeButton)
-              ) )
-        {
-            wxFAIL_MSG( _T("failed to disconnect old ok handler") );
-        }
-    }
-    //else: wxID_OK is always handled
-
-    // connect the handler to the new button
-    if ( affirmativeId != wxID_NONE )
-    {
-        Connect(m_affirmativeId,
-                wxEVT_COMMAND_BUTTON_CLICKED,
-                wxCommandEventHandler(wxDialogBase::OnAffirmativeButton));
-    }
-    //else: no affirmative button
-
     m_affirmativeId = affirmativeId;
 }
 
 void wxDialogBase::SetEscapeId(int escapeId)
 {
     m_affirmativeId = affirmativeId;
 }
 
 void wxDialogBase::SetEscapeId(int escapeId)
 {
-    if ( escapeId == m_escapeId )
-        return;
-
-    if ( m_escapeId != wxID_ANY &&
-            m_escapeId != wxID_CANCEL &&
-                m_escapeId != wxID_ANY )
-    {
-        if ( !Disconnect
-              (
-                m_escapeId,
-                wxEVT_COMMAND_BUTTON_CLICKED,
-                wxCommandEventHandler(wxDialogBase::OnCancelButton)
-              ) )
-        {
-            wxFAIL_MSG( _T("failed to disconnect old cancel handler") );
-        }
-    }
-    //else: wxID_CANCEL is always handled
-
-    // connect the handler to the new button
-    if ( escapeId != wxID_NONE )
-    {
-        Connect(m_escapeId,
-                wxEVT_COMMAND_BUTTON_CLICKED,
-                wxCommandEventHandler(wxDialogBase::OnCancelButton));
-    }
-
     m_escapeId = escapeId;
 }
 
     m_escapeId = escapeId;
 }
 
-// ----------------------------------------------------------------------------
-// event handling stuff
-// ----------------------------------------------------------------------------
-
 bool wxDialogBase::EmulateButtonClickIfPresent(int id)
 {
 bool wxDialogBase::EmulateButtonClickIfPresent(int id)
 {
+#if wxUSE_BUTTON
     wxButton *btn = wxDynamicCast(FindWindow(id), wxButton);
 
     if ( !btn || !btn->IsEnabled() || !btn->IsShown() )
     wxButton *btn = wxDynamicCast(FindWindow(id), wxButton);
 
     if ( !btn || !btn->IsEnabled() || !btn->IsShown() )
@@ -518,14 +349,10 @@ bool wxDialogBase::EmulateButtonClickIfPresent(int id)
     btn->GetEventHandler()->ProcessEvent(event);
 
     return true;
     btn->GetEventHandler()->ProcessEvent(event);
 
     return true;
-}
-
-void wxDialogBase::EndDialog(int rc)
-{
-    if ( IsModal() )
-        EndModal(rc);
-    else
-        Hide();
+#else // !wxUSE_BUTTON
+    wxUnusedVar(id);
+    return false;
+#endif // wxUSE_BUTTON/!wxUSE_BUTTON
 }
 
 bool wxDialogBase::IsEscapeKey(const wxKeyEvent& event)
 }
 
 bool wxDialogBase::IsEscapeKey(const wxKeyEvent& event)
@@ -564,23 +391,34 @@ void wxDialogBase::OnCharHook(wxKeyEvent& event)
     event.Skip();
 }
 
     event.Skip();
 }
 
-void wxDialogBase::OnAffirmativeButton(wxCommandEvent& WXUNUSED(event))
-{
-    AcceptAndClose();
-}
-
-void wxDialogBase::OnApply(wxCommandEvent& WXUNUSED(event))
+void wxDialogBase::OnButton(wxCommandEvent& event)
 {
 {
-    if ( Validate() )
-        TransferDataFromWindow();
+    const int id = event.GetId();
+    if ( id == GetAffirmativeId() )
+    {
+        AcceptAndClose();
+    }
+    else if ( id == wxID_APPLY )
+    {
+        if ( Validate() )
+            TransferDataFromWindow();
 
 
-    // TODO probably need to disable the Apply button until things change again
+        // TODO: disable the Apply button until things change again
+    }
+    else if ( id == GetEscapeId() ||
+                (id == wxID_CANCEL && GetEscapeId() == wxID_ANY) )
+    {
+        EndDialog(wxID_CANCEL);
+    }
+    else // not a standard button
+    {
+        event.Skip();
+    }
 }
 
 }
 
-void wxDialogBase::OnCancelButton(wxCommandEvent& WXUNUSED(event))
-{
-    EndDialog(wxID_CANCEL);
-}
+// ----------------------------------------------------------------------------
+// other event handlers
+// ----------------------------------------------------------------------------
 
 void wxDialogBase::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 {
 
 void wxDialogBase::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 {
@@ -612,8 +450,12 @@ void wxDialogBase::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
     closing.DeleteObject(this);
 }
 
     closing.DeleteObject(this);
 }
 
-void wxDialogBase::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
+void wxDialogBase::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
 {
-  SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
-  Refresh();
+#ifndef __WXGTK__
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
+    Refresh();
+#endif
+
+    event.Skip();
 }
 }
wxWidgets (Impactor)