X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f618020a15f1647a83aaeab1fe315f90497a9876..c7de4135b619a045593a42dcbb1d1e8a7858cdcc:/src/msw/frame.cpp diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp index f6344c7c0c..57c0235fbe 100644 --- a/src/msw/frame.cpp +++ b/src/msw/frame.cpp @@ -63,10 +63,8 @@ // globals // ---------------------------------------------------------------------------- -extern const wxChar *wxFrameClassName; - #if wxUSE_MENUS_NATIVE -extern wxMenu *wxCurrentPopupMenu; + extern wxMenu *wxCurrentPopupMenu; #endif // wxUSE_MENUS_NATIVE // ---------------------------------------------------------------------------- @@ -495,6 +493,8 @@ void wxFrame::PositionToolBar() else { tw = width; + if ( toolbar->GetWindowStyleFlag() & wxTB_FLAT ) + th -= 3; } // use the 'real' MSW position here, don't offset relativly to the @@ -692,9 +692,7 @@ bool wxFrame::HandleSize(int x, int y, WXUINT id) PositionToolBar(); #endif // wxUSE_TOOLBAR - wxSizeEvent event(wxSize(x, y), m_windowId); - event.SetEventObject( this ); - processed = GetEventHandler()->ProcessEvent(event); + processed = wxWindow::HandleSize(x, y, id); } return processed;