Recalculate display (and scrollbars etc) before calling EnsureVisible()

[wxWidgets.git] / src / generic / textdlgg.cpp

diff --git a/src/generic/textdlgg.cpp b/src/generic/textdlgg.cpp
index 46b3f6ea66b3cd82dd4ad3ffac1e130786757aa7..50ea1ad378c70b41754b185d04ca26b129f08b04 100644 (file)
--- a/src/generic/textdlgg.cpp
+++ b/src/generic/textdlgg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        textdlgg.cpp
+// Name:        src/generic/textdlgg.cpp

 // Purpose:     wxTextEntryDialog
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxTextEntryDialog
 // Author:      Julian Smart
 // Modified by:


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -30,6 +26,8 @@
 
 #if wxUSE_TEXTDLG
 
 
 #if wxUSE_TEXTDLG
 

+#include "wx/generic/textdlgg.h"
+

 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dialog.h"
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dialog.h"


@@ -44,7 +42,8 @@
     #include "wx/statline.h"
 #endif
 
     #include "wx/statline.h"
 #endif
 

-#include "wx/generic/textdlgg.h"
+const char wxGetTextFromUserPromptStr[] = "Input Text";
+const char wxGetPasswordFromUserPromptStr[] = "Enter Password";

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -72,8 +71,9 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
                                      const wxString& value,
                                      long style,
                                      const wxPoint& pos)
                                      const wxString& value,
                                      long style,
                                      const wxPoint& pos)

-                 : wxDialog(parent, wxID_ANY, caption, pos, wxDefaultSize,
-                            wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL),
+                 : wxDialog(GetParentForModalDialog(parent),
+                            wxID_ANY, caption, pos, wxDefaultSize,
+                            wxDEFAULT_DIALOG_STYLE),

                    m_value(value)
 {
     m_dialogStyle = style;
                    m_value(value)
 {
     m_dialogStyle = style;


@@ -83,28 +83,35 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
 
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 
 
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 

+    wxSizerFlags flagsBorder2;
+    flagsBorder2.DoubleBorder();
+
+#if wxUSE_STATTEXT

     // 1) text message
     // 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, wxDefaultCoord),
                                 style & ~wxTextEntryDialogStyle);
 
     // 2) text ctrl
     m_textctrl = new wxTextCtrl(this, wxID_TEXT, value,
                                 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 );
 
 #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 );
 
     SetAutoLayout( true );
     SetSizer( topsizer );


@@ -112,7 +119,8 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
     topsizer->SetSizeHints( this );
     topsizer->Fit( this );
 
     topsizer->SetSizeHints( this );
     topsizer->Fit( this );
 

-    Centre( wxBOTH );
+    if ( style & wxCENTRE )
+        Centre( wxBOTH );

 
     m_textctrl->SetSelection(-1, -1);
     m_textctrl->SetFocus();
 
     m_textctrl->SetSelection(-1, -1);
     m_textctrl->SetFocus();


@@ -149,7 +157,7 @@ void wxTextEntryDialog::SetTextValidator( long style )
     m_textctrl->SetValidator( validator );
 }
 
     m_textctrl->SetValidator( validator );
 }
 

-void wxTextEntryDialog::SetTextValidator( wxTextValidator& validator )
+void wxTextEntryDialog::SetTextValidator( const wxTextValidator& validator )

 {
     m_textctrl->SetValidator( validator );
 }
 {
     m_textctrl->SetValidator( validator );
 }


@@ -157,4 +165,22 @@ void wxTextEntryDialog::SetTextValidator( wxTextValidator& validator )
 #endif
   // wxUSE_VALIDATORS
 
 #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
 #endif // wxUSE_TEXTDLG