reset g_SelectionBeforePopup sooner in gtk_popup_hide_callback() to ensure that GetSe...

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

diff --git a/include/wx/generic/textdlgg.h b/include/wx/generic/textdlgg.h
index a95f4acec3950bd5a186bf4a6b8def49a3564f43..b8f4eb474a125f3ae70b7e1f49d122ad5bf6420e 100644 (file)
--- a/include/wx/generic/textdlgg.h
+++ b/include/wx/generic/textdlgg.h
@@ -12,12 +12,9 @@
 #ifndef __TEXTDLGH_G__
 #define __TEXTDLGH_G__
 
 #ifndef __TEXTDLGH_G__
 #define __TEXTDLGH_G__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "textdlgg.h"
-#endif
+#include "wx/defs.h"

 
 #if wxUSE_TEXTDLG
 
 #if wxUSE_TEXTDLG

-#include "wx/defs.h"

 
 #include "wx/dialog.h"
 
 
 #include "wx/dialog.h"
 


@@ -27,7 +24,8 @@
 
 class WXDLLEXPORT wxTextCtrl;
 
 
 class WXDLLEXPORT wxTextCtrl;
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxGetTextFromUserPromptStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxGetTextFromUserPromptStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxGetPasswordFromUserPromptStr;

 
 #define wxTextEntryDialogStyle (wxOK | wxCANCEL | wxCENTRE | wxWS_EX_VALIDATE_RECURSIVELY)
 
 
 #define wxTextEntryDialogStyle (wxOK | wxCANCEL | wxCENTRE | wxWS_EX_VALIDATE_RECURSIVELY)
 


@@ -49,7 +47,7 @@ public:
     wxString GetValue() const { return m_value; }
 
 #if wxUSE_VALIDATORS
     wxString GetValue() const { return m_value; }
 
 #if wxUSE_VALIDATORS

-    void SetTextValidator( wxTextValidator& validator );
+    void SetTextValidator( const wxTextValidator& validator );

     void SetTextValidator( long style = wxFILTER_NONE );
     wxTextValidator* GetTextValidator() { return (wxTextValidator*)m_textctrl->GetValidator(); }
 #endif
     void SetTextValidator( long style = wxFILTER_NONE );
     wxTextValidator* GetTextValidator() { return (wxTextValidator*)m_textctrl->GetValidator(); }
 #endif


@@ -69,6 +67,24 @@ private:
     DECLARE_NO_COPY_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)
+};
+

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


@@ -84,7 +100,7 @@ wxGetTextFromUser(const wxString& message,
 
 wxString WXDLLEXPORT
 wxGetPasswordFromUser(const wxString& message,
 
 wxString WXDLLEXPORT
 wxGetPasswordFromUser(const wxString& message,

-                      const wxString& caption = wxGetTextFromUserPromptStr,
+                      const wxString& caption = wxGetPasswordFromUserPromptStr,

                       const wxString& default_value = wxEmptyString,
                       wxWindow *parent = (wxWindow *) NULL,
                       wxCoord x = wxDefaultCoord,
                       const wxString& default_value = wxEmptyString,
                       wxWindow *parent = (wxWindow *) NULL,
                       wxCoord x = wxDefaultCoord,