Fix history in wxWebViewIE when using a custom file scheme.

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

diff --git a/src/generic/textdlgg.cpp b/src/generic/textdlgg.cpp
index 50ea1ad378c70b41754b185d04ca26b129f08b04..d6e402bd1f0e592c452740debe0e3d80dffc9b8f 100644 (file)
--- a/src/generic/textdlgg.cpp
+++ b/src/generic/textdlgg.cpp
@@ -71,7 +71,7 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
                                      const wxString& value,
                                      long style,
                                      const wxPoint& pos)
                                      const wxString& value,
                                      long style,
                                      const wxPoint& pos)

-                 : wxDialog(GetParentForModalDialog(parent),
+                 : wxDialog(GetParentForModalDialog(parent, style),

                             wxID_ANY, caption, pos, wxDefaultSize,
                             wxDEFAULT_DIALOG_STYLE),
                    m_value(value)
                             wxID_ANY, caption, pos, wxDefaultSize,
                             wxDEFAULT_DIALOG_STYLE),
                    m_value(value)


@@ -107,7 +107,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());


@@ -151,7 +151,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 );