/////////////////////////////////////////////////////////////////////////////
-// 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
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "textdlgg.h"
-#endif
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
// 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/button.h"
- #include "wx/stattext.h"
- #include "wx/textctrl.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"
+ #include "wx/statline.h"
#endif
#include "wx/generic/textdlgg.h"
-/* Split message, using constraints to position controls */
-static wxSize wxSplitMessage2( const wxString &message, wxWindow *parent )
-{
- int y = 10;
- int w = 50;
- wxString line( _T("") );
- for (size_t pos = 0; pos < message.Len(); pos++)
- {
- if (message[pos] == _T('\n'))
- {
- if (!line.IsEmpty())
- {
- wxStaticText *s1 = new wxStaticText( parent, -1, line, wxPoint(15,y) );
- wxSize size1( s1->GetSize() );
- if (size1.x > w) w = size1.x;
- line = _T("");
- }
- y += 18;
- }
- else
- {
- line += message[pos];
- }
- }
-
- if (!line.IsEmpty())
- {
- wxStaticText *s2 = new wxStaticText( parent, -1, line, wxPoint(15,y) );
- wxSize size2( s2->GetSize() );
- if (size2.x > w) w = size2.x;
- }
-
- y += 18;
-
- return wxSize(w+30,y);
-}
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+static const int wxID_TEXT = 3000;
+// ---------------------------------------------------------------------------
+// macros
+// ---------------------------------------------------------------------------
+
+/* Macro for avoiding #ifdefs when value have to be different depending on size of
+ device we display on - take it from something like wxDesktopPolicy in the future
+ */
+
+#if defined(__SMARTPHONE__)
+ #define wxLARGESMALL(large,small) small
+#else
+ #define wxLARGESMALL(large,small) large
+#endif
+
+// ============================================================================
+// 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
-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|wxTAB_TRAVERSAL)
+wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
+ const wxString& message,
+ const wxString& caption,
+ const wxString& value,
+ long style,
+ const wxPoint& pos)
+ : wxDialog(parent, wxID_ANY, caption, pos, wxDefaultSize,
+ wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL),
+ m_value(value)
{
m_dialogStyle = style;
m_value = value;
wxBeginBusyCursor();
- wxSize message_size( wxSplitMessage2( message, this ) );
+ wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
- wxButton *ok = (wxButton *) NULL;
- wxButton *cancel = (wxButton *) NULL;
- wxList m_buttons;
-
- int y = message_size.y + 15;
-
- wxTextCtrl *textCtrl = new wxTextCtrl(this, wxID_TEXT, value, wxPoint(-1, y), wxSize(350, -1));
-
- y += 65;
+#if wxUSE_STATTEXT
+ // 1) text message
+ topsizer->Add( CreateTextSizer( message ), 0, wxALL, wxLARGESMALL(10,0) );
+#endif
- if (style & wxOK)
- {
- ok = new wxButton( this, wxID_OK, _("OK"), wxPoint(-1,y), wxSize(80,-1) );
- m_buttons.Append( ok );
- }
+ // 2) text ctrl
+ m_textctrl = new wxTextCtrl(this, wxID_TEXT, value,
+ wxDefaultPosition, wxSize(300, wxDefaultCoord),
+ style & ~wxTextEntryDialogStyle);
+ topsizer->Add( m_textctrl, style & wxTE_MULTILINE ? 1 : 0, wxEXPAND | wxLEFT|wxRIGHT, wxLARGESMALL(15,0) );
+
+#if wxUSE_VALIDATORS
+ wxTextValidator validator( wxFILTER_NONE, &m_value );
+ m_textctrl->SetValidator( validator );
+#endif // wxUSE_VALIDATORS
- if (style & wxCANCEL)
+ // 3) buttons if any
+ wxSizer *buttonSizer = CreateButtonSizer( style & ButtonSizerFlags , true, wxLARGESMALL(10,0) );
+ if(buttonSizer->GetChildren().GetCount() > 0 )
{
- cancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxPoint(-1,y), wxSize(80,-1) );
- m_buttons.Append( cancel );
+ topsizer->Add( buttonSizer, 0, wxEXPAND | wxALL, wxLARGESMALL(10,0) );
}
-
- if (ok)
+ else
{
- ok->SetDefault();
- ok->SetFocus();
+ topsizer->AddSpacer( wxLARGESMALL(15,0) );
+ delete buttonSizer;
}
- int w = wxMax( 350, m_buttons.GetCount() * 100 );
- w = wxMax( w, message_size.x );
- int space = w / (m_buttons.GetCount()*2);
-
- textCtrl->SetSize( 20, -1, w-10, -1 );
-
- int m = 0;
- wxNode *node = m_buttons.First();
- while (node)
+ SetAutoLayout( true );
+ SetSizer( topsizer );
+
+#if !defined(__SMARTPHONE__) && !defined(__POCKETPC__)
+ topsizer->SetSizeHints( this );
+ topsizer->Fit( this );
+
+ if ( style & wxCENTRE )
+ Centre( wxBOTH );
+#endif
+
+ m_textctrl->SetSelection(-1, -1);
+ m_textctrl->SetFocus();
+
+ wxEndBusyCursor();
+}
+
+void wxTextEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event) )
+{
+#if wxUSE_VALIDATORS
+ if( Validate() && TransferDataFromWindow() )
{
- wxWindow *win = (wxWindow*)node->Data();
- int x = (m*2+1)*space - 40 + 15;
- win->Move( x, -1 );
- node = node->Next();
- m++;
+ EndModal( wxID_OK );
}
-
-#if wxUSE_STATLINE
- (void) new wxStaticLine( this, -1, wxPoint(0,y-20), wxSize(w+30, 5) );
+#else
+ m_value = m_textctrl->GetValue();
+
+ EndModal(wxID_OK);
#endif
-
- SetSize( w+30, y+40 );
+ // wxUSE_VALIDATORS
+}
- Centre( wxBOTH );
+void wxTextEntryDialog::SetValue(const wxString& val)
+{
+ m_value = val;
+ m_textctrl->SetValue(val);
+}
- wxEndBusyCursor();
+#if wxUSE_VALIDATORS
+void wxTextEntryDialog::SetTextValidator( long style )
+{
+ wxTextValidator validator( style, &m_value );
+ m_textctrl->SetValidator( validator );
}
-void wxTextEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event) )
+void wxTextEntryDialog::SetTextValidator( const wxTextValidator& validator )
{
- wxTextCtrl *textCtrl = (wxTextCtrl *)FindWindow(wxID_TEXT);
- if ( textCtrl )
- m_value = textCtrl->GetValue();
+ m_textctrl->SetValidator( validator );
+}
- EndModal(wxID_OK);
+#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