diff --git a/docs/doxygen/overviews/commondialogs.h b/docs/doxygen/overviews/commondialogs.h
index 4cdf52abd2..5a69090d3d 100644
--- a/docs/doxygen/overviews/commondialogs.h
+++ b/docs/doxygen/overviews/commondialogs.h
@@ -205,6 +205,15 @@ is obtained using wxTextEntryDialog::GetValue().
 
 
 
+@section overview_cmndlg_numeric wxNumberEntryDialog Overview
+
+Classes: wxNumberEntryDialog
+
+This is a dialog with a numeric entry field. The value that the user entered
+is obtained using wxNumberEntryDialog::GetValue().
+
+
+
 @section overview_cmndlg_msg wxMessageDialog Overview
 
 Classes: wxMessageDialog
diff --git a/interface/wx/numdlg.h b/interface/wx/numdlg.h
index 5fbae0805d..b1bf88b005 100644
--- a/interface/wx/numdlg.h
+++ b/interface/wx/numdlg.h
@@ -1,10 +1,87 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        numdlg.h
-// Purpose:     interface of global functions
+// Purpose:     interface of wxNumberEntryDialog
 // Author:      wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+/**
+    @class wxNumberEntryDialog
+
+    This class represents a dialog that requests a numeric input from the user.
+
+    Currently it is implemented as a generic wxWidgets dialog under all
+    platforms.
+
+    You can use a convenience wxGetNumberFromUser() function instead of using
+    this dialog.
+
+    @library{wxcore}
+    @category{cmndlg}
+
+    @see @ref overview_cmndlg_numeric
+*/
+class wxNumberEntryDialog : public wxDialog
+{
+public:
+    /**
+        Default constructor.
+
+        Call Create() to really create the dialog later.
+     */
+    wxNumberEntryDialog();
+
+    /**
+        Constructor.
+
+        Use ShowModal() to show the dialog.
+
+        See Create() method for parameter description.
+    */
+    wxNumberEntryDialog(wxWindow *parent,
+                        const wxString& message,
+                        const wxString& prompt,
+                        const wxString& caption,
+                        long value, long min, long max,
+                        const wxPoint& pos = wxDefaultPosition);
+
+    /**
+        @param parent
+            Parent window.
+        @param message
+            Message to show on the dialog.
+        @param prompt
+            The prompt of the dialog.
+        @param caption
+            The caption of the dialog.
+        @param value
+            The default value.
+        @param min
+            The minimal value.
+        @param max
+            The maximal value.
+        @param pos
+            Dialog position.
+    */
+    bool Create(wxWindow *parent,
+                const wxString& message,
+                const wxString& prompt,
+                const wxString& caption,
+                long value, long min, long max,
+                const wxPoint& pos = wxDefaultPosition);
+
+    /**
+        Returns the value that the user has entered if the user has pressed OK,
+        or the original value if the user has pressed Cancel.
+    */
+    wxString GetValue() const;
+};
+
+
+// ============================================================================
+// Global functions/macros
+// ============================================================================
+
 /** @addtogroup group_funcmacro_dialog */
 //@{
 
@@ -16,12 +93,17 @@
     The number entered must be in the range @c min to @c max (both of which
     should be positive) and @c value is the initial value of it. If the user
     enters an invalid value, it is forced to fall into the specified range. If
-    the user cancels the dialog, the function returns -1.
+    the user cancels the dialog, the function returns -1. If it is important to
+    distinguish between cancelling the dialog and actually entering -1 in it,
+    i.e. if -1 is a valid input value, this convenience function can't be used
+    and wxNumberEntryDialog should be used directly instead.
 
     Dialog is centered on its @c parent unless an explicit position is given
     in @c pos.
 
     @header{wx/numdlg.h}
+
+    @see wxNumberEntryDialog
 */
 long wxGetNumberFromUser(const wxString& message,
                          const wxString& prompt,
@@ -33,4 +115,3 @@ long wxGetNumberFromUser(const wxString& message,
                          const wxPoint& pos = wxDefaultPosition);
 
 //@}
-