diff --git a/Makefile.in b/Makefile.in
index 94da2f332d..b1d92f55df 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3939,6 +3939,8 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
 	wx/generic/dvrenderer.h \
 	wx/calctrl.h \
 	wx/propdlg.h \
+	wx/generic/creddlgg.h \
+	wx/creddlg.h \
 	$(LOWLEVEL_HDR) \
 	$(GUI_CORE_HEADERS) \
 	wx/mediactrl.h \
@@ -4588,7 +4590,8 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
 	monodll_datavgen.o \
 	monodll_editlbox.o \
 	monodll_laywin.o \
-	monodll_calctrlg.o
+	monodll_calctrlg.o \
+	monodll_creddlgg.o
 @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS)
 COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
 	$(__LOWLEVEL_SRC_OBJECTS_1) \
@@ -4848,7 +4851,8 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
 	monodll_datavgen.o \
 	monodll_editlbox.o \
 	monodll_laywin.o \
-	monodll_calctrlg.o
+	monodll_calctrlg.o \
+	monodll_creddlgg.o
 @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS)
 COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS =  \
 	monodll_fontmgrcmn.o \
@@ -6565,7 +6569,8 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
 	monolib_datavgen.o \
 	monolib_editlbox.o \
 	monolib_laywin.o \
-	monolib_calctrlg.o
+	monolib_calctrlg.o \
+	monolib_creddlgg.o
 @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_1 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1)
 COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
 	$(__LOWLEVEL_SRC_OBJECTS_3) \
@@ -6825,7 +6830,8 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
 	monolib_datavgen.o \
 	monolib_editlbox.o \
 	monolib_laywin.o \
-	monolib_calctrlg.o
+	monolib_calctrlg.o \
+	monolib_creddlgg.o
 @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_1 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1)
 COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_2 =  \
 	monolib_fontmgrcmn.o \
@@ -8690,7 +8696,8 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
 	coredll_datavgen.o \
 	coredll_editlbox.o \
 	coredll_laywin.o \
-	coredll_calctrlg.o
+	coredll_calctrlg.o \
+	coredll_creddlgg.o
 @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_2 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2)
 COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
 	$(__LOWLEVEL_SRC_OBJECTS_5) \
@@ -8950,7 +8957,8 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
 	coredll_datavgen.o \
 	coredll_editlbox.o \
 	coredll_laywin.o \
-	coredll_calctrlg.o
+	coredll_calctrlg.o \
+	coredll_creddlgg.o
 @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_2 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2)
 COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_4 =  \
 	coredll_fontmgrcmn.o \
@@ -10408,7 +10416,8 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
 	corelib_datavgen.o \
 	corelib_editlbox.o \
 	corelib_laywin.o \
-	corelib_calctrlg.o
+	corelib_calctrlg.o \
+	corelib_creddlgg.o
 @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_3 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3)
 COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
 	$(__LOWLEVEL_SRC_OBJECTS_7) \
@@ -10668,7 +10677,8 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
 	corelib_datavgen.o \
 	corelib_editlbox.o \
 	corelib_laywin.o \
-	corelib_calctrlg.o
+	corelib_calctrlg.o \
+	corelib_creddlgg.o
 @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_3 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3)
 COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_6 =  \
 	corelib_fontmgrcmn.o \
@@ -20716,6 +20726,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@monodll_calctrlg.o: $(srcdir)/src/generic/calctrlg.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/calctrlg.cpp
 
+@COND_USE_GUI_1@monodll_creddlgg.o: $(srcdir)/src/generic/creddlgg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/creddlgg.cpp
+
 @COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_osx_cocoa_mediactrl.o: $(srcdir)/src/osx/cocoa/mediactrl.mm $(MONODLL_ODEP)
 @COND_TOOLKIT_OSX_COCOA_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/mediactrl.mm
 
@@ -25975,6 +25988,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@monolib_calctrlg.o: $(srcdir)/src/generic/calctrlg.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/calctrlg.cpp
 
+@COND_USE_GUI_1@monolib_creddlgg.o: $(srcdir)/src/generic/creddlgg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/creddlgg.cpp
+
 @COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_osx_cocoa_mediactrl.o: $(srcdir)/src/osx/cocoa/mediactrl.mm $(MONOLIB_ODEP)
 @COND_TOOLKIT_OSX_COCOA_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/mediactrl.mm
 
@@ -31333,6 +31349,9 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
 @COND_USE_GUI_1@coredll_calctrlg.o: $(srcdir)/src/generic/calctrlg.cpp $(COREDLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/calctrlg.cpp
 
+@COND_USE_GUI_1@coredll_creddlgg.o: $(srcdir)/src/generic/creddlgg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/creddlgg.cpp
+
 corelib_event.o: $(srcdir)/src/common/event.cpp $(CORELIB_ODEP)
 	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/event.cpp
 
@@ -35581,6 +35600,9 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1@corelib_calctrlg.o: $(srcdir)/src/generic/calctrlg.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/calctrlg.cpp
 
+@COND_USE_GUI_1@corelib_creddlgg.o: $(srcdir)/src/generic/creddlgg.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/creddlgg.cpp
+
 advdll_version_rc.o: $(srcdir)/src/msw/version.rc $(ADVDLL_ODEP)
 	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66)  $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65)  --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_ADV
 
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index ea7679c556..66ac82af7b 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -1009,6 +1009,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/editlbox.cpp
     src/generic/laywin.cpp
     src/generic/calctrlg.cpp
+    src/generic/creddlgg.cpp
 </set>
 <set var="GUI_CMN_HDR" hints="files">
     wx/affinematrix2dbase.h
@@ -1297,6 +1298,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/dvrenderer.h
     wx/calctrl.h
     wx/propdlg.h
+    wx/generic/creddlgg.h
+    wx/creddlg.h
 </set>
 
 <!-- ====================================================================== -->
diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake
index 224d06b5b2..54659bf217 100644
--- a/build/cmake/files.cmake
+++ b/build/cmake/files.cmake
@@ -912,6 +912,7 @@ set(GUI_CMN_SRC
     src/generic/wizard.cpp
     src/generic/editlbox.cpp
     src/generic/datavgen.cpp
+    src/generic/creddlgg.cpp
 )
 
 set(GUI_CMN_HDR
@@ -1200,6 +1201,8 @@ set(GUI_CMN_HDR
     wx/generic/splash.h
     wx/generic/calctrlg.h
     wx/generic/sashwin.h
+    wx/creddlg.h
+    wx/generic/creddlgg.h
 )
 
 set(UNIX_SRC
diff --git a/build/cmake/options.cmake b/build/cmake/options.cmake
index a35a88eb57..155ca66a35 100644
--- a/build/cmake/options.cmake
+++ b/build/cmake/options.cmake
@@ -328,6 +328,7 @@ wx_option(wxUSE_COMMON_DIALOGS "use all common dialogs")
 wx_option(wxUSE_ABOUTDLG "use wxAboutBox")
 wx_option(wxUSE_CHOICEDLG "use wxChoiceDialog")
 wx_option(wxUSE_COLOURDLG "use wxColourDialog")
+wx_option(wxUSE_CREDENTIALDLG "use wxCredentialEntryDialog")
 wx_option(wxUSE_FILEDLG "use wxFileDialog")
 wx_option(wxUSE_FINDREPLDLG "use wxFindReplaceDialog")
 wx_option(wxUSE_FONTDLG "use wxFontDialog")
diff --git a/build/cmake/setup.h.in b/build/cmake/setup.h.in
index 87c54ba807..7c06dd28e2 100644
--- a/build/cmake/setup.h.in
+++ b/build/cmake/setup.h.in
@@ -524,6 +524,8 @@
 
 #cmakedefine01 wxUSE_NUMBERDLG
 
+#cmakedefine01 wxUSE_CREDENTIALDLG
+
 #cmakedefine01 wxUSE_SPLASH
 
 #cmakedefine01 wxUSE_WIZARDDLG
diff --git a/build/files b/build/files
index c121f78a8f..5a0ebe658c 100644
--- a/build/files
+++ b/build/files
@@ -872,6 +872,7 @@ GUI_CMN_SRC =
     src/generic/collheaderctrlg.cpp
     src/generic/combog.cpp
     src/generic/commandlinkbuttong.cpp
+    src/generic/creddlgg.cpp
     src/generic/datavgen.cpp
     src/generic/datectlg.cpp
     src/generic/dcpsg.cpp
@@ -968,6 +969,7 @@ GUI_CMN_HDR =
     wx/commandlinkbutton.h
     wx/compositewin.h
     wx/control.h
+    wx/creddlg.h
     wx/cshelp.h
     wx/ctrlsub.h
     wx/cursor.h
@@ -1027,6 +1029,7 @@ GUI_CMN_HDR =
     wx/generic/collheaderctrl.h
     wx/generic/combo.h
     wx/generic/custombgwin.h
+    wx/generic/creddlgg.h
     wx/generic/dataview.h
     wx/generic/datectrl.h
     wx/generic/dcpsg.h
diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index 67f8d38576..c9ccf9df3c 100644
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -2134,7 +2134,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_datavgen.obj \
 	$(OBJS)\monodll_editlbox.obj \
 	$(OBJS)\monodll_laywin.obj \
-	$(OBJS)\monodll_calctrlg.obj
+	$(OBJS)\monodll_calctrlg.obj \
+	$(OBJS)\monodll_creddlgg.obj
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_OBJECTS =  \
@@ -2459,7 +2460,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_datavgen.obj \
 	$(OBJS)\monodll_editlbox.obj \
 	$(OBJS)\monodll_laywin.obj \
-	$(OBJS)\monodll_calctrlg.obj
+	$(OBJS)\monodll_calctrlg.obj \
+	$(OBJS)\monodll_creddlgg.obj
 !endif
 !if "$(USE_STC)" == "1"
 ____MONOLIB_STC_SRC_FILENAMES_OBJECTS =  \
@@ -2963,7 +2965,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_datavgen.obj \
 	$(OBJS)\monolib_editlbox.obj \
 	$(OBJS)\monolib_laywin.obj \
-	$(OBJS)\monolib_calctrlg.obj
+	$(OBJS)\monolib_calctrlg.obj \
+	$(OBJS)\monolib_creddlgg.obj
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_1_OBJECTS =  \
@@ -3288,7 +3291,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_datavgen.obj \
 	$(OBJS)\monolib_editlbox.obj \
 	$(OBJS)\monolib_laywin.obj \
-	$(OBJS)\monolib_calctrlg.obj
+	$(OBJS)\monolib_calctrlg.obj \
+	$(OBJS)\monolib_creddlgg.obj
 !endif
 !if "$(USE_STC)" == "1"
 ____MONOLIB_STC_SRC_FILENAMES_1_OBJECTS =  \
@@ -3667,7 +3671,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_datavgen.obj \
 	$(OBJS)\coredll_editlbox.obj \
 	$(OBJS)\coredll_laywin.obj \
-	$(OBJS)\coredll_calctrlg.obj
+	$(OBJS)\coredll_calctrlg.obj \
+	$(OBJS)\coredll_creddlgg.obj
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_2_OBJECTS =  \
@@ -3992,7 +3997,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_datavgen.obj \
 	$(OBJS)\coredll_editlbox.obj \
 	$(OBJS)\coredll_laywin.obj \
-	$(OBJS)\coredll_calctrlg.obj
+	$(OBJS)\coredll_calctrlg.obj \
+	$(OBJS)\coredll_creddlgg.obj
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
 __corelib___depname = \
@@ -4337,7 +4343,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_datavgen.obj \
 	$(OBJS)\corelib_editlbox.obj \
 	$(OBJS)\corelib_laywin.obj \
-	$(OBJS)\corelib_calctrlg.obj
+	$(OBJS)\corelib_calctrlg.obj \
+	$(OBJS)\corelib_creddlgg.obj
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_3_OBJECTS =  \
@@ -4662,7 +4669,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_datavgen.obj \
 	$(OBJS)\corelib_editlbox.obj \
 	$(OBJS)\corelib_laywin.obj \
-	$(OBJS)\corelib_calctrlg.obj
+	$(OBJS)\corelib_calctrlg.obj \
+	$(OBJS)\corelib_creddlgg.obj
 !endif
 !if "$(SHARED)" == "1"
 ____wxcore_namedll_DEP = $(__coredll___depname)
@@ -8951,6 +8959,11 @@ $(OBJS)\monodll_calctrlg.obj: ..\..\src\generic\calctrlg.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\calctrlg.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_creddlgg.obj: ..\..\src\generic\creddlgg.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\creddlgg.cpp
+!endif
+
 $(OBJS)\monodll_version.res: ..\..\src\msw\version.rc
 	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG) -i$(BCCDIR)\include\windows\sdk  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\expat\lib -i..\..\src\stc\scintilla\include -i..\..\src\stc\scintilla\lexlib -i..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dNO_CXX11_REGEX -dLINK_LEXERS -dwxUSE_BASE=1 -dWXMAKINGDLL  ..\..\src\msw\version.rc
 
@@ -11498,6 +11511,11 @@ $(OBJS)\monolib_calctrlg.obj: ..\..\src\generic\calctrlg.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\calctrlg.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_creddlgg.obj: ..\..\src\generic\creddlgg.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\creddlgg.cpp
+!endif
+
 $(OBJS)\basedll_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 
@@ -14015,6 +14033,11 @@ $(OBJS)\coredll_calctrlg.obj: ..\..\src\generic\calctrlg.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\calctrlg.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_creddlgg.obj: ..\..\src\generic\creddlgg.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\creddlgg.cpp
+!endif
+
 $(OBJS)\corelib_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 
@@ -15743,6 +15766,11 @@ $(OBJS)\corelib_calctrlg.obj: ..\..\src\generic\calctrlg.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\calctrlg.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_creddlgg.obj: ..\..\src\generic\creddlgg.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\creddlgg.cpp
+!endif
+
 $(OBJS)\advdll_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index 0fbe1ef059..280498e6fc 100644
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -2160,7 +2160,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_datavgen.o \
 	$(OBJS)\monodll_editlbox.o \
 	$(OBJS)\monodll_laywin.o \
-	$(OBJS)\monodll_calctrlg.o
+	$(OBJS)\monodll_calctrlg.o \
+	$(OBJS)\monodll_creddlgg.o
 endif
 endif
 ifeq ($(USE_GUI),1)
@@ -2487,7 +2488,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_datavgen.o \
 	$(OBJS)\monodll_editlbox.o \
 	$(OBJS)\monodll_laywin.o \
-	$(OBJS)\monodll_calctrlg.o
+	$(OBJS)\monodll_calctrlg.o \
+	$(OBJS)\monodll_creddlgg.o
 endif
 endif
 ifeq ($(USE_STC),1)
@@ -2995,7 +2997,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_datavgen.o \
 	$(OBJS)\monolib_editlbox.o \
 	$(OBJS)\monolib_laywin.o \
-	$(OBJS)\monolib_calctrlg.o
+	$(OBJS)\monolib_calctrlg.o \
+	$(OBJS)\monolib_creddlgg.o
 endif
 endif
 ifeq ($(USE_GUI),1)
@@ -3322,7 +3325,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_datavgen.o \
 	$(OBJS)\monolib_editlbox.o \
 	$(OBJS)\monolib_laywin.o \
-	$(OBJS)\monolib_calctrlg.o
+	$(OBJS)\monolib_calctrlg.o \
+	$(OBJS)\monolib_creddlgg.o
 endif
 endif
 ifeq ($(USE_STC),1)
@@ -3715,7 +3719,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_datavgen.o \
 	$(OBJS)\coredll_editlbox.o \
 	$(OBJS)\coredll_laywin.o \
-	$(OBJS)\coredll_calctrlg.o
+	$(OBJS)\coredll_calctrlg.o \
+	$(OBJS)\coredll_creddlgg.o
 endif
 endif
 ifeq ($(USE_GUI),1)
@@ -4042,7 +4047,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_datavgen.o \
 	$(OBJS)\coredll_editlbox.o \
 	$(OBJS)\coredll_laywin.o \
-	$(OBJS)\coredll_calctrlg.o
+	$(OBJS)\coredll_calctrlg.o \
+	$(OBJS)\coredll_creddlgg.o
 endif
 endif
 ifeq ($(MONOLITHIC),0)
@@ -4393,7 +4399,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_datavgen.o \
 	$(OBJS)\corelib_editlbox.o \
 	$(OBJS)\corelib_laywin.o \
-	$(OBJS)\corelib_calctrlg.o
+	$(OBJS)\corelib_calctrlg.o \
+	$(OBJS)\corelib_creddlgg.o
 endif
 endif
 ifeq ($(USE_GUI),1)
@@ -4720,7 +4727,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_datavgen.o \
 	$(OBJS)\corelib_editlbox.o \
 	$(OBJS)\corelib_laywin.o \
-	$(OBJS)\corelib_calctrlg.o
+	$(OBJS)\corelib_calctrlg.o \
+	$(OBJS)\corelib_creddlgg.o
 endif
 endif
 ifeq ($(SHARED),1)
@@ -9133,6 +9141,11 @@ $(OBJS)\monodll_calctrlg.o: ../../src/generic/calctrlg.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_creddlgg.o: ../../src/generic/creddlgg.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 $(OBJS)\monodll_version_rc.o: ../../src/msw/version.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)  --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/expat/lib --include-dir ../../src/stc/scintilla/include --include-dir ../../src/stc/scintilla/lexlib --include-dir ../../src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define NO_CXX11_REGEX --define LINK_LEXERS --define wxUSE_BASE=1 --define WXMAKINGDLL
 
