Merge branch 'im/gridcombo' of https://github.com/imciner2/wxWidgets

Close the cell editor when the editor's combobox is closed.

See https://github.com/wxWidgets/wxWidgets/pull/1941

include/wx/generic/grid.h

@@ -2827,7 +2827,6 @@ protected:
     void OnKeyDown( wxKeyEvent& );
     void OnKeyUp( wxKeyEvent& );
     void OnChar( wxKeyEvent& );
-    void OnHideEditor( wxCommandEvent& );
 
 
     bool SetCurrentCell( const wxGridCellCoords& coords );

include/wx/generic/grideditors.h

@@ -27,6 +27,8 @@ public:
     {
     }
 
+    void DismissEditor();
+
     void OnKillFocus(wxFocusEvent& event);
     void OnKeyDown(wxKeyEvent& event);
     void OnChar(wxKeyEvent& event);
@@ -335,6 +337,8 @@ public:
 protected:
     wxComboBox *Combo() const { return (wxComboBox *)m_control; }
 
+    void OnComboCloseUp(wxCommandEvent& evt);
+
     wxString        m_value;
     wxArrayString   m_choices;
     bool            m_allowOthers;

include/wx/generic/private/grid.h

@@ -17,10 +17,6 @@
 
 #include "wx/headerctrl.h"
 
-// Internally used (and hence intentionally not exported) event telling wxGrid
-// to hide the currently shown editor.
-wxDECLARE_EVENT( wxEVT_GRID_HIDE_EDITOR, wxCommandEvent );
-
 // ----------------------------------------------------------------------------
 // array classes
 // ----------------------------------------------------------------------------