Added ability to switch off more components of the size page UI

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

diff --git a/src/generic/textdlgg.cpp b/src/generic/textdlgg.cpp
index de16dbbd5c8d42f483ac862b7d556c9740611811..b00d192f7bd02ab21af62ced1efb07e8e06dfd33 100644 (file)
--- a/src/generic/textdlgg.cpp
+++ b/src/generic/textdlgg.cpp
@@ -42,8 +42,8 @@
     #include "wx/statline.h"
 #endif
 
     #include "wx/statline.h"
 #endif
 

-const wxChar wxGetTextFromUserPromptStr[] = wxT("Input Text");
-const wxChar wxGetPasswordFromUserPromptStr[] = wxT("Enter Password");
+const char wxGetTextFromUserPromptStr[] = "Input Text";
+const char wxGetPasswordFromUserPromptStr[] = "Enter Password";

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


@@ -65,16 +65,21 @@ END_EVENT_TABLE()
 
 IMPLEMENT_CLASS(wxTextEntryDialog, wxDialog)
 
 
 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)
                                      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;
 
     m_dialogStyle = style;
     m_value = value;
 


@@ -106,7 +111,7 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
 #endif // wxUSE_VALIDATORS
 
     // 3) buttons if any
 #endif // wxUSE_VALIDATORS
 
     // 3) buttons if any

-    wxSizer *buttonSizer = CreateSeparatedButtonSizer(style & ButtonSizerFlags);
+    wxSizer *buttonSizer = CreateSeparatedButtonSizer(style & (wxOK | wxCANCEL));

     if ( buttonSizer )
     {
         topsizer->Add(buttonSizer, wxSizerFlags(flagsBorder2).Expand());
     if ( buttonSizer )
     {
         topsizer->Add(buttonSizer, wxSizerFlags(flagsBorder2).Expand());


@@ -121,10 +126,12 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
     if ( style & wxCENTRE )
         Centre( wxBOTH );
 
     if ( style & wxCENTRE )
         Centre( wxBOTH );
 

-    m_textctrl->SetSelection(-1, -1);
+    m_textctrl->SelectAll();

     m_textctrl->SetFocus();
 
     wxEndBusyCursor();
     m_textctrl->SetFocus();
 
     wxEndBusyCursor();

+
+    return true;

 }
 
 void wxTextEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event) )
 }
 
 void wxTextEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event) )


@@ -150,7 +157,15 @@ void wxTextEntryDialog::SetValue(const wxString& val)
 }
 
 #if wxUSE_VALIDATORS
 }
 
 #if wxUSE_VALIDATORS

+
+#if WXWIN_COMPATIBILITY_2_8

 void wxTextEntryDialog::SetTextValidator( long style )
 void wxTextEntryDialog::SetTextValidator( long style )

+{
+    SetTextValidator((wxTextValidatorStyle)style);
+}
+#endif
+
+void wxTextEntryDialog::SetTextValidator( wxTextValidatorStyle style )

 {
     wxTextValidator validator( style, &m_value );
     m_textctrl->SetValidator( validator );
 {
     wxTextValidator validator( style, &m_value );
     m_textctrl->SetValidator( validator );