X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e9f4948e73cc32814aa96546c4d975afd252cda9..677dc0ed1a3ff68af15f6246d6d0708d5264b07a:/src/generic/textdlgg.cpp diff --git a/src/generic/textdlgg.cpp b/src/generic/textdlgg.cpp index b89b9d5de3..50ea1ad378 100644 --- a/src/generic/textdlgg.cpp +++ b/src/generic/textdlgg.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: textdlgg.cpp +// Name: src/generic/textdlgg.cpp // Purpose: wxTextEntryDialog // Author: Julian Smart // Modified by: @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "textdlgg.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -30,6 +26,8 @@ #if wxUSE_TEXTDLG +#include "wx/generic/textdlgg.h" + #ifndef WX_PRECOMP #include "wx/utils.h" #include "wx/dialog.h" @@ -44,7 +42,8 @@ #include "wx/statline.h" #endif -#include "wx/generic/textdlgg.h" +const char wxGetTextFromUserPromptStr[] = "Input Text"; +const char wxGetPasswordFromUserPromptStr[] = "Enter Password"; // ---------------------------------------------------------------------------- // constants @@ -52,20 +51,6 @@ static const int wxID_TEXT = 3000; -// --------------------------------------------------------------------------- -// macros -// --------------------------------------------------------------------------- - -/* Macro for avoiding #ifdefs when value have to be different depending on size of - device we display on - take it from something like wxDesktopPolicy in the future - */ - -#if defined(__SMARTPHONE__) - #define wxLARGESMALL(large,small) small -#else - #define wxLARGESMALL(large,small) large -#endif - // ============================================================================ // implementation // ============================================================================ @@ -86,8 +71,9 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent, const wxString& value, long style, const wxPoint& pos) - : wxDialog(parent, wxID_ANY, caption, pos, wxDefaultSize, - wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL), + : wxDialog(GetParentForModalDialog(parent), + wxID_ANY, caption, pos, wxDefaultSize, + wxDEFAULT_DIALOG_STYLE), m_value(value) { m_dialogStyle = style; @@ -97,37 +83,35 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent, wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); + wxSizerFlags flagsBorder2; + flagsBorder2.DoubleBorder(); + +#if wxUSE_STATTEXT // 1) text message - topsizer->Add( CreateTextSizer( message ), 0, wxALL, wxLARGESMALL(10,0) ); + topsizer->Add(CreateTextSizer(message), flagsBorder2); +#endif // 2) text ctrl m_textctrl = new wxTextCtrl(this, wxID_TEXT, value, wxDefaultPosition, wxSize(300, wxDefaultCoord), style & ~wxTextEntryDialogStyle); - topsizer->Add( m_textctrl, 1, wxEXPAND | wxLEFT|wxRIGHT, wxLARGESMALL(15,0) ); + + topsizer->Add(m_textctrl, + wxSizerFlags(style & wxTE_MULTILINE ? 1 : 0). + Expand(). + TripleBorder(wxLEFT | wxRIGHT)); #if wxUSE_VALIDATORS wxTextValidator validator( wxFILTER_NONE, &m_value ); m_textctrl->SetValidator( validator ); -#endif - // wxUSE_VALIDATORS - - // smart phones does not support or do not waste space for wxButtons -#ifdef __SMARTPHONE__ - - SetRightMenu(wxID_CANCEL, _("Cancel")); - -#else // __SMARTPHONE__/!__SMARTPHONE__ +#endif // wxUSE_VALIDATORS -#if wxUSE_STATLINE - // 3) static line - topsizer->Add( new wxStaticLine( this, wxID_ANY ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 ); -#endif - - // 4) buttons - topsizer->Add( CreateButtonSizer( style ), 0, wxCENTRE | wxALL, 10 ); - -#endif // !__SMARTPHONE__ + // 3) buttons if any + wxSizer *buttonSizer = CreateSeparatedButtonSizer(style & ButtonSizerFlags); + if ( buttonSizer ) + { + topsizer->Add(buttonSizer, wxSizerFlags(flagsBorder2).Expand()); + } SetAutoLayout( true ); SetSizer( topsizer ); @@ -173,7 +157,7 @@ void wxTextEntryDialog::SetTextValidator( long style ) m_textctrl->SetValidator( validator ); } -void wxTextEntryDialog::SetTextValidator( wxTextValidator& validator ) +void wxTextEntryDialog::SetTextValidator( const wxTextValidator& validator ) { m_textctrl->SetValidator( validator ); }