X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/92afa2b150803da84a4bc7dfa4e580dbbff15c9a..eff339168e77e6a07d686824ff78df2dc7a866d9:/src/generic/textdlgg.cpp?ds=inline diff --git a/src/generic/textdlgg.cpp b/src/generic/textdlgg.cpp index b828f75294..b00d192f7b 100644 --- a/src/generic/textdlgg.cpp +++ b/src/generic/textdlgg.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: textdlgg.cpp +// Name: src/generic/textdlgg.cpp // Purpose: wxTextEntryDialog // Author: Julian Smart // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "textdlgg.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -28,9 +24,11 @@ #pragma hdrstop #endif -#ifndef WX_PRECOMP - #include +#if wxUSE_TEXTDLG +#include "wx/generic/textdlgg.h" + +#ifndef WX_PRECOMP #include "wx/utils.h" #include "wx/dialog.h" #include "wx/button.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 @@ -60,61 +59,142 @@ static const int wxID_TEXT = 3000; // wxTextEntryDialog // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY BEGIN_EVENT_TABLE(wxTextEntryDialog, wxDialog) EVT_BUTTON(wxID_OK, wxTextEntryDialog::OnOK) END_EVENT_TABLE() IMPLEMENT_CLASS(wxTextEntryDialog, wxDialog) -#endif -wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent, +bool wxTextEntryDialog::Create(wxWindow *parent, const wxString& message, const wxString& caption, const wxString& value, long style, const wxPoint& pos) - : wxDialog(parent, -1, caption, pos, wxDefaultSize, - wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL), - m_value(value) { + if ( !wxDialog::Create(GetParentForModalDialog(parent, style), + wxID_ANY, caption, + pos, wxDefaultSize, + wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) ) + { + return false; + } + m_dialogStyle = style; m_value = value; wxBeginBusyCursor(); - + wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); - // 1) text message - topsizer->Add( CreateTextSizer( message ), 0, wxALL, 10 ); - - // 2) text ctrl - m_textctrl = new wxTextCtrl(this, wxID_TEXT, value, wxDefaultPosition, wxSize(300, -1)); - topsizer->Add( m_textctrl, 1, wxEXPAND | wxLEFT|wxRIGHT, 15 ); + wxSizerFlags flagsBorder2; + flagsBorder2.DoubleBorder(); -#if wxUSE_STATLINE - // 3) static line - topsizer->Add( new wxStaticLine( this, -1 ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 ); +#if wxUSE_STATTEXT + // 1) text message + topsizer->Add(CreateTextSizer(message), flagsBorder2); #endif - // 4) buttons - topsizer->Add( CreateButtonSizer( style ), 0, wxCENTRE | wxALL, 10 ); - + // 2) text ctrl + m_textctrl = new wxTextCtrl(this, wxID_TEXT, value, + wxDefaultPosition, wxSize(300, wxDefaultCoord), + style & ~wxTextEntryDialogStyle); + + 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 + + // 3) buttons if any + wxSizer *buttonSizer = CreateSeparatedButtonSizer(style & (wxOK | wxCANCEL)); + if ( buttonSizer ) + { + topsizer->Add(buttonSizer, wxSizerFlags(flagsBorder2).Expand()); + } + + SetAutoLayout( true ); + SetSizer( topsizer ); + topsizer->SetSizeHints( this ); topsizer->Fit( this ); - SetSizer( topsizer ); - SetAutoLayout( TRUE ); - Centre( wxBOTH ); + if ( style & wxCENTRE ) + Centre( wxBOTH ); + m_textctrl->SelectAll(); m_textctrl->SetFocus(); wxEndBusyCursor(); + + return true; } void wxTextEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event) ) { +#if wxUSE_VALIDATORS + if( Validate() && TransferDataFromWindow() ) + { + EndModal( wxID_OK ); + } +#else m_value = m_textctrl->GetValue(); EndModal(wxID_OK); +#endif + // wxUSE_VALIDATORS +} + +void wxTextEntryDialog::SetValue(const wxString& val) +{ + m_value = val; + + m_textctrl->SetValue(val); +} + +#if wxUSE_VALIDATORS + +#if WXWIN_COMPATIBILITY_2_8 +void wxTextEntryDialog::SetTextValidator( long style ) +{ + SetTextValidator((wxTextValidatorStyle)style); +} +#endif + +void wxTextEntryDialog::SetTextValidator( wxTextValidatorStyle style ) +{ + wxTextValidator validator( style, &m_value ); + m_textctrl->SetValidator( validator ); } + +void wxTextEntryDialog::SetTextValidator( const wxTextValidator& validator ) +{ + m_textctrl->SetValidator( validator ); +} + +#endif + // wxUSE_VALIDATORS + +// ---------------------------------------------------------------------------- +// wxPasswordEntryDialog +// ---------------------------------------------------------------------------- + +IMPLEMENT_CLASS(wxPasswordEntryDialog, wxTextEntryDialog) + +wxPasswordEntryDialog::wxPasswordEntryDialog(wxWindow *parent, + const wxString& message, + const wxString& caption, + const wxString& value, + long style, + const wxPoint& pos) + : wxTextEntryDialog(parent, message, caption, value, + style | wxTE_PASSWORD, pos) +{ + // Only change from wxTextEntryDialog is the password style +} + +#endif // wxUSE_TEXTDLG