@@ -11680,6 +11693,11 @@ $(OBJS)\monolib_calctrlg.o: ../../src/generic/calctrlg.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_creddlgg.o: ../../src/generic/creddlgg.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 $(OBJS)\basedll_dummy.o: ../../src/common/dummy.cpp
 	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -14197,6 +14215,11 @@ $(OBJS)\coredll_calctrlg.o: ../../src/generic/calctrlg.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\coredll_creddlgg.o: ../../src/generic/creddlgg.cpp
+	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 $(OBJS)\corelib_dummy.o: ../../src/common/dummy.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
 
@@ -15925,6 +15948,11 @@ $(OBJS)\corelib_calctrlg.o: ../../src/generic/calctrlg.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\corelib_creddlgg.o: ../../src/generic/creddlgg.cpp
+	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 $(OBJS)\advdll_dummy.o: ../../src/common/dummy.cpp
 	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
 
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 0541f24c52..ab3f90cd4e 100644
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -2451,7 +2451,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_datavgen.obj \
 	$(OBJS)\monodll_editlbox.obj \
 	$(OBJS)\monodll_laywin.obj \
-	$(OBJS)\monodll_calctrlg.obj
+	$(OBJS)\monodll_calctrlg.obj \
+	$(OBJS)\monodll_creddlgg.obj
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_OBJECTS =  \
@@ -2776,7 +2777,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_datavgen.obj \
 	$(OBJS)\monodll_editlbox.obj \
 	$(OBJS)\monodll_laywin.obj \
