X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e7445ff8ee26e39fab1e35455e1bef954bdf636f..36a0190ebd5bd9a7302f60f6dcd608b80574e21c:/src/generic/textdlgg.cpp?ds=sidebyside

diff --git a/src/generic/textdlgg.cpp b/src/generic/textdlgg.cpp
index 6c659fd660..f3d697fafc 100644
--- a/src/generic/textdlgg.cpp
+++ b/src/generic/textdlgg.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -42,8 +41,8 @@
     #include "wx/statline.h"
 #endif
 
-WXDLLIMPEXP_DATA_CORE(const wxChar) wxGetTextFromUserPromptStr[] = wxT("Input Text");
-WXDLLIMPEXP_DATA_CORE(const wxChar) wxGetPasswordFromUserPromptStr[] = wxT("Enter Password");
+const char wxGetTextFromUserPromptStr[] = "Input Text";
+const char wxGetPasswordFromUserPromptStr[] = "Enter Password";
 
 // ----------------------------------------------------------------------------
 // constants
@@ -51,20 +50,6 @@ WXDLLIMPEXP_DATA_CORE(const wxChar) wxGetPasswordFromUserPromptStr[] = wxT("Ente
 
 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
 // ============================================================================
@@ -79,16 +64,21 @@ END_EVENT_TABLE()
 
 IMPLEMENT_CLASS(wxTextEntryDialog, wxDialog)
 
-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, wxID_ANY, caption, pos, wxDefaultSize,
-                            wxDEFAULT_DIALOG_STYLE),
-                   m_value(value)
 {
+    if ( !wxDialog::Create(GetParentForModalDialog(parent, style),
+                           wxID_ANY, caption,
+                           pos, wxDefaultSize,
+                           wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) )
+    {
+        return false;
+    }
+
     m_dialogStyle = style;
     m_value = value;
 
@@ -96,32 +86,29 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
 
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 
+    wxSizerFlags flagsBorder2;
+    flagsBorder2.DoubleBorder();
+
 #if wxUSE_STATTEXT
     // 1) text message
-    topsizer->Add( CreateTextSizer( message ), 0, wxALL, wxLARGESMALL(10,0) );
+    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, 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
+    topsizer->Add(m_textctrl,
+                  wxSizerFlags(style & wxTE_MULTILINE ? 1 : 0).
+                    Expand().
+                    TripleBorder(wxLEFT | wxRIGHT));
 
     // 3) buttons if any
-    wxSizer *buttonSizer = CreateButtonSizer( style & ButtonSizerFlags , true, wxLARGESMALL(10,0) );
-    if(buttonSizer->GetChildren().GetCount() > 0 )
+    wxSizer *buttonSizer = CreateSeparatedButtonSizer(style & (wxOK | wxCANCEL));
+    if ( buttonSizer )
     {
-        topsizer->Add( buttonSizer, 0, wxEXPAND | wxALL, wxLARGESMALL(10,0) );
-    }
-    else
-    {
-        topsizer->AddSpacer( wxLARGESMALL(15,0) );
-        delete buttonSizer;
+        topsizer->Add(buttonSizer, wxSizerFlags(flagsBorder2).Expand());
     }
 
     SetAutoLayout( true );
@@ -133,25 +120,39 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
     if ( style & wxCENTRE )
         Centre( wxBOTH );
 
-    m_textctrl->SetSelection(-1, -1);
+    m_textctrl->SelectAll();
     m_textctrl->SetFocus();
 
     wxEndBusyCursor();
+
+    return true;
+}
+
+bool wxTextEntryDialog::TransferDataToWindow()
+{
+    m_textctrl->SetValue(m_value);
+
+    return wxDialog::TransferDataToWindow();
+}
+
+bool wxTextEntryDialog::TransferDataFromWindow()
+{
+    m_value = m_textctrl->GetValue();
+
+    return wxDialog::TransferDataFromWindow();
 }
 
 void wxTextEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event) )
 {
-#if wxUSE_VALIDATORS
-    if( Validate() && TransferDataFromWindow() )
+    if ( Validate() && TransferDataFromWindow() )
     {
         EndModal( wxID_OK );
     }
-#else
-    m_value = m_textctrl->GetValue();
+}
 
-    EndModal(wxID_OK);
-#endif
-  // wxUSE_VALIDATORS
+void wxTextEntryDialog::SetMaxLength(unsigned long len)
+{
+    m_textctrl->SetMaxLength(len);
 }
 
 void wxTextEntryDialog::SetValue(const wxString& val)
@@ -162,10 +163,17 @@ void wxTextEntryDialog::SetValue(const wxString& val)
 }
 
 #if wxUSE_VALIDATORS
+
+#if WXWIN_COMPATIBILITY_2_8
 void wxTextEntryDialog::SetTextValidator( long style )
 {
-    wxTextValidator validator( style, &m_value );
-    m_textctrl->SetValidator( validator );
+    SetTextValidator((wxTextValidatorStyle)style);
+}
+#endif
+
+void wxTextEntryDialog::SetTextValidator( wxTextValidatorStyle style )
+{
+    SetTextValidator(wxTextValidator(style));
 }
 
 void wxTextEntryDialog::SetTextValidator( const wxTextValidator& validator )
@@ -173,8 +181,7 @@ void wxTextEntryDialog::SetTextValidator( const wxTextValidator& validator )
     m_textctrl->SetValidator( validator );
 }
 
-#endif
-  // wxUSE_VALIDATORS
+#endif // wxUSE_VALIDATORS
 
 // ----------------------------------------------------------------------------
 // wxPasswordEntryDialog