cdc48273b4
GetParentForModalDialog() was called from the ctor initialized list before m_windowStyle could be initialized by the base class ctor in several different places, meaning that the check for wxDIALOG_NO_PARENT in this function was using uninitialized variable. Fix this by passing the style parameter explicitly to this function to allow using it from derived class ctors. Still keep an overload which uses the actual window parent and flags which is simpler to use for later calls to this function. Thanks valgrind for finding this one. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64019 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
195 lines
5.5 KiB
C++
195 lines
5.5 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: src/generic/textdlgg.cpp
|
|
// Purpose: wxTextEntryDialog
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created: 04/01/98
|
|
// RCS-ID: $Id$
|
|
// Copyright: (c) Julian Smart
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
// ============================================================================
|
|
// declarations
|
|
// ============================================================================
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// headers
|
|
// ----------------------------------------------------------------------------
|
|
|
|
// For compilers that support precompilation, includes "wx.h".
|
|
#include "wx/wxprec.h"
|
|
|
|
#ifdef __BORLANDC__
|
|
#pragma hdrstop
|
|
#endif
|
|
|
|
#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
|
|
|
|
const char wxGetTextFromUserPromptStr[] = "Input Text";
|
|
const char wxGetPasswordFromUserPromptStr[] = "Enter Password";
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// constants
|
|
// ----------------------------------------------------------------------------
|
|
|
|
static const int wxID_TEXT = 3000;
|
|
|
|
// ============================================================================
|
|
// implementation
|
|
// ============================================================================
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxTextEntryDialog
|
|
// ----------------------------------------------------------------------------
|
|
|
|
BEGIN_EVENT_TABLE(wxTextEntryDialog, wxDialog)
|
|
EVT_BUTTON(wxID_OK, wxTextEntryDialog::OnOK)
|
|
END_EVENT_TABLE()
|
|
|
|
IMPLEMENT_CLASS(wxTextEntryDialog, wxDialog)
|
|
|
|
wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
|
|
const wxString& message,
|
|
const wxString& caption,
|
|
const wxString& value,
|
|
long style,
|
|
const wxPoint& pos)
|
|
: wxDialog(GetParentForModalDialog(parent, style),
|
|
wxID_ANY, caption, pos, wxDefaultSize,
|
|
wxDEFAULT_DIALOG_STYLE),
|
|
m_value(value)
|
|
{
|
|
m_dialogStyle = style;
|
|
m_value = value;
|
|
|
|
wxBeginBusyCursor();
|
|
|
|
wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
|
|
|
|
wxSizerFlags flagsBorder2;
|
|
flagsBorder2.DoubleBorder();
|
|
|
|
#if wxUSE_STATTEXT
|
|
// 1) text message
|
|
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,
|
|
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 );
|
|
|
|
if ( style & wxCENTRE )
|
|
Centre( wxBOTH );
|
|
|
|
m_textctrl->SetSelection(-1, -1);
|
|
m_textctrl->SetFocus();
|
|
|
|
wxEndBusyCursor();
|
|
}
|
|
|
|
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
|