update after r57026 change to app.cpp

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

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index fb93239f57da8f3fbf13948bf52e55f08fc6c991..48f8daade2f6d71935771a00e7728ac86f47a033 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -183,11 +183,7 @@
 extern wxMenu *wxCurrentPopupMenu;
 #endif
 
 extern wxMenu *wxCurrentPopupMenu;
 #endif
 

-#ifdef __WXWINCE__
-extern       wxChar *wxCanvasClassName;
-#else

 extern const wxChar *wxCanvasClassName;
 extern const wxChar *wxCanvasClassName;

-#endif

 
 // true if we had already created the std colour map, used by
 // wxGetStdColourMap() and wxWindow::OnSysColourChanged()           (FIXME-MT)
 
 // true if we had already created the std colour map, used by
 // wxGetStdColourMap() and wxWindow::OnSysColourChanged()           (FIXME-MT)


@@ -1280,13 +1276,8 @@ bool wxCheckWindowWndProc(WXHWND hWnd,
 // managed in one place and then accessed from here and other places, such as
 // wxApp::RegisterWindowClasses() and wxApp::UnregisterWindowClasses()
 
 // managed in one place and then accessed from here and other places, such as
 // wxApp::RegisterWindowClasses() and wxApp::UnregisterWindowClasses()
 

-#ifdef __WXWINCE__
-    extern       wxChar *wxCanvasClassName;
-    extern       wxChar *wxCanvasClassNameNR;
-#else

     extern const wxChar *wxCanvasClassName;
     extern const wxChar *wxCanvasClassNameNR;
     extern const wxChar *wxCanvasClassName;
     extern const wxChar *wxCanvasClassNameNR;

-#endif

     extern const wxChar *wxMDIFrameClassName;
     extern const wxChar *wxMDIFrameClassNameNoRedraw;
     extern const wxChar *wxMDIChildFrameClassName;
     extern const wxChar *wxMDIFrameClassName;
     extern const wxChar *wxMDIFrameClassNameNoRedraw;
     extern const wxChar *wxMDIChildFrameClassName;