typo fixed: __WXUNIV__ => __WXUNIVERSAL__

[wxWidgets.git] / include / wx / generic / textdlgg.h

diff --git a/include/wx/generic/textdlgg.h b/include/wx/generic/textdlgg.h
index be592594f638d0804ff429e6e23721ee97127e8b..0b41fbaf93b5ca69616efc4719497ff23ecd3977 100644 (file)
--- a/include/wx/generic/textdlgg.h
+++ b/include/wx/generic/textdlgg.h
@@ -22,23 +22,26 @@
 
 class WXDLLEXPORT wxTextCtrl;
 
 
 class WXDLLEXPORT wxTextCtrl;
 

-// Handy dialog functions (will be converted into classes at some point)

 WXDLLEXPORT_DATA(extern const wxChar*) wxGetTextFromUserPromptStr;
 WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxGetTextFromUserPromptStr;
 WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 

+#define wxTextEntryDialogStyle (wxOK | wxCANCEL | wxCENTRE)
+
+// ----------------------------------------------------------------------------
+// wxTextEntryDialog: a dialog with text control, [ok] and [cancel] buttons
+// ----------------------------------------------------------------------------
+

 class WXDLLEXPORT wxTextEntryDialog : public wxDialog
 {
 class WXDLLEXPORT wxTextEntryDialog : public wxDialog
 {

-    DECLARE_DYNAMIC_CLASS(wxTextEntryDialog)
-

 public:
     wxTextEntryDialog(wxWindow *parent,
                       const wxString& message,
                       const wxString& caption = wxGetTextFromUserPromptStr,
                       const wxString& value = wxEmptyString,
 public:
     wxTextEntryDialog(wxWindow *parent,
                       const wxString& message,
                       const wxString& caption = wxGetTextFromUserPromptStr,
                       const wxString& value = wxEmptyString,

-                      long style = wxOK | wxCANCEL | wxCENTRE,
+                      long style = wxTextEntryDialogStyle,

                       const wxPoint& pos = wxDefaultPosition);
 
                       const wxPoint& pos = wxDefaultPosition);
 

-    void SetValue(const wxString& val) { m_value = val; }
+    void SetValue(const wxString& val);

     wxString GetValue() const { return m_value; }
 
     // implementation only
     wxString GetValue() const { return m_value; }
 
     // implementation only


@@ -47,11 +50,17 @@ public:
 protected:
     wxTextCtrl *m_textctrl;
     wxString    m_value;
 protected:
     wxTextCtrl *m_textctrl;
     wxString    m_value;

+    long        m_dialogStyle;

 
 private:
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_EVENT_TABLE()

+    DECLARE_DYNAMIC_CLASS(wxTextEntryDialog)

 };
 
 };
 

+// ----------------------------------------------------------------------------
+// function to get a string from user
+// ----------------------------------------------------------------------------
+

 wxString WXDLLEXPORT
 wxGetTextFromUser(const wxString& message,
                   const wxString& caption = wxGetTextFromUserPromptStr,
 wxString WXDLLEXPORT
 wxGetTextFromUser(const wxString& message,
                   const wxString& caption = wxGetTextFromUserPromptStr,


@@ -61,5 +70,11 @@ wxGetTextFromUser(const wxString& message,
                   int y = -1,
                   bool centre = TRUE);
 
                   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__
 #endif
     // __TEXTDLGH_G__