Derive wxGridWindow from wxWindow instead of wxPanel so thw SetFocus

in HideCellEditControl() will actually set the focus to the grid
window instead of back to the cell editor which was just hidden.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2002-02-05 20:38:25 +00:00
parent 8a77c0d769
commit 59ddac0109

View File

@@ -185,7 +185,7 @@ private:
DECLARE_EVENT_TABLE()
};
class WXDLLEXPORT wxGridWindow : public wxPanel
class WXDLLEXPORT wxGridWindow : public wxWindow
{
public:
wxGridWindow()
@@ -3486,9 +3486,9 @@ void wxGridCornerLabelWindow::OnKeyUp( wxKeyEvent& event )
//////////////////////////////////////////////////////////////////////
IMPLEMENT_DYNAMIC_CLASS( wxGridWindow, wxPanel )
IMPLEMENT_DYNAMIC_CLASS( wxGridWindow, wxWindow )
BEGIN_EVENT_TABLE( wxGridWindow, wxPanel )
BEGIN_EVENT_TABLE( wxGridWindow, wxWindow )
EVT_PAINT( wxGridWindow::OnPaint )
EVT_MOUSEWHEEL( wxGridWindow::OnMouseWheel)
EVT_MOUSE_EVENTS( wxGridWindow::OnMouseEvent )
@@ -3501,7 +3501,7 @@ wxGridWindow::wxGridWindow( wxGrid *parent,
wxGridRowLabelWindow *rowLblWin,
wxGridColLabelWindow *colLblWin,
wxWindowID id, const wxPoint &pos, const wxSize &size )
: wxPanel( parent, id, pos, size, wxWANTS_CHARS, "grid window" )
: wxWindow( parent, id, pos, size, wxWANTS_CHARS, "grid window" )
{
m_owner = parent;
m_rowLabelWin = rowLblWin;
@@ -3532,7 +3532,7 @@ void wxGridWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
void wxGridWindow::ScrollWindow( int dx, int dy, const wxRect *rect )
{
wxPanel::ScrollWindow( dx, dy, rect );
wxWindow::ScrollWindow( dx, dy, rect );
m_rowLabelWin->ScrollWindow( 0, dy, rect );
m_colLabelWin->ScrollWindow( dx, 0, rect );
}