// 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
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "textdlgg.h"
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// 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"
#ifdef __BORLANDC__
-#pragma hdrstop
+ #pragma hdrstop
#endif
+#if wxUSE_TEXTDLG
+
#ifndef WX_PRECOMP
-#include <stdio.h>
-#include "wx/utils.h"
-#include "wx/dialog.h"
-#include "wx/listbox.h"
-#include "wx/button.h"
-#include "wx/stattext.h"
-#include "wx/textctrl.h"
-#include "wx/layout.h"
-#include "wx/intl.h"
+ #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"
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+static const int wxID_TEXT = 3000;
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
// wxTextEntryDialog
+// ----------------------------------------------------------------------------
-#if !USE_SHARED_LIBRARY
BEGIN_EVENT_TABLE(wxTextEntryDialog, wxDialog)
- EVT_BUTTON(wxID_OK, wxTextEntryDialog::OnOK)
+ EVT_BUTTON(wxID_OK, wxTextEntryDialog::OnOK)
END_EVENT_TABLE()
IMPLEMENT_CLASS(wxTextEntryDialog, wxDialog)
-#endif
-
-extern void wxSplitMessage2(const char *message, wxList *messageList, wxWindow *parent, wxRowColSizer *sizer);
-wxTextEntryDialog::wxTextEntryDialog(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)
+wxTextEntryDialog::wxTextEntryDialog(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)
{
- m_dialogStyle = style;
- m_value = value;
-
- wxBeginBusyCursor();
-
- wxSizer *topSizer = new wxSizer(this, wxSizerShrink);
- topSizer->SetBorder(10, 10);
-
- wxRowColSizer *messageSizer = new wxRowColSizer(topSizer, wxSIZER_COLS, 100);
- messageSizer->SetName("messageSizer");
+ m_dialogStyle = style;
+ m_value = value;
-// bool centre = ((style & wxCENTRE) == wxCENTRE);
+ wxBeginBusyCursor();
- wxList messageList;
- wxSplitMessage2(message, &messageList, this, messageSizer);
+ wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
- // Insert a spacer
- wxSpacingSizer *spacingSizer = new wxSpacingSizer(topSizer, wxBelow, messageSizer, 10);
+ // 1) text message
+ topsizer->Add( CreateTextSizer( message ), 0, wxALL, 10 );
- wxTextCtrl *textCtrl = new wxTextCtrl(this, wxID_TEXT, value, wxPoint(-1, -1), wxSize(350, -1));
+ // 2) text ctrl
+ m_textctrl = new wxTextCtrl(this, wxID_TEXT, value,
+ wxDefaultPosition, wxSize(300, -1),
+ style & ~wxTextEntryDialogStyle);
+ topsizer->Add( m_textctrl, 1, wxEXPAND | wxLEFT|wxRIGHT, 15 );
- wxRowColSizer *textSizer = new wxRowColSizer(topSizer, wxSIZER_ROWS);
- textSizer->AddSizerChild(textCtrl);
- textSizer->SetName("textSizer");
+#if wxUSE_VALIDATORS
+ wxTextValidator validator( wxFILTER_NONE, &m_value );
+ m_textctrl->SetValidator( validator );
+#endif
+ // wxUSE_VALIDATORS
- // Create constraints for the text sizer
- wxLayoutConstraints *textC = new wxLayoutConstraints;
- textC->left.SameAs (messageSizer, wxLeft);
- textC->top.Below (spacingSizer);
- textSizer->SetConstraints(textC);
+#if wxUSE_STATLINE
+ // 3) static line
+ topsizer->Add( new wxStaticLine( this, -1 ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
+#endif
- // Insert another spacer
- wxSpacingSizer *spacingSizer2 = new wxSpacingSizer(topSizer, wxBelow, textSizer, 10);
- spacingSizer->SetName("spacingSizer2");
+ // 4) buttons
+ topsizer->Add( CreateButtonSizer( style ), 0, wxCENTRE | wxALL, 10 );
- // Insert a sizer for the buttons
- wxRowColSizer *buttonSizer = new wxRowColSizer(topSizer, wxSIZER_ROWS);
- buttonSizer->SetName("buttonSizer");
+ SetAutoLayout( TRUE );
+ SetSizer( topsizer );
- // Specify constraints for the button sizer
- wxLayoutConstraints *c = new wxLayoutConstraints;
- c->width.AsIs ();
- c->height.AsIs ();
- c->top.Below (spacingSizer2);
- c->centreX.SameAs (textSizer, wxCentreX);
- buttonSizer->SetConstraints(c);
+ topsizer->SetSizeHints( this );
+ topsizer->Fit( this );
- wxButton *ok = NULL;
- wxButton *cancel = NULL;
+ Centre( wxBOTH );
- if (style & wxOK) {
- ok = new wxButton(this, wxID_OK, _("OK"));
- buttonSizer->AddSizerChild(ok);
- }
+ m_textctrl->SetSelection(-1, -1);
+ m_textctrl->SetFocus();
- if (style & wxCANCEL) {
- cancel = new wxButton(this, wxID_CANCEL, _("Cancel"));
- buttonSizer->AddSizerChild(cancel);
- }
+ wxEndBusyCursor();
+}
- if (ok)
- ok->SetDefault();
+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
+}
- Layout();
- Centre(wxBOTH);
+void wxTextEntryDialog::SetValue(const wxString& val)
+{
+ m_value = val;
- wxEndBusyCursor();
+ m_textctrl->SetValue(val);
}
-void wxTextEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event) )
+#if wxUSE_VALIDATORS
+void wxTextEntryDialog::SetTextValidator( long style )
{
- wxTextCtrl *textCtrl = (wxTextCtrl *)FindWindow(wxID_TEXT);
- if ( textCtrl )
- m_value = textCtrl->GetValue();
-
- EndModal(wxID_OK);
+ wxTextValidator validator( style, &m_value );
+ m_textctrl->SetValidator( validator );
}
-wxString wxGetTextFromUser(const wxString& message, const wxString& caption,
- const wxString& defaultValue, wxWindow *parent,
- int x, int y, bool WXUNUSED(centre) )
+void wxTextEntryDialog::SetTextValidator( wxTextValidator& validator )
{
- wxTextEntryDialog dialog(parent, message, caption, defaultValue, wxOK|wxCANCEL, wxPoint(x, y));
- if (dialog.ShowModal() == wxID_OK)
- return dialog.GetValue();
- else
- return wxString("");
+ m_textctrl->SetValidator( validator );
}
+
+#endif
+ // wxUSE_VALIDATORS
+
+#endif // wxUSE_TEXTDLG