diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index 3d555e24cf..479e878f8b 100644
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -198,7 +198,11 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
   msflags &= ~WS_VSCROLL;
   msflags &= ~WS_HSCROLL;
 
-  if ( !wxWindow::MSWCreate(wxApp::GetRegisteredClassName(wxT("wxMDIFrame")),
+  if ( !wxWindow::MSWCreate(wxApp::GetRegisteredClassName(
+                                    wxT("wxMDIFrame"), -1, 0,
+                                    (style & wxFULL_REPAINT_ON_RESIZE) ? wxApp::RegClass_Default
+                                                                       : wxApp::RegClass_ReturnNR
+                                   ),
                             title.t_str(),
                             pos, size,
                             msflags,
@@ -842,10 +846,11 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
 
   MDICREATESTRUCT mcs;
 
-  wxString className =
-      wxApp::GetRegisteredClassName(wxT("wxMDIChildFrame"), COLOR_WINDOW);
-  if ( !(style & wxFULL_REPAINT_ON_RESIZE) )
-      className += wxApp::GetNoRedrawClassSuffix();
+  wxString className = wxApp::GetRegisteredClassName(
+                               wxT("wxMDIChildFrame"), COLOR_WINDOW, 0,
+                               (style & wxFULL_REPAINT_ON_RESIZE) ? wxApp::RegClass_Default
+                                                                  : wxApp::RegClass_ReturnNR
+                              );
 
   mcs.szClass = className.t_str();
   mcs.szTitle = title.t_str();