fixed sending 2 events (normal and bogus cancel one) when ending to edit a tree ctrl...

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

diff --git a/include/wx/generic/textdlgg.h b/include/wx/generic/textdlgg.h
index 5b0e013ccb119280f16e83a4e688167cab91eaad..b255dd89a46e3a7227b6f6d69bb150f0de4d6be6 100644 (file)
--- a/include/wx/generic/textdlgg.h
+++ b/include/wx/generic/textdlgg.h
@@ -1,63 +1,94 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        textdlgg.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        textdlgg.h

-// Purpose:     wxStatusBar class
+// Purpose:     wxTextEntryDialog class

 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // 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__
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __TEXTDLGH_G__
 #define __TEXTDLGH_G__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "textdlgg.h"
 #endif
 
     #pragma interface "textdlgg.h"
 #endif
 

+#if wxUSE_TEXTDLG

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

-// Handy dialog functions (will be converted into classes at some point)
+#if wxUSE_VALIDATORS
+#include "wx/valtext.h"
+#endif
+
+class WXDLLEXPORT wxTextCtrl;
+

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

-WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
+
+#define wxTextEntryDialogStyle (wxOK | wxCANCEL | wxCENTRE | wxWS_EX_VALIDATE_RECURSIVELY)
+
+// ----------------------------------------------------------------------------
+// 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; }
 
     wxString GetValue() const { return m_value; }
 

+#if wxUSE_VALIDATORS
+    void SetTextValidator( wxTextValidator& validator );
+    void SetTextValidator( long style = wxFILTER_NONE );
+    wxTextValidator* GetTextValidator() { return (wxTextValidator*)m_textctrl->GetValidator(); }
+#endif
+  // wxUSE_VALIDATORS
+

     // implementation only
     void OnOK(wxCommandEvent& event);
 
 protected:
     wxTextCtrl *m_textctrl;
     wxString    m_value;
     // implementation only
     void OnOK(wxCommandEvent& event);
 
 protected:
     wxTextCtrl *m_textctrl;
     wxString    m_value;

+    long        m_dialogStyle;

 
 private:
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_EVENT_TABLE()

+    DECLARE_DYNAMIC_CLASS(wxTextEntryDialog)
+    DECLARE_NO_COPY_CLASS(wxTextEntryDialog)

 };
 
 };
 

+// ----------------------------------------------------------------------------
+// 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,
 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);
+                  int x = wxDefaultCoord,
+                  int y = wxDefaultCoord,
+                  bool centre = true);

 
 

+wxString WXDLLEXPORT
+wxGetPasswordFromUser(const wxString& message,
+                      const wxString& caption = wxGetTextFromUserPromptStr,
+                      const wxString& default_value = wxEmptyString,
+                      wxWindow *parent = (wxWindow *) NULL);
+
+#endif
+    // wxUSE_TEXTDLG

 #endif
     // __TEXTDLGH_G__
 #endif
     // __TEXTDLGH_G__