-	$(OBJS)\monodll_calctrlg.obj
+	$(OBJS)\monodll_calctrlg.obj \
+	$(OBJS)\monodll_creddlgg.obj
 !endif
 !if "$(USE_STC)" == "1"
 ____MONOLIB_STC_SRC_FILENAMES_OBJECTS =  \
@@ -3286,7 +3288,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_datavgen.obj \
 	$(OBJS)\monolib_editlbox.obj \
 	$(OBJS)\monolib_laywin.obj \
-	$(OBJS)\monolib_calctrlg.obj
+	$(OBJS)\monolib_calctrlg.obj \
+	$(OBJS)\monolib_creddlgg.obj
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_1_OBJECTS =  \
@@ -3611,7 +3614,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_datavgen.obj \
 	$(OBJS)\monolib_editlbox.obj \
 	$(OBJS)\monolib_laywin.obj \
-	$(OBJS)\monolib_calctrlg.obj
+	$(OBJS)\monolib_calctrlg.obj \
+	$(OBJS)\monolib_creddlgg.obj
 !endif
 !if "$(USE_STC)" == "1"
 ____MONOLIB_STC_SRC_FILENAMES_1_OBJECTS =  \
@@ -4056,7 +4060,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_datavgen.obj \
 	$(OBJS)\coredll_editlbox.obj \
 	$(OBJS)\coredll_laywin.obj \
-	$(OBJS)\coredll_calctrlg.obj
+	$(OBJS)\coredll_calctrlg.obj \
+	$(OBJS)\coredll_creddlgg.obj
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_2_OBJECTS =  \
@@ -4381,7 +4386,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_datavgen.obj \
 	$(OBJS)\coredll_editlbox.obj \
 	$(OBJS)\coredll_laywin.obj \
-	$(OBJS)\coredll_calctrlg.obj
+	$(OBJS)\coredll_calctrlg.obj \
+	$(OBJS)\coredll_creddlgg.obj
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
 __corelib___depname = \
@@ -4732,7 +4738,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_datavgen.obj \
 	$(OBJS)\corelib_editlbox.obj \
 	$(OBJS)\corelib_laywin.obj \
-	$(OBJS)\corelib_calctrlg.obj
+	$(OBJS)\corelib_calctrlg.obj \
+	$(OBJS)\corelib_creddlgg.obj
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_3_OBJECTS =  \
@@ -5057,7 +5064,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_datavgen.obj \
 	$(OBJS)\corelib_editlbox.obj \
 	$(OBJS)\corelib_laywin.obj \
-	$(OBJS)\corelib_calctrlg.obj
+	$(OBJS)\corelib_calctrlg.obj \
+	$(OBJS)\corelib_creddlgg.obj
 !endif
 !if "$(SHARED)" == "1"
 ____wxcore_namedll_DEP = $(__coredll___depname)
@@ -9660,6 +9668,11 @@ $(OBJS)\monodll_calctrlg.obj: ..\..\src\generic\calctrlg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\calctrlg.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_creddlgg.obj: ..\..\src\generic\creddlgg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\creddlgg.cpp
+!endif
+
 $(OBJS)\monodll_version.res: ..\..\src\msw\version.rc
 	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\expat\lib /i ..\..\src\stc\scintilla\include /i ..\..\src\stc\scintilla\lexlib /i ..\..\src\stc\scintilla\src /d __WX__ /d SCI_LEXER /d NO_CXX11_REGEX /d LINK_LEXERS /d wxUSE_BASE=1 /d WXMAKINGDLL  ..\..\src\msw\version.rc
 
@@ -12207,6 +12220,11 @@ $(OBJS)\monolib_calctrlg.obj: ..\..\src\generic\calctrlg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\calctrlg.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_creddlgg.obj: ..\..\src\generic\creddlgg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\creddlgg.cpp
+!endif
+
 $(OBJS)\basedll_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
@@ -14724,6 +14742,11 @@ $(OBJS)\coredll_calctrlg.obj: ..\..\src\generic\calctrlg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\calctrlg.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_creddlgg.obj: ..\..\src\generic\creddlgg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\creddlgg.cpp
+!endif
+
 $(OBJS)\corelib_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
@@ -16452,6 +16475,11 @@ $(OBJS)\corelib_calctrlg.obj: ..\..\src\generic\calctrlg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\calctrlg.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_creddlgg.obj: ..\..\src\generic\creddlgg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\creddlgg.cpp
+!endif
+
 $(OBJS)\advdll_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
diff --git a/build/msw/wx_core.vcxproj b/build/msw/wx_core.vcxproj
index bf3ea86b5a..0d36e815ac 100644
--- a/build/msw/wx_core.vcxproj
+++ b/build/msw/wx_core.vcxproj
@@ -1061,6 +1061,7 @@
     <ClCompile Include="..\..\src\generic\hyperlinkg.cpp" />
     <ClCompile Include="..\..\src\generic\notifmsgg.cpp" />
     <ClCompile Include="..\..\src\common\bmpcboxcmn.cpp" />
