update after r57026 change to app.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57027 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
d2fa187325
commit
5dec01d469
@ -183,11 +183,7 @@
|
|||||||
extern wxMenu *wxCurrentPopupMenu;
|
extern wxMenu *wxCurrentPopupMenu;
|
||||||
#endif
|
#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
|
// true if we had already created the std colour map, used by
|
||||||
// wxGetStdColourMap() and wxWindow::OnSysColourChanged() (FIXME-MT)
|
// 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
|
// managed in one place and then accessed from here and other places, such as
|
||||||
// wxApp::RegisterWindowClasses() and wxApp::UnregisterWindowClasses()
|
// wxApp::RegisterWindowClasses() and wxApp::UnregisterWindowClasses()
|
||||||
|
|
||||||
#ifdef __WXWINCE__
|
|
||||||
extern wxChar *wxCanvasClassName;
|
|
||||||
extern wxChar *wxCanvasClassNameNR;
|
|
||||||
#else
|
|
||||||
extern const wxChar *wxCanvasClassName;
|
extern const wxChar *wxCanvasClassName;
|
||||||
extern const wxChar *wxCanvasClassNameNR;
|
extern const wxChar *wxCanvasClassNameNR;
|
||||||
#endif
|
|
||||||
extern const wxChar *wxMDIFrameClassName;
|
extern const wxChar *wxMDIFrameClassName;
|
||||||
extern const wxChar *wxMDIFrameClassNameNoRedraw;
|
extern const wxChar *wxMDIFrameClassNameNoRedraw;
|
||||||
extern const wxChar *wxMDIChildFrameClassName;
|
extern const wxChar *wxMDIChildFrameClassName;
|
||||||
|
Loading…
Reference in New Issue
Block a user