]> git.saurik.com Git - wxWidgets.git/commitdiff
Also show EVT_TEXT_ENTER in the combo sample
authorJaakko Salli <jaakko.salli@dnainternet.net>
Mon, 18 Apr 2011 09:58:27 +0000 (09:58 +0000)
committerJaakko Salli <jaakko.salli@dnainternet.net>
Mon, 18 Apr 2011 09:58:27 +0000 (09:58 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67529 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

samples/combo/combo.cpp

index 145b15fc0fc37efcc0c1321ea0778b8017c91e17..e31bcee2e02eeaed375208eada88d05265743c8b 100644 (file)
@@ -125,6 +125,7 @@ enum
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_TEXT(wxID_ANY,MyFrame::OnComboBoxUpdate)
+    EVT_TEXT_ENTER(wxID_ANY,MyFrame::OnComboBoxUpdate)
     EVT_COMBOBOX(wxID_ANY,MyFrame::OnComboBoxUpdate)
 
     EVT_MENU(ComboCtrl_Compare,  MyFrame::OnShowComparison)
@@ -376,6 +377,14 @@ public:
     virtual void Init()
     {
     }
+    virtual ~TreeCtrlComboPopup()
+    {
+        if (!m_isBeingDeleted)
+        {
+            wxMessageBox("error wxTreeCtrl::Destroy() was not called");
+        }
+        SendDestroyEvent();
+    }
 
     virtual bool Create( wxWindow* parent )
     {
@@ -938,6 +947,11 @@ void MyFrame::OnComboBoxUpdate( wxCommandEvent& event )
     {
         wxLogDebug(wxT("EVT_TEXT(id=%i,string=\"%s\")"),event.GetId(),event.GetString().c_str());
     }
+    else if ( event.GetEventType() == wxEVT_COMMAND_TEXT_ENTER )
+    {
+        wxLogDebug("EVT_TEXT_ENTER(id=%i,string=\"%s\")",
+                   event.GetId(), event.GetString().c_str());
+    }
 }
 
 void MyFrame::OnShowComparison( wxCommandEvent& WXUNUSED(event) )