+    <ClCompile Include="..\..\src\generic\creddlgg.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\msw\version.rc">
@@ -1497,6 +1498,8 @@
     <ClInclude Include="..\..\include\wx\richtooltip.h" />
     <ClInclude Include="..\..\include\wx\generic\gridsel.h" />
     <ClInclude Include="..\..\include\wx\dcbuffer.h" />
+    <ClInclude Include="..\..\include\wx\creddlg.h" />
+    <ClInclude Include="..\..\include\wx\generic\creddlgg.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/build/msw/wx_core.vcxproj.filters b/build/msw/wx_core.vcxproj.filters
index 7e17bd7ad0..cd1a1b8095 100644
--- a/build/msw/wx_core.vcxproj.filters
+++ b/build/msw/wx_core.vcxproj.filters
@@ -501,6 +501,9 @@
     <ClCompile Include="..\..\src\generic\commandlinkbuttong.cpp">
       <Filter>Generic Sources</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\generic\creddlgg.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\src\generic\datavgen.cpp">
       <Filter>Generic Sources</Filter>
     </ClCompile>
@@ -1195,6 +1198,9 @@
     <ClInclude Include="..\..\include\wx\control.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\wx\creddlg.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\wx\cshelp.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
@@ -1381,6 +1387,9 @@
     <ClInclude Include="..\..\include\wx\generic\combo.h">
       <Filter>Generic Headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\wx\generic\creddlgg.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\wx\generic\custombgwin.h">
       <Filter>Generic Headers</Filter>
     </ClInclude>
diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj
index a161fe794c..905c9960b5 100644
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -1184,6 +1184,9 @@
 			<File
 				RelativePath="..\..\src\generic\commandlinkbuttong.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\generic\creddlgg.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\generic\datavgen.cpp">
 			</File>
@@ -1845,6 +1848,9 @@
 			<File
 				RelativePath="..\..\include\wx\generic\combo.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\creddlgg.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\custombgwin.h">
 			</File>
@@ -2192,6 +2198,9 @@
 			<File
 				RelativePath="..\..\include\wx\ribbon\control.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\creddlg.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\cshelp.h">
 			</File>
diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj
index 701ec8da4e..eec9cbc66a 100644
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -1991,6 +1991,10 @@
 				RelativePath="..\..\src\generic\commandlinkbuttong.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\generic\creddlgg.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\generic\datavgen.cpp"
 				>
@@ -2962,6 +2966,10 @@
 				RelativePath="..\..\include\wx\generic\combo.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\creddlgg.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\custombgwin.h"
 				>
@@ -3424,6 +3432,10 @@
 				RelativePath="..\..\include\wx\ribbon\control.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\creddlg.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\cshelp.h"
 				>
diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj
index c235625f90..a27fc40bc0 100644
--- a/build/msw/wx_vc9_core.vcproj
+++ b/build/msw/wx_vc9_core.vcproj
@@ -1987,6 +1987,10 @@
 				RelativePath="..\..\src\generic\commandlinkbuttong.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\generic\creddlgg.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\generic\datavgen.cpp"
 				>
@@ -2958,6 +2962,10 @@
 				RelativePath="..\..\include\wx\generic\combo.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\creddlgg.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\custombgwin.h"
 				>
@@ -3420,6 +3428,10 @@
 				RelativePath="..\..\include\wx\ribbon\control.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\creddlg.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\cshelp.h"
 				>
diff --git a/configure b/configure
index dffae7b78c..60db7082ed 100755
--- a/configure
+++ b/configure
@@ -1298,6 +1298,7 @@ enable_commondlg
 enable_aboutdlg
 enable_choicedlg
 enable_coldlg
+enable_creddlg
 enable_filedlg
 enable_finddlg
 enable_fontdlg
@@ -2240,6 +2241,7 @@ Optional Features:
   --enable-aboutdlg       use wxAboutBox
   --enable-choicedlg      use wxChoiceDialog
   --enable-coldlg         use wxColourDialog
+  --enable-creddlg        use wxCredentialEntryDialog
   --enable-filedlg        use wxFileDialog
   --enable-finddlg        use wxFindReplaceDialog
   --enable-fontdlg        use wxFontDialog
@@ -11277,6 +11279,35 @@ fi
           eval "$wx_cv_use_coldlg"
 
 
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          # Check whether --enable-creddlg was given.
+if test "${enable_creddlg+set}" = set; then :
+  enableval=$enable_creddlg;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_creddlg='wxUSE_CREDENTIALDLG=yes'
+                          else
+                            wx_cv_use_creddlg='wxUSE_CREDENTIALDLG=no'
+                          fi
+
+else
+
+                          wx_cv_use_creddlg='wxUSE_CREDENTIALDLG=${'DEFAULT_wxUSE_CREDENTIALDLG":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_creddlg"
+
+
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
@@ -38088,6 +38119,11 @@ if test "$wxUSE_COLOURDLG" = "yes"; then
 
 fi
 
+if test "$wxUSE_CREDENTIALDLG" = "yes"; then
+    $as_echo "#define wxUSE_CREDENTIALDLG 1" >>confdefs.h
+
+fi
+
 if test "$wxUSE_FILEDLG" = "yes"; then
     $as_echo "#define wxUSE_FILEDLG 1" >>confdefs.h
 
