X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c9468a241baaa09bbc82eb45da40a1d15c630f4d..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/generic/textdlgg.h?ds=sidebyside

diff --git a/include/wx/generic/textdlgg.h b/include/wx/generic/textdlgg.h
index 81409bf504..a0f8fbcf3b 100644
--- a/include/wx/generic/textdlgg.h
+++ b/include/wx/generic/textdlgg.h
@@ -1,31 +1,34 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        textdlgg.h
-// Purpose:     wxStatusBar class
+// Purpose:     wxTextEntryDialog class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __TEXTDLGH_G__
-#define __TEXTDLGH_G__
-
-#ifdef __GNUG__
-    #pragma interface "textdlgg.h"
-#endif
+#ifndef _WX_TEXTDLGG_H_
+#define _WX_TEXTDLGG_H_
 
 #include "wx/defs.h"
 
+#if wxUSE_TEXTDLG
+
 #include "wx/dialog.h"
 
-class WXDLLEXPORT wxTextCtrl;
+#if wxUSE_VALIDATORS
+#include "wx/valtext.h"
+#include "wx/textctrl.h"
+#endif
+
+class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxGetTextFromUserPromptStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
+extern WXDLLEXPORT_DATA(const wxChar) wxGetTextFromUserPromptStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxGetPasswordFromUserPromptStr[];
 
-#define wxTextEntryDialogStyle (wxOK | wxCANCEL | wxCENTRE)
+#define wxTextEntryDialogStyle (wxOK | wxCANCEL | wxCENTRE | wxWS_EX_VALIDATE_RECURSIVELY)
 
 // ----------------------------------------------------------------------------
 // wxTextEntryDialog: a dialog with text control, [ok] and [cancel] buttons
@@ -41,9 +44,16 @@ public:
                       long style = wxTextEntryDialogStyle,
                       const wxPoint& pos = wxDefaultPosition);
 
-    void SetValue(const wxString& val) { m_value = val; m_textctrl->SetValue(val); }
+    void SetValue(const wxString& val);
     wxString GetValue() const { return m_value; }
 
+#if wxUSE_VALIDATORS
+    void SetTextValidator( const wxTextValidator& validator );
+    void SetTextValidator( long style = wxFILTER_NONE );
+    wxTextValidator* GetTextValidator() { return (wxTextValidator*)m_textctrl->GetValidator(); }
+#endif
+  // wxUSE_VALIDATORS
+
     // implementation only
     void OnOK(wxCommandEvent& event);
 
@@ -55,6 +65,25 @@ protected:
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxTextEntryDialog)
+    DECLARE_NO_COPY_CLASS(wxTextEntryDialog)
+};
+
+// ----------------------------------------------------------------------------
+// wxPasswordEntryDialog: dialog with password control, [ok] and [cancel]
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxPasswordEntryDialog : public wxTextEntryDialog
+{
+public:
+    wxPasswordEntryDialog(wxWindow *parent,
+                      const wxString& message,
+                      const wxString& caption = wxGetPasswordFromUserPromptStr,
+                      const wxString& value = wxEmptyString,
+                      long style = wxTextEntryDialogStyle,
+                      const wxPoint& pos = wxDefaultPosition);
+private:
+    DECLARE_DYNAMIC_CLASS(wxPasswordEntryDialog)
+    DECLARE_NO_COPY_CLASS(wxPasswordEntryDialog)
 };
 
 // ----------------------------------------------------------------------------
@@ -66,15 +95,19 @@ wxGetTextFromUser(const wxString& message,
                   const wxString& caption = wxGetTextFromUserPromptStr,
                   const wxString& default_value = wxEmptyString,
                   wxWindow *parent = (wxWindow *) NULL,
-                  int x = -1,
-                  int y = -1,
-                  bool centre = TRUE);
+                  wxCoord x = wxDefaultCoord,
+                  wxCoord y = wxDefaultCoord,
+                  bool centre = true);
 
 wxString WXDLLEXPORT
 wxGetPasswordFromUser(const wxString& message,
-                      const wxString& caption = wxGetTextFromUserPromptStr,
+                      const wxString& caption = wxGetPasswordFromUserPromptStr,
                       const wxString& default_value = wxEmptyString,
-                      wxWindow *parent = (wxWindow *) NULL);
+                      wxWindow *parent = (wxWindow *) NULL,
+                      wxCoord x = wxDefaultCoord,
+                      wxCoord y = wxDefaultCoord,
+                      bool centre = true);
 
 #endif
-    // __TEXTDLGH_G__
+    // wxUSE_TEXTDLG
+#endif // _WX_TEXTDLGG_H_