warning for 2.5.3

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

diff --git a/include/wx/generic/textdlgg.h b/include/wx/generic/textdlgg.h
index 81409bf504cbe180fd0593cf85dfae4ea745c338..f39a29b6387e0ec253ca641619cb99d8aab86186 100644 (file)
--- a/include/wx/generic/textdlgg.h
+++ b/include/wx/generic/textdlgg.h
@@ -1,31 +1,35 @@
 /////////////////////////////////////////////////////////////////////////////
 // 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"
 

+#if wxUSE_VALIDATORS
+#include "wx/valtext.h"
+#endif
+

 class WXDLLEXPORT wxTextCtrl;
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxGetTextFromUserPromptStr;
 class WXDLLEXPORT wxTextCtrl;
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxGetTextFromUserPromptStr;

-WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;

 
 

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

 
 // ----------------------------------------------------------------------------
 // wxTextEntryDialog: a dialog with text control, [ok] and [cancel] buttons
 
 // ----------------------------------------------------------------------------
 // wxTextEntryDialog: a dialog with text control, [ok] and [cancel] buttons


@@ -41,9 +45,16 @@ public:
                       long style = wxTextEntryDialogStyle,
                       const wxPoint& pos = wxDefaultPosition);
 
                       long style = wxTextEntryDialogStyle,
                       const wxPoint& pos = wxDefaultPosition);
 

-    void SetValue(const wxString& val) { m_value = val; m_textctrl->SetValue(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);
 
     // implementation only
     void OnOK(wxCommandEvent& event);
 


@@ -55,6 +66,7 @@ protected:
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxTextEntryDialog)
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxTextEntryDialog)

+    DECLARE_NO_COPY_CLASS(wxTextEntryDialog)

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -66,9 +78,9 @@ wxGetTextFromUser(const wxString& message,
                   const wxString& caption = wxGetTextFromUserPromptStr,
                   const wxString& default_value = wxEmptyString,
                   wxWindow *parent = (wxWindow *) NULL,
                   const wxString& caption = wxGetTextFromUserPromptStr,
                   const wxString& default_value = wxEmptyString,
                   wxWindow *parent = (wxWindow *) NULL,

-                  int x = -1,
-                  int y = -1,
-                  bool centre = TRUE);
+                  wxCoord x = wxDefaultCoord,
+                  wxCoord y = wxDefaultCoord,
+                  bool centre = true);

 
 wxString WXDLLEXPORT
 wxGetPasswordFromUser(const wxString& message,
 
 wxString WXDLLEXPORT
 wxGetPasswordFromUser(const wxString& message,


@@ -76,5 +88,7 @@ wxGetPasswordFromUser(const wxString& message,
                       const wxString& default_value = wxEmptyString,
                       wxWindow *parent = (wxWindow *) NULL);
 
                       const wxString& default_value = wxEmptyString,
                       wxWindow *parent = (wxWindow *) NULL);
 

+#endif
+    // wxUSE_TEXTDLG

 #endif
     // __TEXTDLGH_G__
 #endif
     // __TEXTDLGH_G__