X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..ff1865910312d960737474a75a77737d5ce94864:/include/wx/generic/textdlgg.h

diff --git a/include/wx/generic/textdlgg.h b/include/wx/generic/textdlgg.h
index 0cf94426a3..7f6cb35a2c 100644
--- a/include/wx/generic/textdlgg.h
+++ b/include/wx/generic/textdlgg.h
@@ -6,46 +6,75 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __TEXTDLGH_G__
 #define __TEXTDLGH_G__
 
 #ifdef __GNUG__
-#pragma interface "textdlgg.h"
+    #pragma interface "textdlgg.h"
 #endif
 
-#include "wx/setup.h"
+#include "wx/defs.h"
+
 #include "wx/dialog.h"
 
-// Handy dialog functions (will be converted into classes at some point)
-WXDLLEXPORT_DATA(extern const char*) wxGetTextFromUserPromptStr;
-WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
+class WXDLLEXPORT wxTextCtrl;
+
+WXDLLEXPORT_DATA(extern const wxChar*) wxGetTextFromUserPromptStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 
-#define wxID_TEXT 3000
+#define wxTextEntryDialogStyle (wxOK | wxCANCEL | wxCENTRE)
 
-class WXDLLEXPORT wxTextEntryDialog: public wxDialog
+// ----------------------------------------------------------------------------
+// wxTextEntryDialog: a dialog with text control, [ok] and [cancel] buttons
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxTextEntryDialog : public wxDialog
 {
-DECLARE_DYNAMIC_CLASS(wxTextEntryDialog)
-protected:
-    long m_dialogStyle;
-    wxString m_value;
 public:
-    wxTextEntryDialog(wxWindow *parent, const wxString& message, const wxString& caption = wxGetTextFromUserPromptStr,
-        const wxString& value = wxEmptyString, long style = wxOK|wxCANCEL|wxCENTRE, const wxPoint& pos = wxDefaultPosition);
+    wxTextEntryDialog(wxWindow *parent,
+                      const wxString& message,
+                      const wxString& caption = wxGetTextFromUserPromptStr,
+                      const wxString& value = wxEmptyString,
+                      long style = wxTextEntryDialogStyle,
+                      const wxPoint& pos = wxDefaultPosition);
 
-    inline void SetValue(const wxString& val) { m_value = val; }
-    inline wxString GetValue(void) const { return m_value; }
+    void SetValue(const wxString& val) { m_value = val; }
+    wxString GetValue() const { return m_value; }
 
+    // implementation only
     void OnOK(wxCommandEvent& event);
 
-DECLARE_EVENT_TABLE()
+protected:
+    wxTextCtrl *m_textctrl;
+    wxString    m_value;
+    long        m_dialogStyle;
+
+private:
+    DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxTextEntryDialog)
 };
 
-wxString WXDLLEXPORT wxGetTextFromUser(const wxString& message, const wxString& caption = wxGetTextFromUserPromptStr,
-                        const wxString& default_value = wxEmptyString, wxWindow *parent = NULL,
-                        int x = -1, int y = -1, bool centre = TRUE);
+// ----------------------------------------------------------------------------
+// function to get a string from user
+// ----------------------------------------------------------------------------
+
+wxString WXDLLEXPORT
+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);
+
+wxString WXDLLEXPORT
+wxGetPasswordFromUser(const wxString& message,
+                      const wxString& caption = wxGetTextFromUserPromptStr,
+                      const wxString& default_value = wxEmptyString,
+                      wxWindow *parent = (wxWindow *) NULL);
 
 #endif
     // __TEXTDLGH_G__