From af5c81b3fa180d3f198475c76d4ff76e9b985e83 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 7 Mar 2006 22:30:01 +0000 Subject: [PATCH] don't compile the code used only in wxUniv build in the other ports (coverity checker CID 5) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37872 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/popupcmn.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp index 914fce2d26..3d9f7b0b8d 100644 --- a/src/common/popupcmn.cpp +++ b/src/common/popupcmn.cpp @@ -462,8 +462,11 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event) wxPoint pos = event.GetPosition(); + // in non-Univ ports the system manages scrollbars for us +#ifdef __WXUNIVERSAL__ // scrollbar on which the click occurred wxWindow *sbar = NULL; +#endif // __WXUNIVERSAL__ wxWindow *win = (wxWindow *)event.GetEventObject(); @@ -504,7 +507,7 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event) case wxHT_WINDOW_VERT_SCROLLBAR: sbar = win->GetScrollbar(wxVERTICAL); break; -#endif +#endif // __WXUNIVERSAL__ default: // forgot to update the switch after adding a new hit test code? @@ -521,6 +524,7 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event) break; } +#ifdef __WXUNIVERSAL__ if ( sbar ) { // translate the event coordinates to the scrollbar ones @@ -533,6 +537,7 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event) (void)sbar->GetEventHandler()->ProcessEvent(event2); } +#endif // __WXUNIVERSAL__ } // ---------------------------------------------------------------------------- -- 2.45.2