X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/718903fe6402bb374a801e43e856b02204401204..6012f61212b67d510e4a6393272e867a4ceb58c1:/src/common/dlgcmn.cpp diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp index ca535d37d2..56f113c20a 100644 --- a/src/common/dlgcmn.cpp +++ b/src/common/dlgcmn.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: common/dlgcmn.cpp +// Name: src/common/dlgcmn.cpp // Purpose: common (to all ports) wxDialog functions // Author: Vadim Zeitlin // Modified by: @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "dialogbase.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -28,23 +24,81 @@ #pragma hdrstop #endif +#include "wx/dialog.h" + #ifndef WX_PRECOMP #include "wx/button.h" - #include "wx/dialog.h" #include "wx/dcclient.h" #include "wx/intl.h" #include "wx/settings.h" #include "wx/stattext.h" #include "wx/sizer.h" - #include "wx/button.h" #include "wx/containr.h" #endif -//-------------------------------------------------------------------------- +#include "wx/statline.h" +#include "wx/sysopt.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 -//-------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- -// FIXME - temporary hack in absence of wxtopLevelWindow, should be always used +// FIXME - temporary hack in absence of wxTopLevelWindow, should be always used #ifdef wxTopLevelWindowNative BEGIN_EVENT_TABLE(wxDialogBase, wxTopLevelWindow) WX_EVENT_TABLE_CONTROL_CONTAINER(wxDialogBase) @@ -56,6 +110,8 @@ WX_DELEGATE_TO_CONTROL_CONTAINER(wxDialogBase) void wxDialogBase::Init() { m_returnCode = 0; + m_affirmativeId = wxID_OK; + m_escapeId = wxID_ANY; // the dialogs have this flag on by default to prevent the events from the // dialog controls from reaching the parent frame which is usually @@ -67,115 +123,243 @@ void wxDialogBase::Init() #endif } -#if wxUSE_STATTEXT // && wxUSE_TEXTCTRL +#if wxUSE_STATTEXT + +void wxTextWrapper::Wrap(wxWindow *win, const wxString& text, int widthMax) +{ + const wxChar *lastSpace = NULL; + wxString line; + + const wxChar *lineStart = text.c_str(); + for ( const wxChar *p = lineStart; ; p++ ) + { + if ( IsStartOfNewLine() ) + { + OnNewLine(); + + lastSpace = NULL; + line.clear(); + lineStart = p; + } + + if ( *p == _T('\n') || *p == _T('\0') ) + { + DoOutputLine(line); + + 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); -wxSizer *wxDialogBase::CreateTextSizer( const wxString& message ) + 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 + } + } +} + +class wxTextSizerWrapper : public wxTextWrapper { - bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA); +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); + } + } - wxString text = message; +private: + wxWindow *m_win; + wxSizer *m_sizer; + int m_hLine; +}; +wxSizer *wxDialogBase::CreateTextSizer(const wxString& message) +{ // I admit that this is complete bogus, but it makes // message boxes work for pda screens temporarily.. - int max_width = -1; + int widthMax = -1; + const bool is_pda = wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA; if (is_pda) { - max_width = wxSystemSettings::GetMetric( wxSYS_SCREEN_X ) - 25; - text += wxT('\n'); + widthMax = wxSystemSettings::GetMetric( wxSYS_SCREEN_X ) - 25; } + // '&' is used as accel mnemonic prefix in the wxWidgets controls but in + // 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("&&")); - wxBoxSizer *box = new wxBoxSizer( wxVERTICAL ); + wxTextSizerWrapper wrapper(this); - // get line height for empty lines - int y = 0; - wxFont font( GetFont() ); - if (!font.Ok()) - font = *wxSWISS_FONT; - GetTextExtent( wxT("H"), (int*)NULL, &y, (int*)NULL, (int*)NULL, &font); + return wrapper.CreateSizer(text, widthMax); +} - size_t last_space = 0; - wxString line; - for ( size_t pos = 0; pos < text.length(); pos++ ) +class wxLabelWrapper : public wxTextWrapper +{ +public: + void WrapLabel(wxWindow *text, int widthMax) { - switch ( text[pos] ) - { - case wxT('\n'): - if (!line.empty()) - { - wxStaticText *s = new wxStaticText( this, wxID_ANY, line ); - box->Add( s ); - line = wxEmptyString; - } - else - { - box->Add( 5, y ); - } - break; + m_text.clear(); + Wrap(text, text->GetLabel(), widthMax); + text->SetLabel(m_text); + } - case wxT('&'): - // this is used as accel mnemonic prefix in the wxWidgets - // controls but in the static messages created by - // CreateTextSizer() (used by wxMessageBox, for example), we - // don't want this special meaning, so we need to quote it - line += wxT('&'); +protected: + virtual void OnOutputLine(const wxString& line) + { + m_text += line; + } - // fall through to add it normally too + virtual void OnNewLine() + { + m_text += _T('\n'); + } - default: - if (text[pos] == wxT(' ')) - last_space = pos; +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); +} - line += message[pos]; +#endif // wxUSE_STATTEXT - if (is_pda) - { - int width = 0; - GetTextExtent( line, &width, (int*)NULL, (int*)NULL, (int*)NULL, &font ); - - if (width > max_width) - { - // exception if there was no previous space - if (last_space == 0) - last_space = pos; - - int diff = pos-last_space; - int len = line.Len(); - line.Remove( len-diff, diff ); - - wxStaticText *s = new wxStaticText( this, wxID_ANY, line ); - box->Add( s ); - - pos = last_space; - last_space = 0; - line = wxEmptyString; - } - } - } +wxSizer *wxDialogBase::CreateButtonSizer( long flags, bool separated, wxCoord distance ) +{ +#ifdef __SMARTPHONE__ + wxUnusedVar(separated); + wxUnusedVar(distance); + + wxDialog* dialog = (wxDialog*) this; + if (flags & wxOK){ + dialog->SetLeftMenu(wxID_OK); } - // remaining text behind last '\n' - if (!line.empty()) - { - wxStaticText *s2 = new wxStaticText( this, wxID_ANY, line ); - box->Add( s2 ); + if (flags & wxCANCEL){ + dialog->SetRightMenu(wxID_CANCEL); } - return box; -} + if (flags & wxYES){ + dialog->SetLeftMenu(wxID_YES); + } -#endif // wxUSE_STATTEXT // && wxUSE_TEXTCTRL + if (flags & wxNO){ + dialog->SetLeftMenu(wxID_NO); + } + wxBoxSizer* sizer = new wxBoxSizer(wxHORIZONTAL); + return sizer; + +#else // !__SMARTPHONE__ + +#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) + ) + { + wxBoxSizer* sizer = new wxBoxSizer(wxHORIZONTAL); + return sizer; + } +#endif // __POCKETPC__ #if wxUSE_BUTTON -wxSizer *wxDialogBase::CreateButtonSizer( long flags ) -{ - return CreateStdDialogButtonSizer( flags ); + 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_STATLINE + + wxUnusedVar(separated); + wxUnusedVar(distance); + return buttonSizer; + +#endif // wxUSE_STATLINE/!wxUSE_STATLINE + +#else // !wxUSE_BUTTON + + wxUnusedVar(separated); + wxUnusedVar(distance); + wxBoxSizer* sizer = new wxBoxSizer(wxHORIZONTAL); + return sizer; + +#endif // wxUSE_BUTTON/!wxUSE_BUTTON + +#endif // __SMARTPHONE__/!__SMARTPHONE__ } +#if wxUSE_BUTTON + wxStdDialogButtonSizer *wxDialogBase::CreateStdDialogButtonSizer( long flags ) { wxStdDialogButtonSizer *sizer = new wxStdDialogButtonSizer(); + wxButton *ok = NULL; wxButton *yes = NULL; wxButton *no = NULL; @@ -205,8 +389,6 @@ wxStdDialogButtonSizer *wxDialogBase::CreateStdDialogButtonSizer( long flags ) sizer->AddButton(help); } - sizer->Realize(); - if (flags & wxNO_DEFAULT) { if (no) @@ -229,8 +411,14 @@ wxStdDialogButtonSizer *wxDialogBase::CreateStdDialogButtonSizer( long flags ) } } + if (flags & wxOK) + SetAffirmativeId(wxID_OK); + else if (flags & wxYES) + SetAffirmativeId(wxID_YES); + + sizer->Realize(); + return sizer; } - #endif // wxUSE_BUTTON