improved keyboard handling, bug fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@204 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -40,7 +40,7 @@ WX_DEFINE_ARRAY(wxNotebookPage *, wxArrayPages);
|
|||||||
class WXDLLEXPORT wxNotebookEvent : public wxCommandEvent
|
class WXDLLEXPORT wxNotebookEvent : public wxCommandEvent
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
wxNotebookEvent(WXTYPE commandType = wxEVT_NULL, int id = 0,
|
wxNotebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0,
|
||||||
int nSel = -1, int nOldSel = -1)
|
int nSel = -1, int nOldSel = -1)
|
||||||
: wxCommandEvent(commandType, id) { m_nSel = nSel; m_nOldSel = nOldSel; }
|
: wxCommandEvent(commandType, id) { m_nSel = nSel; m_nOldSel = nOldSel; }
|
||||||
|
|
||||||
@@ -118,11 +118,6 @@ public:
|
|||||||
int GetPageImage(int nPage) const;
|
int GetPageImage(int nPage) const;
|
||||||
bool SetPageImage(int nPage, int nImage);
|
bool SetPageImage(int nPage, int nImage);
|
||||||
|
|
||||||
// each page can have some user-defined data associated with it:
|
|
||||||
// set/retrieve this pointer
|
|
||||||
bool SetPageData(int nPage, void* data);
|
|
||||||
void* GetPageData(int nPage) const;
|
|
||||||
|
|
||||||
// currently it's always 1 because wxGTK doesn't support multi-row
|
// currently it's always 1 because wxGTK doesn't support multi-row
|
||||||
// tab controls
|
// tab controls
|
||||||
int GetRowCount() const;
|
int GetRowCount() const;
|
||||||
@@ -144,15 +139,13 @@ public:
|
|||||||
bool AddPage(wxNotebookPage *pPage,
|
bool AddPage(wxNotebookPage *pPage,
|
||||||
const wxString& strText,
|
const wxString& strText,
|
||||||
bool bSelect = FALSE,
|
bool bSelect = FALSE,
|
||||||
int imageId = -1,
|
int imageId = -1);
|
||||||
void* data = NULL);
|
|
||||||
// the same as AddPage(), but adds it at the specified position
|
// the same as AddPage(), but adds it at the specified position
|
||||||
bool InsertPage(int nPage,
|
bool InsertPage(int nPage,
|
||||||
wxNotebookPage *pPage,
|
wxNotebookPage *pPage,
|
||||||
const wxString& strText,
|
const wxString& strText,
|
||||||
bool bSelect = FALSE,
|
bool bSelect = FALSE,
|
||||||
int imageId = -1,
|
int imageId = -1);
|
||||||
void* data = NULL);
|
|
||||||
// get the panel which represents the given page
|
// get the panel which represents the given page
|
||||||
wxNotebookPage *GetPage(int nPage) { return m_aPages[nPage]; }
|
wxNotebookPage *GetPage(int nPage) { return m_aPages[nPage]; }
|
||||||
|
|
||||||
@@ -160,6 +153,8 @@ public:
|
|||||||
// ---------
|
// ---------
|
||||||
void OnSize(wxSizeEvent& event);
|
void OnSize(wxSizeEvent& event);
|
||||||
void OnSelChange(wxNotebookEvent& event);
|
void OnSelChange(wxNotebookEvent& event);
|
||||||
|
void OnSetFocus(wxFocusEvent& event);
|
||||||
|
void OnNavigationKey(wxNavigationKeyEvent& event);
|
||||||
|
|
||||||
// base class virtuals
|
// base class virtuals
|
||||||
// -------------------
|
// -------------------
|
||||||
|
Reference in New Issue
Block a user