Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/generic/textdlgg.h b/include/wx/generic/textdlgg.h
index d9cbafc1b726a4a25a8b9d7bdc98d0772346a250..bbd7c70de50e22f916750ce198a6adf3b7343f51 100644 (file)
--- a/include/wx/generic/textdlgg.h
+++ b/include/wx/generic/textdlgg.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        textdlgg.h
-// Purpose:     wxStatusBar class
+// Name:        wx/generic/textdlgg.h
+// Purpose:     wxTextEntryDialog class

 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97


@@ -9,25 +9,24 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __TEXTDLGH_G__
-#define __TEXTDLGH_G__
+#ifndef _WX_TEXTDLGG_H_
+#define _WX_TEXTDLGG_H_

 
 

-#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"
 
 #if wxUSE_VALIDATORS
 #include "wx/valtext.h"
 
 #include "wx/dialog.h"
 
 #if wxUSE_VALIDATORS
 #include "wx/valtext.h"

+#include "wx/textctrl.h"

 #endif
 
 #endif
 

-class WXDLLEXPORT wxTextCtrl;
+class WXDLLIMPEXP_FWD_CORE wxTextCtrl;

 
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxGetTextFromUserPromptStr;
+extern WXDLLIMPEXP_DATA_CORE(const char) wxGetTextFromUserPromptStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxGetPasswordFromUserPromptStr[];

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


@@ -35,25 +34,47 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxGetTextFromUserPromptStr;
 // wxTextEntryDialog: a dialog with text control, [ok] and [cancel] buttons
 // ----------------------------------------------------------------------------
 
 // wxTextEntryDialog: a dialog with text control, [ok] and [cancel] buttons
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxTextEntryDialog : public wxDialog
+class WXDLLIMPEXP_CORE wxTextEntryDialog : public wxDialog

 {
 public:
 {
 public:

+    wxTextEntryDialog()
+    {
+        m_textctrl = NULL;
+    }
+

     wxTextEntryDialog(wxWindow *parent,
                       const wxString& message,
                       const wxString& caption = wxGetTextFromUserPromptStr,
                       const wxString& value = wxEmptyString,
                       long style = wxTextEntryDialogStyle,
     wxTextEntryDialog(wxWindow *parent,
                       const wxString& message,
                       const wxString& caption = wxGetTextFromUserPromptStr,
                       const wxString& value = wxEmptyString,
                       long style = wxTextEntryDialogStyle,

-                      const wxPoint& pos = wxDefaultPosition);
+                      const wxPoint& pos = wxDefaultPosition)
+    {
+        Create(parent, message, caption, value, style, pos);
+    }
+
+    bool Create(wxWindow *parent,
+                const wxString& message,
+                const wxString& caption = wxGetTextFromUserPromptStr,
+                const wxString& value = wxEmptyString,
+                long style = wxTextEntryDialogStyle,
+                const wxPoint& pos = wxDefaultPosition);

 
     void SetValue(const wxString& val);
     wxString GetValue() const { return m_value; }
 
 
     void SetValue(const wxString& val);
     wxString GetValue() const { return m_value; }
 

+    void SetMaxLength(unsigned long len);
+

 #if wxUSE_VALIDATORS
 #if wxUSE_VALIDATORS

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

 #endif
 #endif

-  // wxUSE_VALIDATORS
+    void SetTextValidator( wxTextValidatorStyle style = wxFILTER_NONE );
+    wxTextValidator* GetTextValidator() { return (wxTextValidator*)m_textctrl->GetValidator(); }
+#endif // wxUSE_VALIDATORS
+
+    virtual bool TransferDataToWindow();
+    virtual bool TransferDataFromWindow();

 
     // implementation only
     void OnOK(wxCommandEvent& event);
 
     // implementation only
     void OnOK(wxCommandEvent& event);


@@ -66,29 +87,49 @@ protected:
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxTextEntryDialog)
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxTextEntryDialog)

-    DECLARE_NO_COPY_CLASS(wxTextEntryDialog)
+    wxDECLARE_NO_COPY_CLASS(wxTextEntryDialog);
+};
+
+// ----------------------------------------------------------------------------
+// wxPasswordEntryDialog: dialog with password control, [ok] and [cancel]
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_CORE 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)
+    wxDECLARE_NO_COPY_CLASS(wxPasswordEntryDialog);

 };
 
 // ----------------------------------------------------------------------------
 // function to get a string from user
 // ----------------------------------------------------------------------------
 
 };
 
 // ----------------------------------------------------------------------------
 // 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);
+WXDLLIMPEXP_CORE wxString
+    wxGetTextFromUser(const wxString& message,
+                    const wxString& caption = wxGetTextFromUserPromptStr,
+                    const wxString& default_value = wxEmptyString,
+                    wxWindow *parent = NULL,
+                    wxCoord x = wxDefaultCoord,
+                    wxCoord y = wxDefaultCoord,
+                    bool centre = true);
+
+WXDLLIMPEXP_CORE wxString
+    wxGetPasswordFromUser(const wxString& message,
+                        const wxString& caption = wxGetPasswordFromUserPromptStr,
+                        const wxString& default_value = wxEmptyString,
+                        wxWindow *parent = NULL,
+                        wxCoord x = wxDefaultCoord,
+                        wxCoord y = wxDefaultCoord,
+                        bool centre = true);

 
 #endif
     // wxUSE_TEXTDLG
 
 #endif
     // wxUSE_TEXTDLG

-#endif
-    // __TEXTDLGH_G__
+#endif // _WX_TEXTDLGG_H_