X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c51c4752023d10f398e5480bf3e22e32ba68edac..0c8b041f147ff9bb6ce38f0e2da1fd82f6484523:/src/common/popupcmn.cpp?ds=sidebyside diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp index 79b3bbf23b..47099f03ba 100644 --- a/src/common/popupcmn.cpp +++ b/src/common/popupcmn.cpp @@ -201,7 +201,6 @@ void wxPopupTransientWindow::PopHandlers() m_handlerPopup = NULL; } - // m_child->ReleaseMouse(); m_child = NULL; } @@ -248,7 +247,6 @@ void wxPopupTransientWindow::Popup(wxWindow *winFocus) delete m_handlerPopup; m_handlerPopup = new wxPopupWindowHandler(this); - // m_child->CaptureMouse(); m_child->PushEventHandler(m_handlerPopup); m_focus = winFocus ? winFocus : this; @@ -282,7 +280,7 @@ bool wxPopupTransientWindow::Show( bool show ) if (!show) { gdk_pointer_ungrab( (guint32)GDK_CURRENT_TIME ); - + gtk_grab_remove( m_widget ); } #endif @@ -295,12 +293,12 @@ bool wxPopupTransientWindow::Show( bool show ) #endif bool ret = wxPopupWindow::Show( show ); - + #ifdef __WXGTK__ if (show) { gtk_grab_add( m_widget ); - + gdk_pointer_grab( m_widget->window, TRUE, (GdkEventMask) (GDK_BUTTON_PRESS_MASK | @@ -317,7 +315,7 @@ bool wxPopupTransientWindow::Show( bool show ) if (show) { Window xwindow = (Window) m_clientWindow; - + /* int res =*/ XGrabPointer(wxGlobalDisplay(), xwindow, True, ButtonPressMask | ButtonReleaseMask | ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, @@ -382,7 +380,7 @@ bool wxPopupComboWindow::Create(wxComboControl *parent) void wxPopupComboWindow::PositionNearCombo() { // the origin point must be in screen coords - wxPoint ptOrigin = m_combo->ClientToScreen(wxPoint(0, 0)); + wxPoint ptOrigin = m_combo->ClientToScreen(wxPoint(0,0)); #if 0 //def __WXUNIVERSAL__ // account for the fact that (0, 0) is not the top left corner of the