Have wxComboCtrl generate wxEVT_COMMAND_COMBOBOX_DROPDOWN and wxEVT_COMMAND_COMBOBOX_...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62136 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/combo.h b/include/wx/combo.h
index 1093a26f5d8c7654fb6a7c37e3b538ad44af1a5b..c3699fae7c1bad0157f4e1fcf40d9e29481f961f 100644 (file)
--- a/include/wx/combo.h
+++ b/include/wx/combo.h
@@ -158,7 +158,7 @@ public:
 
     // show/hide popup window
     virtual void ShowPopup();
 
     // show/hide popup window
     virtual void ShowPopup();

-    virtual void HidePopup();
+    virtual void HidePopup(bool generateEvent=false);

 
     // Override for totally custom combo action
     virtual void OnButtonClick();
 
     // Override for totally custom combo action
     virtual void OnButtonClick();


@@ -403,7 +403,7 @@ public:
     bool IsCreated() const { return m_iFlags & wxCC_IFLAG_CREATED ? true : false; }
 
     // common code to be called on popup hide/dismiss
     bool IsCreated() const { return m_iFlags & wxCC_IFLAG_CREATED ? true : false; }
 
     // common code to be called on popup hide/dismiss

-    void OnPopupDismiss();
+    void OnPopupDismiss(bool generateEvent);

 
     // PopupShown states
     enum
 
     // PopupShown states
     enum

diff --git a/interface/wx/combo.h b/interface/wx/combo.h
index 12a4192eedc6324e20224b98dadc77c957e84ab8..38ef1f93425111630291330c3474968993ac610d 100644 (file)
--- a/interface/wx/combo.h
+++ b/interface/wx/combo.h
@@ -304,6 +304,12 @@ struct wxComboCtrlFeatures
     @event{EVT_TEXT_ENTER(id, func)}
            Process a wxEVT_COMMAND_TEXT_ENTER event, when RETURN is pressed in
            the combo control.
     @event{EVT_TEXT_ENTER(id, func)}
            Process a wxEVT_COMMAND_TEXT_ENTER event, when RETURN is pressed in
            the combo control.

+    @event{EVT_COMBOX_DROPDOWN(id, func)}
+           Process a wxEVT_COMMAND_COMBOBOX_DROPDOWN event, which is generated
+           when the popup window is shown (drops down).
+    @event{EVT_COMBOX_CLOSEUP(id, func)}
+           Process a wxEVT_COMMAND_COMBOBOX_CLOSEUP event, which is generated
+           when the popup window of the combo control disappears (closes up).

     @endEventTable
 
     @library{wxbase}
     @endEventTable
 
     @library{wxbase}


@@ -504,8 +510,12 @@ public:
 
     /**
         Dismisses the popup window.
 
     /**
         Dismisses the popup window.

+
+        @param generateEvent
+            Set this to @true in order to generate
+            wxEVT_COMMAND_COMBOBOX_CLOSEUP event.

     */
     */

