projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
forgot to commit
[wxWidgets.git]
/
include
/
wx
/
treebook.h
diff --git
a/include/wx/treebook.h
b/include/wx/treebook.h
index 7209e7c1fef5d324016b69bfbf0294c8c2999097..798acf318b5914f7e0c7fae429f90c83124ba097 100644
(file)
--- a/
include/wx/treebook.h
+++ b/
include/wx/treebook.h
@@
-21,7
+21,7
@@
typedef wxWindow wxTreebookPage;
typedef wxWindow wxTreebookPage;
-class WXDLL
EXPORT
wxTreeEvent;
+class WXDLL
IMPEXP_FWD_CORE
wxTreeEvent;
// ----------------------------------------------------------------------------
// wxTreebook
// ----------------------------------------------------------------------------
// wxTreebook
@@
-132,12
+132,17
@@
public:
virtual int GetPageImage(size_t n) const;
virtual bool SetPageImage(size_t n, int imageId);
virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const;
virtual int GetPageImage(size_t n) const;
virtual bool SetPageImage(size_t n, int imageId);
virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const;
- virtual int SetSelection(size_t n);
+ virtual int SetSelection(size_t n) { return DoSetSelection(n, SetSelection_SendEvent); }
+ virtual int ChangeSelection(size_t n) { return DoSetSelection(n); }
+ virtual int HitTest(const wxPoint& pt, long *flags = NULL) const;
virtual void SetImageList(wxImageList *imageList);
virtual void AssignImageList(wxImageList *imageList);
virtual bool DeleteAllPages();
protected:
virtual void SetImageList(wxImageList *imageList);
virtual void AssignImageList(wxImageList *imageList);
virtual bool DeleteAllPages();
protected:
+ // Implementation of a page removal. See DeletPage for comments.
+ wxTreebookPage *DoRemovePage(size_t pos);
+
// This subclass of wxBookCtrlBase accepts NULL page pointers (empty pages)
virtual bool AllowNullPage() const { return true; }
// This subclass of wxBookCtrlBase accepts NULL page pointers (empty pages)
virtual bool AllowNullPage() const { return true; }
@@
-180,11
+185,8
@@
private:
bool bSelect = false,
int imageId = wxNOT_FOUND);
bool bSelect = false,
int imageId = wxNOT_FOUND);
- // Implementation of a page removal. See DeletPage for comments.
- wxTreebookPage *DoRemovePage(size_t pos);
-
// Sets selection in the tree control and updates the page being shown.
// Sets selection in the tree control and updates the page being shown.
- int DoSetSelection(size_t pos);
+ int DoSetSelection(size_t pos
, int flags = 0
);
// Returns currently shown page. In a case when selected the node
// has empty (NULL) page finds first (sub)child with not-empty page.
// Returns currently shown page. In a case when selected the node
// has empty (NULL) page finds first (sub)child with not-empty page.
@@
-219,7
+221,7
@@
private:
// Returns internal number of pages which can be different from
// GetPageCount() while performing a page insertion or removal.
// Returns internal number of pages which can be different from
// GetPageCount() while performing a page insertion or removal.
- size_t DoInternalGetPageCount() const { return m_treeIds.Count(); }
+ size_t DoInternalGetPageCount() const { return m_treeIds.
Get
Count(); }
DECLARE_EVENT_TABLE()
DECLARE_EVENT_TABLE()