some more consts here and there
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -128,18 +128,16 @@ extern wxCursor *g_globalCursor;
|
|||||||
MSG s_currentMsg;
|
MSG s_currentMsg;
|
||||||
wxApp *wxTheApp = NULL;
|
wxApp *wxTheApp = NULL;
|
||||||
|
|
||||||
// FIXME why not const? and not static?
|
|
||||||
|
|
||||||
// NB: all "NoRedraw" classes must have the same names as the "normal" classes
|
// NB: all "NoRedraw" classes must have the same names as the "normal" classes
|
||||||
// with NR suffix - wxWindow::MSWCreate() supposes this
|
// with NR suffix - wxWindow::MSWCreate() supposes this
|
||||||
wxChar wxFrameClassName[] = wxT("wxFrameClass");
|
const wxChar *wxFrameClassName = wxT("wxFrameClass");
|
||||||
wxChar wxFrameClassNameNoRedraw[] = wxT("wxFrameClassNR");
|
const wxChar *wxFrameClassNameNoRedraw = wxT("wxFrameClassNR");
|
||||||
wxChar wxMDIFrameClassName[] = wxT("wxMDIFrameClass");
|
const wxChar *wxMDIFrameClassName = wxT("wxMDIFrameClass");
|
||||||
wxChar wxMDIFrameClassNameNoRedraw[] = wxT("wxMDIFrameClassNR");
|
const wxChar *wxMDIFrameClassNameNoRedraw = wxT("wxMDIFrameClassNR");
|
||||||
wxChar wxMDIChildFrameClassName[] = wxT("wxMDIChildFrameClass");
|
const wxChar *wxMDIChildFrameClassName = wxT("wxMDIChildFrameClass");
|
||||||
wxChar wxMDIChildFrameClassNameNoRedraw[] = wxT("wxMDIChildFrameClassNR");
|
const wxChar *wxMDIChildFrameClassNameNoRedraw = wxT("wxMDIChildFrameClassNR");
|
||||||
wxChar wxPanelClassName[] = wxT("wxPanelClass");
|
const wxChar *wxPanelClassName = wxT("wxPanelClass");
|
||||||
wxChar wxCanvasClassName[] = wxT("wxCanvasClass");
|
const wxChar *wxCanvasClassName = wxT("wxCanvasClass");
|
||||||
|
|
||||||
HICON wxSTD_FRAME_ICON = (HICON) NULL;
|
HICON wxSTD_FRAME_ICON = (HICON) NULL;
|
||||||
HICON wxSTD_MDICHILDFRAME_ICON = (HICON) NULL;
|
HICON wxSTD_MDICHILDFRAME_ICON = (HICON) NULL;
|
||||||
|
@@ -62,7 +62,7 @@
|
|||||||
|
|
||||||
extern wxWindowList wxModelessWindows;
|
extern wxWindowList wxModelessWindows;
|
||||||
extern wxList WXDLLEXPORT wxPendingDelete;
|
extern wxList WXDLLEXPORT wxPendingDelete;
|
||||||
extern wxChar *wxFrameClassName;
|
extern const wxChar *wxFrameClassName;
|
||||||
extern wxMenu *wxCurrentPopupMenu;
|
extern wxMenu *wxCurrentPopupMenu;
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
@@ -63,8 +63,8 @@
|
|||||||
extern wxWindowList wxModelessWindows; // from dialog.cpp
|
extern wxWindowList wxModelessWindows; // from dialog.cpp
|
||||||
extern wxMenu *wxCurrentPopupMenu;
|
extern wxMenu *wxCurrentPopupMenu;
|
||||||
|
|
||||||
extern wxChar *wxMDIFrameClassName;
|
extern const wxChar *wxMDIFrameClassName;
|
||||||
extern wxChar *wxMDIChildFrameClassName;
|
extern const wxChar *wxMDIChildFrameClassName;
|
||||||
extern wxWindow *wxWndHook; // from window.cpp
|
extern wxWindow *wxWndHook; // from window.cpp
|
||||||
|
|
||||||
extern void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win);
|
extern void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win);
|
||||||
|
@@ -119,7 +119,7 @@ extern MSG s_currentMsg;
|
|||||||
|
|
||||||
wxMenu *wxCurrentPopupMenu = NULL;
|
wxMenu *wxCurrentPopupMenu = NULL;
|
||||||
extern wxList WXDLLEXPORT wxPendingDelete;
|
extern wxList WXDLLEXPORT wxPendingDelete;
|
||||||
extern wxChar *wxCanvasClassName;
|
extern const wxChar *wxCanvasClassName;
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
// private functions
|
// private functions
|
||||||
|
Reference in New Issue
Block a user