X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/049908c57372c671516be6f1a853d35761327e81..558820fd083635d3e1dc026a56b2f14870cb5c38:/include/wx/frame.h?ds=inline diff --git a/include/wx/frame.h b/include/wx/frame.h index 0f65132d71..2889bbecae 100644 --- a/include/wx/frame.h +++ b/include/wx/frame.h @@ -22,10 +22,10 @@ extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[]; extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[]; -class WXDLLEXPORT wxFrame; -class WXDLLEXPORT wxMenuBar; -class WXDLLEXPORT wxStatusBar; -class WXDLLEXPORT wxToolBar; +class WXDLLIMPEXP_FWD_CORE wxFrame; +class WXDLLIMPEXP_FWD_CORE wxMenuBar; +class WXDLLIMPEXP_FWD_CORE wxStatusBar; +class WXDLLIMPEXP_FWD_CORE wxToolBar; // ---------------------------------------------------------------------------- // constants @@ -180,6 +180,11 @@ public: virtual void DoGiveHelp(const wxString& text, bool show); #endif + virtual bool IsClientAreaChild(const wxWindow *child) const + { + return !IsOneOfBars(child) && wxTopLevelWindow::IsClientAreaChild(child); + } + protected: // the frame main menu/status/tool bars // ------------------------------------ @@ -190,10 +195,6 @@ protected: // test whether this window makes part of the frame virtual bool IsOneOfBars(const wxWindow *win) const; - virtual bool IsClientAreaChild(const wxWindow *child) const - { - return !IsOneOfBars(child) && wxTopLevelWindow::IsClientAreaChild(child); - } #if wxUSE_MENUS // override to update menu bar position when the frame size changes