Don't fail to register remaining window classes if

one fails to register
Set window proc for non-control windows

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16284 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 5d3f40025729bfb9229e114a41638ac553922197..796ee13256bb08e52c39e4fb783134af53878080 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -338,8 +338,6 @@ bool wxApp::RegisterWindowClasses()
     if ( !RegisterClass(&wndclass) )
     {
         wxLogLastError(wxT("RegisterClass(frame)"));
-
-        return FALSE;
     }
 
     // "no redraw" frame
@@ -349,8 +347,6 @@ bool wxApp::RegisterWindowClasses()
     if ( !RegisterClass(&wndclass) )
     {
         wxLogLastError(wxT("RegisterClass(no redraw frame)"));
-
-        return FALSE;
     }
 
     // Register the MDI frame window class.
@@ -361,8 +357,6 @@ bool wxApp::RegisterWindowClasses()
     if ( !RegisterClass(&wndclass) )
     {
         wxLogLastError(wxT("RegisterClass(MDI parent)"));
-
-        return FALSE;
     }
 
     // "no redraw" MDI frame
@@ -372,8 +366,6 @@ bool wxApp::RegisterWindowClasses()
     if ( !RegisterClass(&wndclass) )
     {
         wxLogLastError(wxT("RegisterClass(no redraw MDI parent frame)"));
-
-        return FALSE;
     }
 
     // Register the MDI child frame window class.
@@ -384,8 +376,6 @@ bool wxApp::RegisterWindowClasses()
     if ( !RegisterClass(&wndclass) )
     {
         wxLogLastError(wxT("RegisterClass(MDI child)"));
-
-        return FALSE;
     }
 
     // "no redraw" MDI child frame
@@ -395,8 +385,6 @@ bool wxApp::RegisterWindowClasses()
     if ( !RegisterClass(&wndclass) )
     {
         wxLogLastError(wxT("RegisterClass(no redraw MDI child)"));
-
-        return FALSE;
     }
 
     return TRUE;

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index aba22e63b46627fc493a296c56c85440146ee13b..fcd633be7d436a46c97b496555f9cdd7d53dd500 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -430,7 +430,10 @@ bool wxWindowMSW::Create(wxWindow *parent,
         msflags |= WS_VISIBLE;
     }
 
-    return MSWCreate(wxCanvasClassName, NULL, pos, size, msflags, exstyle);
+    bool retValue = MSWCreate(wxCanvasClassName, NULL, pos, size, msflags, exstyle);
+    if (retVal)
+        SetWindowLong( (HWND)m_hWnd, GWL_WNDPROC, (LONG)wxWndProc);
+    return retVal;
 }
 
 // ---------------------------------------------------------------------------