-    virtual void HidePopup();
+    virtual void HidePopup(bool generateEvent=false);

 
     /**
         Returns @true if the popup is currently shown
 
     /**
         Returns @true if the popup is currently shown

diff --git a/samples/widgets/odcombobox.cpp b/samples/widgets/odcombobox.cpp
index ae95eab5ac76fdae9a30929d6fb244cca152cb75..1e95683e3b216113ae1afb3b73946b75fa30be9e 100644 (file)
--- a/samples/widgets/odcombobox.cpp
+++ b/samples/widgets/odcombobox.cpp
@@ -113,6 +113,8 @@ protected:
     void OnButtonAddMany(wxCommandEvent& event);
 
     void OnComboBox(wxCommandEvent& event);
     void OnButtonAddMany(wxCommandEvent& event);
 
     void OnComboBox(wxCommandEvent& event);

+    void OnDropDown(wxCommandEvent& event);
+    void OnCloseUp(wxCommandEvent& event);

     void OnComboText(wxCommandEvent& event);
 
     void OnCheckOrRadioBox(wxCommandEvent& event);
     void OnComboText(wxCommandEvent& event);
 
     void OnCheckOrRadioBox(wxCommandEvent& event);


@@ -218,6 +220,8 @@ BEGIN_EVENT_TABLE(ODComboboxWidgetsPage, WidgetsPage)
     EVT_UPDATE_UI(ODComboPage_ChangeText, ODComboboxWidgetsPage::OnUpdateUIDeleteSelButton)
     EVT_UPDATE_UI(ODComboPage_DeleteSel, ODComboboxWidgetsPage::OnUpdateUIDeleteSelButton)
 
     EVT_UPDATE_UI(ODComboPage_ChangeText, ODComboboxWidgetsPage::OnUpdateUIDeleteSelButton)
     EVT_UPDATE_UI(ODComboPage_DeleteSel, ODComboboxWidgetsPage::OnUpdateUIDeleteSelButton)
 

+    EVT_COMBOBOX_DROPDOWN(ODComboPage_Combo, ODComboboxWidgetsPage::OnDropDown)
+    EVT_COMBOBOX_CLOSEUP(ODComboPage_Combo, ODComboboxWidgetsPage::OnCloseUp)

     EVT_COMBOBOX(ODComboPage_Combo, ODComboboxWidgetsPage::OnComboBox)
     EVT_TEXT(ODComboPage_Combo, ODComboboxWidgetsPage::OnComboText)
     EVT_TEXT_ENTER(ODComboPage_Combo, ODComboboxWidgetsPage::OnComboText)
     EVT_COMBOBOX(ODComboPage_Combo, ODComboboxWidgetsPage::OnComboBox)
     EVT_TEXT(ODComboPage_Combo, ODComboboxWidgetsPage::OnComboText)
     EVT_TEXT_ENTER(ODComboPage_Combo, ODComboboxWidgetsPage::OnComboText)


@@ -844,4 +848,14 @@ wxBitmap ODComboboxWidgetsPage::CreateBitmap(const wxColour& colour)
     return bmp;
 }
 
     return bmp;
 }
 

+void ODComboboxWidgetsPage::OnDropDown(wxCommandEvent& WXUNUSED(event))
+{
+    wxLogMessage(wxT("Combobox dropped down"));
+}
+
+void ODComboboxWidgetsPage::OnCloseUp(wxCommandEvent& WXUNUSED(event))
+{
+    wxLogMessage(wxT("Combobox closed up"));
+}
+

 #endif //wxUSE_ODCOMBOBOX
 #endif //wxUSE_ODCOMBOBOX

diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index 65066b56c7a7b3b48223d2dbc4b2ece4c4b64bf0..c3a2334c47328083ef5da8000f19a4520c6b674d 100644 (file)
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -291,7 +291,7 @@ void wxComboFrameEventHandler::OnIdle( wxIdleEvent& event )
          winFocused != m_combo->GetButton() // GTK (atleast) requires this
         )
     {
          winFocused != m_combo->GetButton() // GTK (atleast) requires this
         )
     {

-        m_combo->HidePopup();
+        m_combo->HidePopup(true);

     }
 
     event.Skip();
     }
 
     event.Skip();


@@ -299,37 +299,37 @@ void wxComboFrameEventHandler::OnIdle( wxIdleEvent& event )
 
 void wxComboFrameEventHandler::OnMenuEvent( wxMenuEvent& event )
 {
 
 void wxComboFrameEventHandler::OnMenuEvent( wxMenuEvent& event )
 {

-    m_combo->HidePopup();
+    m_combo->HidePopup(true);

     event.Skip();
 }
 
 void wxComboFrameEventHandler::OnMouseEvent( wxMouseEvent& event )
 {
     event.Skip();
 }
 
 void wxComboFrameEventHandler::OnMouseEvent( wxMouseEvent& event )
 {

-    m_combo->HidePopup();
+    m_combo->HidePopup(true);

     event.Skip();
 }
 
 void wxComboFrameEventHandler::OnClose( wxCloseEvent& event )
 {
     event.Skip();
 }
 
 void wxComboFrameEventHandler::OnClose( wxCloseEvent& event )
 {

-    m_combo->HidePopup();
+    m_combo->HidePopup(true);

     event.Skip();
 }
 
 void wxComboFrameEventHandler::OnActivate( wxActivateEvent& event )
 {
     event.Skip();
 }
 
 void wxComboFrameEventHandler::OnActivate( wxActivateEvent& event )
 {

-    m_combo->HidePopup();
+    m_combo->HidePopup(true);

     event.Skip();
 }
 
 void wxComboFrameEventHandler::OnResize( wxSizeEvent& event )
 {
     event.Skip();
 }
 
 void wxComboFrameEventHandler::OnResize( wxSizeEvent& event )
 {

-    m_combo->HidePopup();
+    m_combo->HidePopup(true);

     event.Skip();
 }
 
 void wxComboFrameEventHandler::OnMove( wxMoveEvent& event )
 {
     event.Skip();
 }
 
 void wxComboFrameEventHandler::OnMove( wxMoveEvent& event )
 {

-    m_combo->HidePopup();
+    m_combo->HidePopup(true);

     event.Skip();
 }
 
     event.Skip();
 }
 


@@ -413,7 +413,7 @@ void wxComboPopupWindow::OnDismiss()
     wxASSERT_MSG( combo->IsKindOf(CLASSINFO(wxComboCtrlBase)),
                   wxT("parent might not be wxComboCtrl, but check IMPLEMENT_DYNAMIC_CLASS(2) macro for correctness") );
 
     wxASSERT_MSG( combo->IsKindOf(CLASSINFO(wxComboCtrlBase)),
                   wxT("parent might not be wxComboCtrl, but check IMPLEMENT_DYNAMIC_CLASS(2) macro for correctness") );
 

-    combo->OnPopupDismiss();
+    combo->OnPopupDismiss(true);

 }
 #endif // USES_WXPOPUPTRANSIENTWINDOW
 
 }
 #endif // USES_WXPOPUPTRANSIENTWINDOW
 


@@ -476,7 +476,7 @@ void wxComboPopupWindowEvtHandler::OnActivate( wxActivateEvent& event )
     if ( !event.GetActive() )
     {
         // Tell combo control that we are dismissed.
     if ( !event.GetActive() )
     {
         // Tell combo control that we are dismissed.

-        m_combo->HidePopup();
+        m_combo->HidePopup(true);

 
         event.Skip();
     }
 
         event.Skip();
     }


@@ -551,7 +551,7 @@ bool wxComboPopup::LazyCreate()
 
 void wxComboPopup::Dismiss()
 {
 
 void wxComboPopup::Dismiss()
 {

-    m_combo->HidePopup();
+    m_combo->HidePopup(true);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -1624,7 +1624,7 @@ bool wxComboCtrlBase::PreprocessMouseEvent( wxMouseEvent& event,
         if ( IsPopupWindowState(Visible) &&
              ( evtType == wxEVT_LEFT_DOWN || evtType == wxEVT_RIGHT_DOWN ) )
         {
         if ( IsPopupWindowState(Visible) &&
              ( evtType == wxEVT_LEFT_DOWN || evtType == wxEVT_RIGHT_DOWN ) )
         {

-            HidePopup();
+            HidePopup(true);

             return true;
         }
     }
             return true;
         }
     }


@@ -1652,7 +1652,7 @@ void wxComboCtrlBase::HandleNormalMouseEvent( wxMouseEvent& event )
     #if USES_WXPOPUPWINDOW
             // Click here always hides the popup.
             if ( m_popupWinType == POPUPWIN_WXPOPUPWINDOW )
     #if USES_WXPOPUPWINDOW
             // Click here always hides the popup.
             if ( m_popupWinType == POPUPWIN_WXPOPUPWINDOW )

-                HidePopup();
+                HidePopup(true);

     #endif
         }
         else
     #endif
         }
         else


@@ -1808,7 +1808,7 @@ void wxComboCtrlBase::CreatePopup()
 // Destroy popup window and the child control
 void wxComboCtrlBase::DestroyPopup()
 {
 // Destroy popup window and the child control
 void wxComboCtrlBase::DestroyPopup()
 {

-    HidePopup();
+    HidePopup(true);

 
     if ( m_popup )
         m_popup->RemoveEventHandler(m_popupExtraHandler);
 
     if ( m_popup )
         m_popup->RemoveEventHandler(m_popupExtraHandler);


@@ -1871,9 +1871,17 @@ void wxComboCtrlBase::OnButtonClick()
     // Derived classes can override this method for totally custom
     // popup action
     if ( !IsPopupWindowState(Visible) )
     // Derived classes can override this method for totally custom
     // popup action
     if ( !IsPopupWindowState(Visible) )

+    {
+        wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_DROPDOWN, GetId());
+        event.SetEventObject(this);
+        ProcessCommand(event);
+

         ShowPopup();
         ShowPopup();

+    }

     else
     else

-        HidePopup();
+    {
+        HidePopup(true);
+    }

 }
 
 void wxComboCtrlBase::ShowPopup()
 }
 
 void wxComboCtrlBase::ShowPopup()


@@ -2092,7 +2100,7 @@ void wxComboCtrlBase::DoShowPopup( const wxRect& rect, int WXUNUSED(flags) )
     Refresh();
 }
 
     Refresh();
 }
 

-void wxComboCtrlBase::OnPopupDismiss()
+void wxComboCtrlBase::OnPopupDismiss(bool generateEvent)

 {
     // Just in case, avoid double dismiss
     if ( IsPopupWindowState(Hidden) )
 {
     // Just in case, avoid double dismiss
     if ( IsPopupWindowState(Hidden) )


@@ -2144,9 +2152,16 @@ void wxComboCtrlBase::OnPopupDismiss()
     Refresh();
 
     SetFocus();
     Refresh();
 
     SetFocus();

+
+    if ( generateEvent )
+    {
+        wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_CLOSEUP, GetId());
+        event.SetEventObject(this);
+        ProcessCommand(event);
+    }

 }
 
 }
 

-void wxComboCtrlBase::HidePopup()
+void wxComboCtrlBase::HidePopup(bool generateEvent)

 {
     // Should be able to call this without popup interface
     if ( IsPopupWindowState(Hidden) )
 {
     // Should be able to call this without popup interface
     if ( IsPopupWindowState(Hidden) )


@@ -2158,7 +2173,7 @@ void wxComboCtrlBase::HidePopup()
 
     m_winPopup->Hide();
 
 
     m_winPopup->Hide();
 

-    OnPopupDismiss();
+    OnPopupDismiss(generateEvent);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------