X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c50f1fb9226d9260454ccb9c8a67d0be23c2827f..12bb29f5432174ecbd65549bda832d70d34a98ae:/src/generic/textdlgg.cpp?ds=inline diff --git a/src/generic/textdlgg.cpp b/src/generic/textdlgg.cpp index ea9700ee66..03a5f690fc 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,28 +24,32 @@ #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" #include "wx/stattext.h" #include "wx/textctrl.h" #include "wx/intl.h" + #include "wx/sizer.h" #endif #if wxUSE_STATLINE #include "wx/statline.h" #endif -#include "wx/generic/textdlgg.h" +const char wxGetTextFromUserPromptStr[] = "Input Text"; +const char wxGetPasswordFromUserPromptStr[] = "Enter Password"; // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- -#define wxID_TEXT 3000 +static const int wxID_TEXT = 3000; // ============================================================================ // implementation @@ -59,79 +59,147 @@ // 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) { - // calculate the sizes - // ------------------- - - wxArrayString lines; - wxSize sizeText = SplitTextMessage(message, &lines); - - wxSize sizeBtn = GetStandardButtonSize(); + if ( !wxDialog::Create(GetParentForModalDialog(parent, style), + wxID_ANY, caption, + pos, wxDefaultSize, + wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) ) + { + return false; + } - long wText = wxMax(4*sizeBtn.GetWidth(), sizeText.GetWidth()); - long hText = GetStandardTextHeight(); + m_dialogStyle = style; + m_value = value; - long wDialog = 4*LAYOUT_X_MARGIN + wText; - long hDialog = 2*LAYOUT_Y_MARGIN + - sizeText.GetHeight() * lines.GetCount() + - 2*LAYOUT_Y_MARGIN + - hText + - 2*LAYOUT_Y_MARGIN + - sizeBtn.GetHeight() + - 2*LAYOUT_Y_MARGIN; + wxBeginBusyCursor(); - // create the controls - // ------------------- + wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); - // message - long x = 2*LAYOUT_X_MARGIN; - long y = CreateTextMessage(lines, - wxPoint(x, 2*LAYOUT_Y_MARGIN), - sizeText); + wxSizerFlags flagsBorder2; + flagsBorder2.DoubleBorder(); - y += 2*LAYOUT_X_MARGIN; +#if wxUSE_STATTEXT + // 1) text message + topsizer->Add(CreateTextSizer(message), flagsBorder2); +#endif - // text ctrl - m_textctrl = new wxTextCtrl(this, wxID_TEXT, m_value, - wxPoint(x, y), - wxSize(wText, hText)); - y += hText + 2*LAYOUT_X_MARGIN; + // 2) text ctrl + m_textctrl = new wxTextCtrl(this, wxID_TEXT, value, + wxDefaultPosition, wxSize(300, wxDefaultCoord), + style & ~wxTextEntryDialogStyle); - // and buttons - CreateStandardButtons(wDialog, y, sizeBtn.GetWidth(), sizeBtn.GetHeight()); + topsizer->Add(m_textctrl, + wxSizerFlags(style & wxTE_MULTILINE ? 1 : 0). + Expand(). + TripleBorder(wxLEFT | wxRIGHT)); - // set the dialog size and position - SetClientSize(wDialog, hDialog); - if ( pos == wxDefaultPosition ) + // 3) buttons if any + wxSizer *buttonSizer = CreateSeparatedButtonSizer(style & (wxOK | wxCANCEL)); + if ( buttonSizer ) { - // centre the dialog if no explicit position given - Centre(wxBOTH | wxCENTER_FRAME); + topsizer->Add(buttonSizer, wxSizerFlags(flagsBorder2).Expand()); } + SetAutoLayout( true ); + SetSizer( topsizer ); + + topsizer->SetSizeHints( this ); + topsizer->Fit( this ); + + if ( style & wxCENTRE ) + Centre( wxBOTH ); + + m_textctrl->SelectAll(); m_textctrl->SetFocus(); + + wxEndBusyCursor(); + + return true; } -void wxTextEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event) ) +bool wxTextEntryDialog::TransferDataToWindow() +{ + m_textctrl->SetValue(m_value); + + return wxDialog::TransferDataToWindow(); +} + +bool wxTextEntryDialog::TransferDataFromWindow() { m_value = m_textctrl->GetValue(); - EndModal(wxID_OK); + return wxDialog::TransferDataFromWindow(); +} + +void wxTextEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event) ) +{ + if ( Validate() && TransferDataFromWindow() ) + { + EndModal( wxID_OK ); + } +} + +void wxTextEntryDialog::SetMaxLength(unsigned long len) +{ + m_textctrl->SetMaxLength(len); +} + +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 ) +{ + SetTextValidator(wxTextValidator(style)); +} + +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