diff --git a/configure.in b/configure.in
index 3ca104240e..b632b2c84c 100644
--- a/configure.in
+++ b/configure.in
@@ -970,6 +970,7 @@ WX_ARG_FEATURE(commondlg,   [  --enable-commondlg      use all common dialogs],
 WX_ARG_FEATURE(aboutdlg,    [  --enable-aboutdlg       use wxAboutBox], wxUSE_ABOUTDLG)
 WX_ARG_FEATURE(choicedlg,   [  --enable-choicedlg      use wxChoiceDialog], wxUSE_CHOICEDLG)
 WX_ARG_FEATURE(coldlg,      [  --enable-coldlg         use wxColourDialog], wxUSE_COLOURDLG)
+WX_ARG_FEATURE(creddlg,     [  --enable-creddlg        use wxCredentialEntryDialog], wxUSE_CREDENTIALDLG)
 WX_ARG_FEATURE(filedlg,     [  --enable-filedlg        use wxFileDialog], wxUSE_FILEDLG)
 WX_ARG_FEATURE(finddlg,     [  --enable-finddlg        use wxFindReplaceDialog], wxUSE_FINDREPLDLG)
 WX_ARG_FEATURE(fontdlg,     [  --enable-fontdlg        use wxFontDialog], wxUSE_FONTDLG)
@@ -7374,6 +7375,10 @@ if test "$wxUSE_COLOURDLG" = "yes"; then
     AC_DEFINE(wxUSE_COLOURDLG)
 fi
 
+if test "$wxUSE_CREDENTIALDLG" = "yes"; then
+    AC_DEFINE(wxUSE_CREDENTIALDLG)
+fi
+
 if test "$wxUSE_FILEDLG" = "yes"; then
     AC_DEFINE(wxUSE_FILEDLG)
 fi
diff --git a/docs/doxygen/overviews/commondialogs.h b/docs/doxygen/overviews/commondialogs.h
index e1affa2f63..6cf03ab906 100644
--- a/docs/doxygen/overviews/commondialogs.h
+++ b/docs/doxygen/overviews/commondialogs.h
@@ -214,6 +214,16 @@ is obtained using wxNumberEntryDialog::GetValue().
 
 
 
+@section overview_cmndlg_cred wxCredentialEntryDialog Overview
+
+Classes: wxCredentialEntryDialog
+
+This is a dialog with a user and password entry field. The values that the
+users entered is obtained using wxCredentialEntryDialog::GetUser() and
+wxCredentialEntryDialog::GetPassword().
+
+
+
 @section overview_cmndlg_msg wxMessageDialog Overview
 
 Classes: wxMessageDialog
diff --git a/include/wx/android/setup.h b/include/wx/android/setup.h
index 272e381944..5ae9543714 100644
--- a/include/wx/android/setup.h
+++ b/include/wx/android/setup.h
@@ -1299,6 +1299,9 @@
 // number entry dialog
 #define wxUSE_NUMBERDLG 1
 
+// credential entry dialog
+#define wxUSE_CREDENTIALDLG 1
+
 // splash screen class
 #define wxUSE_SPLASH 1
 
diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 3a100bd3bf..d4db96bd15 100644
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -2128,6 +2128,7 @@
 #   if wxUSE_FONTDLG || \
        wxUSE_FILEDLG || \
        wxUSE_CHOICEDLG || \
+       wxUSE_CREDENTIALDLG || \
        wxUSE_NUMBERDLG || \
        wxUSE_TEXTDLG || \
        wxUSE_DIRDLG || \
diff --git a/include/wx/creddlg.h b/include/wx/creddlg.h
new file mode 100644
index 0000000000..13c8c7200f
--- /dev/null
+++ b/include/wx/creddlg.h
@@ -0,0 +1,15 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/creddlg.h
+// Purpose:     wxCredentialEntryDialog interface
+// Author:      Tobias Taschner
+// Created:     2018-10-23
+// Copyright:   (c) 2018 wxWidgets development team
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_CREDDLG_H_BASE
+#define _WX_CREDDLG_H_BASE
+
+#include "wx/generic/creddlgg.h"
+
+#endif // _WX_CREDDLG_H_BASE
diff --git a/include/wx/generic/creddlgg.h b/include/wx/generic/creddlgg.h
new file mode 100644
index 0000000000..64c4e97199
--- /dev/null
+++ b/include/wx/generic/creddlgg.h
@@ -0,0 +1,55 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/generic/creddlgg.h
+// Purpose:     wxGenericCredentialEntryDialog interface
+// Author:      Tobias Taschner
+// Created:     2018-10-23
+// Copyright:   (c) 2018 wxWidgets development team
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_CREDDLGG_H_BASE
+#define _WX_CREDDLGG_H_BASE
+
+#include "wx/defs.h"
+
+#if wxUSE_CREDENTIALDLG
+
+#include "wx/dialog.h"
+
+class WXDLLIMPEXP_CORE wxGenericCredentialEntryDialog : public wxDialog
+{
+public:
+    wxGenericCredentialEntryDialog();
+
+    wxGenericCredentialEntryDialog(wxWindow* parent, const wxString& message,
+        const wxString& title,
+        const wxString& user = "",
+        const wxString& password = "");
+
+    bool Create(wxWindow* parent, const wxString& message,
+        const wxString& title,
+        const wxString& user = "",
+        const wxString& password = "");
+
+    wxString GetUser() const { return m_userTextCtrl->GetValue(); }
+    void SetUser(const wxString& user) { m_userTextCtrl->SetValue(user); }
+
+    wxString GetPassword() const { return m_passwordTextCtrl->GetValue(); }
+    void SetPassword(const wxString& password)
+        { m_passwordTextCtrl->SetValue(password); }
+
+private:
+    wxTextCtrl* m_userTextCtrl;
+    wxTextCtrl* m_passwordTextCtrl;
+
+    void Init(const wxString& message,
+        const wxString& user,
+        const wxString& password);
+};
+
+// Add this typedef as long as the generic version is the only one available
+typedef wxGenericCredentialEntryDialog wxCredentialEntryDialog;
+
+#endif // wxUSE_CREDENTIALDLG
+
+#endif // _WX_CREDDLGG_H_BASE
diff --git a/include/wx/gtk/setup0.h b/include/wx/gtk/setup0.h
index 7bedbed0c4..ddb2d2688a 100644
--- a/include/wx/gtk/setup0.h
+++ b/include/wx/gtk/setup0.h
@@ -1300,6 +1300,9 @@
 // number entry dialog
 #define wxUSE_NUMBERDLG 1
 
+// credential entry dialog
+#define wxUSE_CREDENTIALDLG 1
+
 // splash screen class
 #define wxUSE_SPLASH 1
 
diff --git a/include/wx/motif/setup0.h b/include/wx/motif/setup0.h
index bf71fa4aa3..d7e39b324e 100644
--- a/include/wx/motif/setup0.h
+++ b/include/wx/motif/setup0.h
@@ -1300,6 +1300,9 @@
 // number entry dialog
 #define wxUSE_NUMBERDLG 1
 
+// credential entry dialog
+#define wxUSE_CREDENTIALDLG 1
+
 // splash screen class
 #define wxUSE_SPLASH 1
 
diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 1b6b30d7a6..d4560537bf 100644
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -1300,6 +1300,9 @@
 // number entry dialog
 #define wxUSE_NUMBERDLG 1
 
+// credential entry dialog
+#define wxUSE_CREDENTIALDLG 1
+
 // splash screen class
 #define wxUSE_SPLASH 1
 
diff --git a/include/wx/osx/setup0.h b/include/wx/osx/setup0.h
index 0b1849a279..89d1fae92c 100644
--- a/include/wx/osx/setup0.h
+++ b/include/wx/osx/setup0.h
@@ -1306,6 +1306,9 @@
 // number entry dialog
 #define wxUSE_NUMBERDLG 1
 
+// credential entry dialog
+#define wxUSE_CREDENTIALDLG 1
+
 // splash screen class
 #define wxUSE_SPLASH 1
 
@@ -1628,13 +1631,6 @@
 // make sure we have the proper dispatcher for the console event loop
 #define wxUSE_SELECT_DISPATCHER 1
 #define wxUSE_EPOLL_DISPATCHER 0
-
-// set to 1 if you have older code that still needs icon refs
-#define wxOSX_USE_ICONREF 0
-
-// set to 0 if you have code that has problems with the new bitmap implementation
-#define wxOSX_BITMAP_NATIVE_ACCESS 1
-
 /* --- end OSX options --- */
 
 #endif
diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h
index f8b9346a32..cad052ed0c 100644
--- a/include/wx/setup_inc.h
+++ b/include/wx/setup_inc.h
@@ -1296,6 +1296,9 @@
 // number entry dialog
 #define wxUSE_NUMBERDLG 1
 
+// credential entry dialog
+#define wxUSE_CREDENTIALDLG 1
+
 // splash screen class
 #define wxUSE_SPLASH 1
 
diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h
index f540e5816d..9028fe95fc 100644
--- a/include/wx/univ/setup0.h
+++ b/include/wx/univ/setup0.h
@@ -1299,6 +1299,9 @@
 // number entry dialog
 #define wxUSE_NUMBERDLG 1
 
+// credential entry dialog
+#define wxUSE_CREDENTIALDLG 1
+
 // splash screen class
 #define wxUSE_SPLASH 1
 
diff --git a/interface/wx/creddlg.h b/interface/wx/creddlg.h
new file mode 100644
index 0000000000..cf67cc4821
--- /dev/null
+++ b/interface/wx/creddlg.h
@@ -0,0 +1,83 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        creddlg.h
+// Created:     2018-10-23
+// Copyright:   (c) 2018 wxWidgets development team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+/**
+    @class wxCredentialEntryDialog
+
+    This class represents a dialog that requests a user name and a password
+    from the user. It is implemented as a generic wxWidgets dialog on all
+    platforms.
+
+    @note For secure saving and loading, user and passwords have a look at
+        wxSecretStore.
+
+    @since 3.1.2
+
+    @library{wxcore}
+    @category{cmndlg}
+
+    @see @ref overview_cmndlg_cred
+*/
+class wxCredentialEntryDialog: public wxDialog
+{
+public:
+    /**
+        Default constructor.
+
+        Call Create() to really create the dialog later.
+    */
+    wxCredentialEntryDialog();
+
+    /**
+        Constructor.
+
+        Use ShowModal() to show the dialog.
+
+        See Create() method for parameter description.
+    */
+    wxCredentialEntryDialog(wxWindow* parent, const wxString& message,
+        const wxString& title,
+        const wxString& user = "",
+        const wxString& password = "");
+
+    /**
+        @param parent
+            Parent window.
+        @param message
+            Message to show on the dialog.
+        @param title
+            The title of the dialog.
+        @param user
+            The default user value.
+        @param password
+            The default password.
+    */
+    bool Create(wxWindow* parent, const wxString& message,
+        const wxString& title,
+        const wxString& user = "",
+        const wxString& password = "");
+
+    /**
+        Returns the entered user name.
+    */
+    wxString GetUser() const;
+
+    /**
+        Sets the current user name.
+    */
+    void SetUser(const wxString& user);
+
+    /**
+        Returns the entered password.
+    */
+    wxString GetPassword() const;
+
+    /**
+        Sets the current password.
+    */
+    void SetPassword(const wxString& password);
+};
diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index 578bb940ce..223a1e2eac 100644
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -110,6 +110,10 @@
 
 #include "dialogs.h"
 
+#if wxUSE_CREDENTIALDLG
+    #include "wx/creddlg.h"
+#endif
+
 #if USE_COLOURDLG_GENERIC
     #include "wx/generic/colrdlgg.h"
 #endif // USE_COLOURDLG_GENERIC
@@ -168,6 +172,10 @@ wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(DIALOGS_PASSWORD_ENTRY,                MyFrame::PasswordEntry)
 #endif // wxUSE_TEXTDLG
 
+#if wxUSE_CREDENTIALDLG
+    EVT_MENU(DIALOGS_CREDENTIAL_ENTRY,              MyFrame::CredentialEntry)
+#endif // wxUSE_CREDENTIALDLG
+
 #if wxUSE_NUMBERDLG
     EVT_MENU(DIALOGS_NUM_ENTRY,                     MyFrame::NumericEntry)
 #endif // wxUSE_NUMBERDLG
@@ -444,7 +452,7 @@ bool MyApp::OnInit()
 #endif // wxUSE_COLOURDLG || wxUSE_FONTDLG || wxUSE_CHOICEDLG
 
 
-#if wxUSE_TEXTDLG || wxUSE_NUMBERDLG
+#if wxUSE_TEXTDLG || wxUSE_NUMBERDLG || wxUSE_CREDENTIALDLG
 
     wxMenu *entry_menu = new wxMenu;
 
@@ -454,6 +462,10 @@ bool MyApp::OnInit()
         entry_menu->Append(DIALOGS_PASSWORD_ENTRY,  "&Password entry\tCtrl-P");
     #endif // wxUSE_TEXTDLG
 
+    #if wxUSE_CREDENTIALDLG
+        entry_menu->Append(DIALOGS_CREDENTIAL_ENTRY, "&Credential entry\tShift-Ctrl-C");
+    #endif // wxUSE_CREDENTIALDLG
+
     #if wxUSE_NUMBERDLG
         entry_menu->Append(DIALOGS_NUM_ENTRY, "&Numeric entry\tCtrl-N");
     #endif // wxUSE_NUMBERDLG
@@ -1083,6 +1095,20 @@ void MyFrame::TextEntry(wxCommandEvent& WXUNUSED(event))
 }
 #endif // wxUSE_TEXTDLG
 
