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

Added wxWANTS_CHARS style to all windows so that the grid reacts to

Browse Source 
cursor keys when it is on a panel.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Bedward
2000-02-29 01:37:37 +00:00
parent cab472ecf9
commit ebd773c6f8
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/generic/grid.h
View File

@@ -86,7 +86,7 @@ class WXDLLEXPORT wxSpinCtrl;
// in the grid. You may pass it to the wxGridCellAttr (below) to change the // in the grid. You may pass it to the wxGridCellAttr (below) to change the
// format of one given cell or to wxGrid::SetDefaultRenderer() to change the // format of one given cell or to wxGrid::SetDefaultRenderer() to change the
// view of all cells. This is an ABC, you will normally use one of the // view of all cells. This is an ABC, you will normally use one of the
// predefined derived classes or derive oyur own class from it. // predefined derived classes or derive your own class from it.
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class WXDLLEXPORT wxGridCellRenderer class WXDLLEXPORT wxGridCellRenderer
@@ -862,7 +862,7 @@ public:
wxWindowID id, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = wxWANTS_CHARS,
const wxString& name = wxPanelNameStr ); const wxString& name = wxPanelNameStr );
~wxGrid(); ~wxGrid();
@@ -1250,9 +1250,10 @@ public:
wxGrid( wxWindow *parent, wxGrid( wxWindow *parent,
int x, int y, int w = -1, int h = -1, int x, int y, int w = -1, int h = -1,
long style = 0, long style = wxWANTS_CHARS,
const wxString& name = wxPanelNameStr ) const wxString& name = wxPanelNameStr )
: wxScrolledWindow( parent, -1, wxPoint(x,y), wxSize(w,h), style, name ) : wxScrolledWindow( parent, -1, wxPoint(x,y), wxSize(w,h),
(style|wxWANTS_CHARS), name )
{ {
Create(); Create();
} }

10
src/generic/grid.cpp
View File

@@ -2512,7 +2512,7 @@ END_EVENT_TABLE()
wxGridRowLabelWindow::wxGridRowLabelWindow( wxGrid *parent, wxGridRowLabelWindow::wxGridRowLabelWindow( wxGrid *parent,
wxWindowID id, wxWindowID id,
const wxPoint &pos, const wxSize &size ) const wxPoint &pos, const wxSize &size )
: wxWindow( parent, id, pos, size ) : wxWindow( parent, id, pos, size, wxWANTS_CHARS )
{ {
m_owner = parent; m_owner = parent;
} }
@@ -2565,7 +2565,7 @@ END_EVENT_TABLE()
wxGridColLabelWindow::wxGridColLabelWindow( wxGrid *parent, wxGridColLabelWindow::wxGridColLabelWindow( wxGrid *parent,
wxWindowID id, wxWindowID id,
const wxPoint &pos, const wxSize &size ) const wxPoint &pos, const wxSize &size )
: wxWindow( parent, id, pos, size ) : wxWindow( parent, id, pos, size, wxWANTS_CHARS )
{ {
m_owner = parent; m_owner = parent;
} }
@@ -2618,7 +2618,7 @@ END_EVENT_TABLE()
wxGridCornerLabelWindow::wxGridCornerLabelWindow( wxGrid *parent, wxGridCornerLabelWindow::wxGridCornerLabelWindow( wxGrid *parent,
wxWindowID id, wxWindowID id,
const wxPoint &pos, const wxSize &size ) const wxPoint &pos, const wxSize &size )
: wxWindow( parent, id, pos, size ) : wxWindow( parent, id, pos, size, wxWANTS_CHARS )
{ {
m_owner = parent; m_owner = parent;
} }
@@ -2672,7 +2672,7 @@ wxGridWindow::wxGridWindow( wxGrid *parent,
wxGridRowLabelWindow *rowLblWin, wxGridRowLabelWindow *rowLblWin,
wxGridColLabelWindow *colLblWin, wxGridColLabelWindow *colLblWin,
wxWindowID id, const wxPoint &pos, const wxSize &size ) wxWindowID id, const wxPoint &pos, const wxSize &size )
: wxPanel( parent, id, pos, size, 0, "grid window" ) : wxPanel( parent, id, pos, size, wxWANTS_CHARS, "grid window" )
{ {
m_owner = parent; m_owner = parent;
m_rowLabelWin = rowLblWin; m_rowLabelWin = rowLblWin;
@@ -2747,7 +2747,7 @@ wxGrid::wxGrid( wxWindow *parent,
const wxSize& size, const wxSize& size,
long style, long style,
const wxString& name ) const wxString& name )
: wxScrolledWindow( parent, id, pos, size, style, name ), : wxScrolledWindow( parent, id, pos, size, (style | wxWANTS_CHARS), name ),
m_colMinWidths(wxKEY_INTEGER, GRID_HASH_SIZE) m_colMinWidths(wxKEY_INTEGER, GRID_HASH_SIZE)
{ {
Create(); Create();