X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0fe0275981e662b56d9df1e5847932326f04cf0b..8482e4bdb9928fe9982ac214aee345b19894b39b:/src/common/wincmn.cpp diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp index 44fdda3991..06e6e6f274 100644 --- a/src/common/wincmn.cpp +++ b/src/common/wincmn.cpp @@ -674,9 +674,9 @@ wxPoint wxWindowBase::GetClientAreaOrigin() const } // set the min/max size of the window -void wxWindowBase::SetSizeHints(int minW, int minH, - int maxW, int maxH, - int WXUNUSED(incW), int WXUNUSED(incH)) +void wxWindowBase::DoSetSizeHints(int minW, int minH, + int maxW, int maxH, + int WXUNUSED(incW), int WXUNUSED(incH)) { // setting min width greater than max width leads to infinite loops under // X11 and generally doesn't make any sense, so don't allow it @@ -2473,7 +2473,7 @@ void wxWindowBase::DoMoveInTabOrder(wxWindow *win, MoveKind move) /*static*/ wxWindow* wxWindowBase::FindFocus() { - wxWindow *win = DoFindFocus(); + wxWindowBase *win = DoFindFocus(); return win ? win->GetMainWindowOfCompositeControl() : NULL; }