Rename delegates to try and stop name clashes, probably with wxWebKitCtrl.

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

diff --git a/src/generic/textdlgg.cpp b/src/generic/textdlgg.cpp
index aae60f323148cf7c84812971512377f7a62d0caa..d6e402bd1f0e592c452740debe0e3d80dffc9b8f 100644 (file)
--- a/src/generic/textdlgg.cpp
+++ b/src/generic/textdlgg.cpp
@@ -42,8 +42,8 @@
     #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
@@ -51,20 +51,6 @@ const wxChar wxGetPasswordFromUserPromptStr[] = wxT("Enter Password");
 
 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
 // ============================================================================
@@ -85,7 +71,8 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
                                      const wxString& value,
                                      long style,
                                      const wxPoint& pos)
-                 : wxDialog(parent, wxID_ANY, caption, pos, wxDefaultSize,
+                 : wxDialog(GetParentForModalDialog(parent, style),
+                            wxID_ANY, caption, pos, wxDefaultSize,
                             wxDEFAULT_DIALOG_STYLE),
                    m_value(value)
 {
@@ -96,16 +83,23 @@ 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) );
+
+    topsizer->Add(m_textctrl,
+                  wxSizerFlags(style & wxTE_MULTILINE ? 1 : 0).
+                    Expand().
+                    TripleBorder(wxLEFT | wxRIGHT));
 
 #if wxUSE_VALIDATORS
     wxTextValidator validator( wxFILTER_NONE, &m_value );
@@ -113,15 +107,10 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
 #endif // wxUSE_VALIDATORS
 
     // 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 );
@@ -162,7 +151,15 @@ void wxTextEntryDialog::SetValue(const wxString& val)
 }
 
 #if wxUSE_VALIDATORS
+
+#if WXWIN_COMPATIBILITY_2_8
 void wxTextEntryDialog::SetTextValidator( long style )
+{
+    SetTextValidator((wxTextValidatorStyle)style);
+}
+#endif
+
+void wxTextEntryDialog::SetTextValidator( wxTextValidatorStyle style )
 {
     wxTextValidator validator( style, &m_value );
     m_textctrl->SetValidator( validator );