X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/721b32e05823b7b7356f9a7a99f7d0af457dc5f3..d9e89b159c80a704020efc7376b909893445f5e7:/include/wx/msw/frame.h diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h index a0e3ae67fc..ff90eba4ce 100644 --- a/include/wx/msw/frame.h +++ b/include/wx/msw/frame.h @@ -20,9 +20,9 @@ #include "wx/toolbar.h" #include "wx/msw/accel.h" -WXDLLEXPORT_DATA(extern const char*) wxFrameNameStr; -WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr; -WXDLLEXPORT_DATA(extern const char*) wxStatusLineNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr; class WXDLLEXPORT wxMenuBar; class WXDLLEXPORT wxStatusBar; @@ -153,7 +153,7 @@ public: // Query app for menu item updates (called from OnIdle) void DoMenuUpdates(); - void DoMenuUpdates(wxMenu* menu); + void DoMenuUpdates(wxMenu* menu, wxWindow* focusWin); WXHMENU GetWinMenu() const ;