X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6f63ec3f93070e6824da775cf8d2565a025c2406..d42508c2a026d505d39c386b233de4a1b51f1445:/include/wx/stubs/frame.h diff --git a/include/wx/stubs/frame.h b/include/wx/stubs/frame.h index c013362175..540caf249e 100644 --- a/include/wx/stubs/frame.h +++ b/include/wx/stubs/frame.h @@ -18,7 +18,10 @@ #include "wx/window.h" #include "wx/toolbar.h" + +#if wxUSE_ACCEL #include "wx/accel.h" +#endif WXDLLEXPORT_DATA(extern const char*) wxFrameNameStr; WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr; @@ -63,8 +66,6 @@ public: void ClientToScreen(int *x, int *y) const; void ScreenToClient(int *x, int *y) const; - virtual bool OnClose(); - void OnSize(wxSizeEvent& event); void OnMenuHighlight(wxMenuEvent& event); void OnActivate(wxActivateEvent& event); @@ -138,7 +139,7 @@ public: // Query app for menu item updates (called from OnIdle) void DoMenuUpdates(); - void DoMenuUpdates(wxMenu* menu); + void DoMenuUpdates(wxMenu* menu, wxWindow* focusWin); // Checks if there is a toolbar, and returns the first free client position virtual wxPoint GetClientAreaOrigin() const;