Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

For clarity: wxComboPopupExtraEventHandler -> wxComboPopupEvtHandler (there is nothing particularly extra about it)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64456 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2010-06-01 14:17:32 +00:00
parent 4794626d03
commit 063155781d
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/combo.h
View File

@@ -583,7 +583,7 @@ protected:
wxEvtHandler* m_toplevEvtHandler; wxEvtHandler* m_toplevEvtHandler;
// this is for the control in popup // this is for the control in popup
wxEvtHandler* m_popupExtraHandler; wxEvtHandler* m_popupEvtHandler;
// this is for the popup window // this is for the popup window
wxEvtHandler* m_popupWinEvtHandler; wxEvtHandler* m_popupWinEvtHandler;

28
src/common/combocmn.cpp
View File

@@ -661,11 +661,11 @@ void wxComboBoxExtraInputHandler::OnFocus(wxFocusEvent& event)
// This is pushed to the event handler queue of the control in popup. // This is pushed to the event handler queue of the control in popup.
// //
class wxComboPopupExtraEventHandler : public wxEvtHandler class wxComboPopupEvtHandler : public wxEvtHandler
{ {
public: public:
wxComboPopupExtraEventHandler( wxComboCtrlBase* combo ) wxComboPopupEvtHandler( wxComboCtrlBase* combo )
: wxEvtHandler() : wxEvtHandler()
{ {
m_combo = combo; m_combo = combo;
@@ -675,7 +675,7 @@ public:
// events until mouse left button has been up. // events until mouse left button has been up.
m_blockEventsToPopup = true; m_blockEventsToPopup = true;
} }
virtual ~wxComboPopupExtraEventHandler() { } virtual ~wxComboPopupEvtHandler() { }
void OnMouseEvent( wxMouseEvent& event ); void OnMouseEvent( wxMouseEvent& event );
@@ -697,12 +697,12 @@ private:
}; };
BEGIN_EVENT_TABLE(wxComboPopupExtraEventHandler, wxEvtHandler) BEGIN_EVENT_TABLE(wxComboPopupEvtHandler, wxEvtHandler)
EVT_MOUSE_EVENTS(wxComboPopupExtraEventHandler::OnMouseEvent) EVT_MOUSE_EVENTS(wxComboPopupEvtHandler::OnMouseEvent)
END_EVENT_TABLE() END_EVENT_TABLE()
void wxComboPopupExtraEventHandler::OnMouseEvent( wxMouseEvent& event ) void wxComboPopupEvtHandler::OnMouseEvent( wxMouseEvent& event )
{ {
wxPoint pt = event.GetPosition(); wxPoint pt = event.GetPosition();
wxSize sz = m_combo->GetPopupControl()->GetControl()->GetClientSize(); wxSize sz = m_combo->GetPopupControl()->GetControl()->GetClientSize();
@@ -849,7 +849,7 @@ void wxComboCtrlBase::Init()
m_text = NULL; m_text = NULL;
m_popupInterface = NULL; m_popupInterface = NULL;
m_popupExtraHandler = NULL; m_popupEvtHandler = NULL;
m_textEvtHandler = NULL; m_textEvtHandler = NULL;
#if INSTALL_TOPLEV_HANDLER #if INSTALL_TOPLEV_HANDLER
@@ -1986,8 +1986,8 @@ void wxComboCtrlBase::CreatePopup()
popupInterface->Create(m_winPopup); popupInterface->Create(m_winPopup);
m_popup = popup = popupInterface->GetControl(); m_popup = popup = popupInterface->GetControl();
m_popupExtraHandler = new wxComboPopupExtraEventHandler(this); m_popupEvtHandler = new wxComboPopupEvtHandler(this);
popup->PushEventHandler( m_popupExtraHandler ); popup->PushEventHandler( m_popupEvtHandler );
// This may be helpful on some platforms // This may be helpful on some platforms
// (eg. it bypasses a wxGTK popupwindow bug where // (eg. it bypasses a wxGTK popupwindow bug where
@@ -2003,9 +2003,9 @@ void wxComboCtrlBase::DestroyPopup()
HidePopup(true); HidePopup(true);
if ( m_popup ) if ( m_popup )
m_popup->RemoveEventHandler(m_popupExtraHandler); m_popup->RemoveEventHandler(m_popupEvtHandler);
delete m_popupExtraHandler; delete m_popupEvtHandler;
delete m_popupInterface; delete m_popupInterface;
@@ -2017,7 +2017,7 @@ void wxComboCtrlBase::DestroyPopup()
m_winPopup->Destroy(); m_winPopup->Destroy();
} }
m_popupExtraHandler = NULL; m_popupEvtHandler = NULL;
m_popupInterface = NULL; m_popupInterface = NULL;
m_winPopup = NULL; m_winPopup = NULL;
m_popup = NULL; m_popup = NULL;
@@ -2309,8 +2309,8 @@ void wxComboCtrlBase::OnPopupDismiss(bool generateEvent)
// Inform popup control itself // Inform popup control itself
m_popupInterface->OnDismiss(); m_popupInterface->OnDismiss();
if ( m_popupExtraHandler ) if ( m_popupEvtHandler )
((wxComboPopupExtraEventHandler*)m_popupExtraHandler)->OnPopupDismiss(); ((wxComboPopupEvtHandler*)m_popupEvtHandler)->OnPopupDismiss();
#if INSTALL_TOPLEV_HANDLER #if INSTALL_TOPLEV_HANDLER
// Remove top level window event handler // Remove top level window event handler