reset the tooltip text before changing it, this apparently prevents a spurious redraw...

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

diff --git a/src/generic/textdlgg.cpp b/src/generic/textdlgg.cpp
index 9b6ea31e908225d0919d9d052d2b756766672e5d..16cfd7d9d5420bbe18575422cfec625275b5a93e 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:


@@ -26,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"


@@ -40,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


@@ -48,20 +51,6 @@
 
 static const int wxID_TEXT = 3000;
 
 
 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
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -82,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;


@@ -93,50 +83,44 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
 
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 
 
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 

+    wxSizerFlags flagsBorder2;
+    flagsBorder2.DoubleBorder();
+

 #if wxUSE_STATTEXT
     // 1) text message
 #if wxUSE_STATTEXT
     // 1) text message

-    topsizer->Add( CreateTextSizer( message ), 0, wxALL, wxLARGESMALL(10,0) );
-#endif        
+    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, 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 );
     m_textctrl->SetValidator( validator );
 
 #if wxUSE_VALIDATORS
     wxTextValidator validator( wxFILTER_NONE, &m_value );
     m_textctrl->SetValidator( validator );

-#endif
-  // wxUSE_VALIDATORS
-
-    // smart phones does not support or do not waste space for wxButtons
-#ifdef __SMARTPHONE__
+#endif // wxUSE_VALIDATORS

 
 

-    SetRightMenu(wxID_CANCEL, _("Cancel"));
-
-#else // __SMARTPHONE__/!__SMARTPHONE__
-
-#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, wxEXPAND | wxALL, 10 );
-
-#endif // !__SMARTPHONE__
+    // 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 );
 

-#if !defined(__SMARTPHONE__) && !defined(__POCKETPC__)

     topsizer->SetSizeHints( this );
     topsizer->Fit( this );
 
     if ( style & wxCENTRE )
         Centre( wxBOTH );
     topsizer->SetSizeHints( this );
     topsizer->Fit( this );
 
     if ( style & wxCENTRE )
         Centre( wxBOTH );

-#endif

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


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