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

take old (wx 2.2? older?) wxGrid compatibility functions inside WXWIN_COMPATIBILITY_2_8; rearrange some declarations order but no real changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2008-09-15 12:18:07 +00:00
parent 08dd9b5aed
commit bf2c8b318e
1 changed files with 41 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1090,34 +1090,52 @@ WX_DECLARE_OBJARRAY_WITH_DECL(wxGridCellCoords, wxGridCellCoordsArray,
class WXDLLIMPEXP_ADV wxGrid : public wxScrolledWindow class WXDLLIMPEXP_ADV wxGrid : public wxScrolledWindow
{ {
public: public:
// possible selection modes
enum wxGridSelectionModes
{
wxGridSelectCells = 0, // allow selecting anything
wxGridSelectRows = 1, // allow selecting only entire rows
wxGridSelectColumns = 2, // allow selecting only entire columns
wxGridSelectRowsOrColumns = wxGridSelectRows | wxGridSelectColumns
};
// creation and destruction
// ------------------------
// ctor and Create() create the grid window, as with the other controls
wxGrid(); wxGrid();
wxGrid( wxWindow *parent, wxGrid(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxWANTS_CHARS, long style = wxWANTS_CHARS,
const wxString& name = wxGridNameStr ); const wxString& name = wxGridNameStr);
bool Create( wxWindow *parent, bool Create(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxWANTS_CHARS, long style = wxWANTS_CHARS,
const wxString& name = wxGridNameStr ); const wxString& name = wxGridNameStr);
virtual ~wxGrid(); virtual ~wxGrid();
enum wxGridSelectionModes // however to initialize grid data either CreateGrid() or SetTable() must
{ // be also called
wxGridSelectCells,
wxGridSelectRows,
wxGridSelectColumns
};
// this is basically equivalent to
//
// SetTable(new wxGridStringTable(numRows, numCols), true, selmode)
//
bool CreateGrid( int numRows, int numCols, bool CreateGrid( int numRows, int numCols,
wxGridSelectionModes selmode = wxGridSelectCells ); wxGridSelectionModes selmode = wxGridSelectCells );
bool SetTable( wxGridTableBase *table,
bool takeOwnership = false,
wxGridSelectionModes selmode = wxGridSelectCells );
void SetSelectionMode(wxGridSelectionModes selmode); void SetSelectionMode(wxGridSelectionModes selmode);
wxGridSelectionModes GetSelectionMode() const; wxGridSelectionModes GetSelectionMode() const;
@ -1148,8 +1166,6 @@ public:
void DoEndDragMoveCol(); void DoEndDragMoveCol();
wxGridTableBase * GetTable() const { return m_table; } wxGridTableBase * GetTable() const { return m_table; }
bool SetTable( wxGridTableBase *table, bool takeOwnership = false,
wxGridSelectionModes selmode = wxGridSelectCells );
void ClearGrid(); void ClearGrid();
bool InsertRows( int pos = 0, int numRows = 1, bool updateLabels = true ); bool InsertRows( int pos = 0, int numRows = 1, bool updateLabels = true );
@ -1624,16 +1640,13 @@ public:
} }
// override some base class functions
virtual bool Enable(bool enable = true);
virtual wxWindow *GetMainWindowOfCompositeControl()
{ return (wxWindow*)m_gridWin; }
// ------- drag and drop // ------- drag and drop
#if wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
virtual void SetDropTarget(wxDropTarget *dropTarget); virtual void SetDropTarget(wxDropTarget *dropTarget);
#endif // wxUSE_DRAG_AND_DROP #endif // wxUSE_DRAG_AND_DROP
#ifdef WXWIN_COMPATIBILITY_2_8
// ------ For compatibility with previous wxGrid only... // ------ For compatibility with previous wxGrid only...
// //
// ************************************************ // ************************************************
@ -1795,8 +1808,13 @@ public:
wxGRID_CHECKBOX, wxGRID_CHECKBOX,
wxGRID_CHOICE, wxGRID_CHOICE,
wxGRID_COMBOBOX }; wxGRID_COMBOBOX };
#endif // WXWIN_COMPATIBILITY_2_8
// overridden wxWindow methods
// override some base class functions
virtual bool Enable(bool enable = true);
virtual wxWindow *GetMainWindowOfCompositeControl()
{ return (wxWindow*)m_gridWin; }
virtual void Fit(); virtual void Fit();
// implementation only // implementation only
@ -1845,7 +1863,7 @@ protected:
int m_minAcceptableColWidth; int m_minAcceptableColWidth;
wxArrayInt m_colWidths; wxArrayInt m_colWidths;
wxArrayInt m_colRights; wxArrayInt m_colRights;
bool m_nativeColumnLabels; bool m_nativeColumnLabels;
// get the col/row coords // get the col/row coords