/////////////////////////////////////////////////////////////////////////////
-// Name: textdlgg.cpp
+// Name: src/generic/textdlgg.cpp
// Purpose: wxTextEntryDialog
// Author: Julian Smart
// Modified by:
// 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"
#if wxUSE_TEXTDLG
+#include "wx/generic/textdlgg.h"
+
#ifndef WX_PRECOMP
#include "wx/utils.h"
#include "wx/dialog.h"
#include "wx/statline.h"
#endif
-#include "wx/generic/textdlgg.h"
+const wxChar wxGetTextFromUserPromptStr[] = wxT("Input Text");
+const wxChar wxGetPasswordFromUserPromptStr[] = wxT("Enter Password");
// ----------------------------------------------------------------------------
// constants
long style,
const wxPoint& pos)
: wxDialog(parent, wxID_ANY, caption, pos, wxDefaultSize,
- wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL),
+ wxDEFAULT_DIALOG_STYLE),
m_value(value)
{
m_dialogStyle = style;
wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
+ wxSizerFlags flagsBorder2;
+ flagsBorder2.DoubleBorder();
+
+#if wxUSE_STATTEXT
// 1) text message
- topsizer->Add( CreateTextSizer( message ), 0, wxALL, 10 );
+ topsizer->Add(CreateTextSizer(message), flagsBorder2);
+#endif
// 2) text ctrl
m_textctrl = new wxTextCtrl(this, wxID_TEXT, value,
- wxDefaultPosition, wxSize(300, wxDefaultSize.y),
+ wxDefaultPosition, wxSize(300, wxDefaultCoord),
style & ~wxTextEntryDialogStyle);
- topsizer->Add( m_textctrl, 1, wxEXPAND | wxLEFT|wxRIGHT, 15 );
+
+ 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
+#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 );
+ // 3) buttons if any
+ wxSizer *buttonSizer = CreateSeparatedButtonSizer(style & ButtonSizerFlags);
+ if ( buttonSizer )
+ {
+ topsizer->Add(buttonSizer, wxSizerFlags(flagsBorder2).Expand());
+ }
SetAutoLayout( true );
SetSizer( topsizer );
topsizer->SetSizeHints( this );
topsizer->Fit( this );
- Centre( wxBOTH );
+ if ( style & wxCENTRE )
+ Centre( wxBOTH );
m_textctrl->SetSelection(-1, -1);
m_textctrl->SetFocus();
m_textctrl->SetValidator( validator );
}
-void wxTextEntryDialog::SetTextValidator( wxTextValidator& 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