X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/98018a4b057dda20023a9276681f3d4ed335a6e1..87d34730704b8dc72402ad091251b1178b16ecc7:/include/wx/toplevel.h?ds=inline diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h index c737099e2f..98c2bd6b49 100644 --- a/include/wx/toplevel.h +++ b/include/wx/toplevel.h @@ -18,7 +18,7 @@ // headers // ---------------------------------------------------------------------------- -#include "wx/window.h" +#include "wx/nonownedwnd.h" #include "wx/iconbndl.h" // the default names for various classes @@ -115,7 +115,7 @@ enum // wxTopLevelWindow: a top level (as opposed to child) window // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxTopLevelWindowBase : public wxWindow +class WXDLLEXPORT wxTopLevelWindowBase : public wxNonOwnedWindow { public: // construction @@ -248,8 +248,6 @@ public: // do the window-specific processing after processing the update event virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) ; -protected: - // a different API for SetSizeHints virtual void SetMinSize(const wxSize& minSize); virtual void SetMaxSize(const wxSize& maxSize); @@ -259,6 +257,7 @@ protected: int maxW = wxDefaultCoord, int maxH = wxDefaultCoord, int incW = wxDefaultCoord, int incH = wxDefaultCoord ); +protected: // the frame client to screen translation should take account of the // toolbar which may shift the origin of the client area virtual void DoClientToScreen(int *x, int *y) const;