+#if wxUSE_CREDENTIALDLG
+void MyFrame::CredentialEntry(wxCommandEvent& WXUNUSED(event))
+{
+    wxCredentialEntryDialog dialog(this, "A login is required", "Credentials");
+    if (dialog.ShowModal() == wxID_OK)
+    {
+        wxMessageBox(
+            wxString::Format("User: %s Password: %s",
+                dialog.GetUser(), dialog.GetPassword()),
+            "Credentials", wxOK | wxICON_INFORMATION, this);
+    }
+}
+#endif // wxUSE_CREDENTIALDLG
+
 #if wxUSE_CHOICEDLG
 void MyFrame::SingleChoice(wxCommandEvent& WXUNUSED(event) )
 {
diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index 9d37f4b69b..bb0427e1fb 100644
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -413,6 +413,10 @@ public:
     void PasswordEntry(wxCommandEvent& event);
 #endif // wxUSE_TEXTDLG
 
+#ifdef wxUSE_CREDENTIALDLG
+    void CredentialEntry(wxCommandEvent& event);
+#endif // wxUSE_CREDENTIALDLG
+
 #if wxUSE_NUMBERDLG
     void NumericEntry(wxCommandEvent& event);
 #endif // wxUSE_NUMBERDLG
@@ -579,6 +583,7 @@ enum
     DIALOGS_LINE_ENTRY,
     DIALOGS_TEXT_ENTRY,
     DIALOGS_PASSWORD_ENTRY,
+    DIALOGS_CREDENTIAL_ENTRY,
     DIALOGS_FILE_OPEN,
     DIALOGS_FILE_OPEN2,
     DIALOGS_FILES_OPEN,
diff --git a/setup.h.in b/setup.h.in
index 48cf6734e7..792e771fd3 100644
--- a/setup.h.in
+++ b/setup.h.in
@@ -524,6 +524,8 @@
 
 #define wxUSE_NUMBERDLG 0
 
+#define wxUSE_CREDENTIALDLG 0
+
 #define wxUSE_SPLASH 0
 
 #define wxUSE_WIZARDDLG 0
diff --git a/src/generic/creddlgg.cpp b/src/generic/creddlgg.cpp
new file mode 100644
index 0000000000..5415de6c3c
--- /dev/null
+++ b/src/generic/creddlgg.cpp
@@ -0,0 +1,77 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/generic/creddlgg.h
+// Purpose:     wxGenericCredentialEntryDialog implementation
+// Author:      Tobias Taschner
+// Created:     2018-10-23
+// Copyright:   (c) 2018 wxWidgets development team
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#if wxUSE_CREDENTIALDLG
+
+#ifndef WX_PRECOMP
+    #include "wx/dialog.h"
+    #include "wx/button.h"
+    #include "wx/stattext.h"
+    #include "wx/textctrl.h"
+    #include "wx/intl.h"
+    #include "wx/sizer.h"
+#endif
+
+#include "wx/generic/creddlgg.h"
+
+wxGenericCredentialEntryDialog::wxGenericCredentialEntryDialog()
+{
+}
+
+wxGenericCredentialEntryDialog::wxGenericCredentialEntryDialog(
+    wxWindow* parent, const wxString& message, const wxString& title,
+    const wxString& user, const wxString& password):
+    wxDialog(parent, wxID_ANY, title)
+{
+    Init(message, user, password);
+}
+
+bool wxGenericCredentialEntryDialog::Create(wxWindow* parent,
+    const wxString& message, const wxString& title, const wxString& user,
+    const wxString& password)
+{
+    if ( !wxDialog::Create(parent, wxID_ANY, title) )
+        return false;
+
+    Init(message, user, password);
+    return true;
+}
+
+void wxGenericCredentialEntryDialog::Init(const wxString& message,
+    const wxString& user, const wxString& password)
+{
+    wxSizer* topsizer = new wxBoxSizer(wxVERTICAL);
+
+    topsizer->Add(CreateTextSizer(message), wxSizerFlags().Border());
+
+    topsizer->Add(new wxStaticText(this, wxID_ANY, _("Username:")),
+        wxSizerFlags().Border(wxLEFT | wxRIGHT));
+    m_userTextCtrl = new wxTextCtrl(this, wxID_ANY, user, wxDefaultPosition, wxSize(FromDIP(300), wxDefaultCoord));
+    topsizer->Add(m_userTextCtrl, wxSizerFlags().Expand().Border());
+
+    topsizer->Add(new wxStaticText(this, wxID_ANY, _("Password:")),
+        wxSizerFlags().Border(wxLEFT | wxRIGHT));
+    m_passwordTextCtrl = new wxTextCtrl(this, wxID_ANY, password,
+        wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD);
+    topsizer->Add(m_passwordTextCtrl, wxSizerFlags().Expand().Border());
+
+    topsizer->Add(CreateStdDialogButtonSizer(wxOK | wxCANCEL), wxSizerFlags().Expand().Border());
+    SetSizerAndFit(topsizer);
+
+    m_userTextCtrl->SetFocus();
+}
+
+#endif // wxUSE_CREDENTIALDLG