m_clientData conflict fixed

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

diff --git a/include/wx/generic/textdlgg.h b/include/wx/generic/textdlgg.h
index bd3716ecda73d04d1d2fc17865d75d55e4c47680..13169fe86a3982ed5003fead510621fd602c0c5c 100644 (file)
--- a/include/wx/generic/textdlgg.h
+++ b/include/wx/generic/textdlgg.h
@@ -53,7 +53,7 @@ private:
 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------

-// functions to get a string or a number from user
+// function to get a string from user

 // ----------------------------------------------------------------------------
 
 wxString WXDLLEXPORT
 // ----------------------------------------------------------------------------
 
 wxString WXDLLEXPORT


@@ -65,15 +65,5 @@ wxGetTextFromUser(const wxString& message,
                   int y = -1,
                   bool centre = TRUE);
 
                   int y = -1,
                   bool centre = TRUE);
 

-long WXDLLEXPORT
-wxGetNumberFromUser(const wxString& message,
-                    const wxString& prompt,
-                    const wxString& caption,
-                    long value = 0,
-                    long min = 0,
-                    long max = 100,
-                    wxWindow *parent = (wxWindow *)NULL,
-                    const wxPoint& pos = wxDefaultPosition);
-

 #endif
     // __TEXTDLGH_G__
 #endif
     // __TEXTDLGH_G__