From 2ffa221c5897a4881377fd35181a5ea18c4dc04b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 16 Dec 1999 22:10:32 +0000 Subject: [PATCH] some more consts here and there git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/app.cpp | 18 ++++++++---------- src/msw/frame.cpp | 2 +- src/msw/mdi.cpp | 4 ++-- src/msw/window.cpp | 2 +- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/msw/app.cpp b/src/msw/app.cpp index c83a623b80..81c4be228d 100644 --- a/src/msw/app.cpp +++ b/src/msw/app.cpp @@ -128,18 +128,16 @@ extern wxCursor *g_globalCursor; MSG s_currentMsg; wxApp *wxTheApp = NULL; -// FIXME why not const? and not static? - // NB: all "NoRedraw" classes must have the same names as the "normal" classes // with NR suffix - wxWindow::MSWCreate() supposes this -wxChar wxFrameClassName[] = wxT("wxFrameClass"); -wxChar wxFrameClassNameNoRedraw[] = wxT("wxFrameClassNR"); -wxChar wxMDIFrameClassName[] = wxT("wxMDIFrameClass"); -wxChar wxMDIFrameClassNameNoRedraw[] = wxT("wxMDIFrameClassNR"); -wxChar wxMDIChildFrameClassName[] = wxT("wxMDIChildFrameClass"); -wxChar wxMDIChildFrameClassNameNoRedraw[] = wxT("wxMDIChildFrameClassNR"); -wxChar wxPanelClassName[] = wxT("wxPanelClass"); -wxChar wxCanvasClassName[] = wxT("wxCanvasClass"); +const wxChar *wxFrameClassName = wxT("wxFrameClass"); +const wxChar *wxFrameClassNameNoRedraw = wxT("wxFrameClassNR"); +const wxChar *wxMDIFrameClassName = wxT("wxMDIFrameClass"); +const wxChar *wxMDIFrameClassNameNoRedraw = wxT("wxMDIFrameClassNR"); +const wxChar *wxMDIChildFrameClassName = wxT("wxMDIChildFrameClass"); +const wxChar *wxMDIChildFrameClassNameNoRedraw = wxT("wxMDIChildFrameClassNR"); +const wxChar *wxPanelClassName = wxT("wxPanelClass"); +const wxChar *wxCanvasClassName = wxT("wxCanvasClass"); HICON wxSTD_FRAME_ICON = (HICON) NULL; HICON wxSTD_MDICHILDFRAME_ICON = (HICON) NULL; diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp index e338b71c0a..704d53784a 100644 --- a/src/msw/frame.cpp +++ b/src/msw/frame.cpp @@ -62,7 +62,7 @@ extern wxWindowList wxModelessWindows; extern wxList WXDLLEXPORT wxPendingDelete; -extern wxChar *wxFrameClassName; +extern const wxChar *wxFrameClassName; extern wxMenu *wxCurrentPopupMenu; // ---------------------------------------------------------------------------- diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp index 99439c6fe4..342366110f 100644 --- a/src/msw/mdi.cpp +++ b/src/msw/mdi.cpp @@ -63,8 +63,8 @@ extern wxWindowList wxModelessWindows; // from dialog.cpp extern wxMenu *wxCurrentPopupMenu; -extern wxChar *wxMDIFrameClassName; -extern wxChar *wxMDIChildFrameClassName; +extern const wxChar *wxMDIFrameClassName; +extern const wxChar *wxMDIChildFrameClassName; extern wxWindow *wxWndHook; // from window.cpp extern void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win); diff --git a/src/msw/window.cpp b/src/msw/window.cpp index a19fa57c7f..96ab891d7b 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -119,7 +119,7 @@ extern MSG s_currentMsg; wxMenu *wxCurrentPopupMenu = NULL; extern wxList WXDLLEXPORT wxPendingDelete; -extern wxChar *wxCanvasClassName; +extern const wxChar *wxCanvasClassName; // --------------------------------------------------------------------------- // private functions -- 2.45.2