projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MS Access support fix
[wxWidgets.git]
/
include
/
wx
/
msw
/
notebook.h
diff --git
a/include/wx/msw/notebook.h
b/include/wx/msw/notebook.h
index 95a794e6b8c1cd91f0a1dc84bb1d23f0c99ef417..3681ff38cc7d88e549c087999f90624b181dec7f 100644
(file)
--- a/
include/wx/msw/notebook.h
+++ b/
include/wx/msw/notebook.h
@@
-15,34
+15,19
@@
#pragma interface "notebook.h"
#endif
#pragma interface "notebook.h"
#endif
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-#ifndef _DYNARRAY_H
- #include <wx/dynarray.h>
-#endif //_DYNARRAY_H
+#if wxUSE_NOTEBOOK
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
-//
type
s
+//
header
s
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
-// fwd declarations
-class WXDLLEXPORT wxImageList;
-class WXDLLEXPORT wxWindow;
-
-// array of notebook pages
-typedef wxWindow WXDLLEXPORT wxNotebookPage; // so far, any window can be a page
-
-WX_DEFINE_ARRAY(wxNotebookPage *, wxArrayPages);
+#include "wx/control.h"
// ----------------------------------------------------------------------------
// wxNotebook
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// wxNotebook
// ----------------------------------------------------------------------------
-// FIXME this class should really derive from wxTabCtrl, but the interface is not
-// exactly the same, so I can't do it right now and instead we reimplement
-// part of wxTabCtrl here
-class WXDLLEXPORT wxNotebook : public wxControl
+class WXDLLEXPORT wxNotebook : public wxNotebookBase
{
public:
// ctors
{
public:
// ctors
@@
-63,8
+48,6
@@
public:
const wxSize& size = wxDefaultSize,
long style = 0,
const wxString& name = "notebook");
const wxSize& size = wxDefaultSize,
long style = 0,
const wxString& name = "notebook");
- // dtor
- ~wxNotebook();
// accessors
// ---------
// accessors
// ---------
@@
-75,8
+58,6
@@
public:
// selected one (or -1 on error)
// NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events
int SetSelection(int nPage);
// selected one (or -1 on error)
// NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events
int SetSelection(int nPage);
- // cycle thru the tabs
- void AdvanceSelection(bool bForward = TRUE);
// get the currently selected page
int GetSelection() const { return m_nSelection; }
// get the currently selected page
int GetSelection() const { return m_nSelection; }
@@
-91,8
+72,6
@@
public:
// 3) set for each page it's image
// associate image list with a control
void SetImageList(wxImageList* imageList);
// 3) set for each page it's image
// associate image list with a control
void SetImageList(wxImageList* imageList);
- // get pointer (may be NULL) to the associated image list
- wxImageList* GetImageList() const { return m_pImageList; }
// sets/returns item's image index in the current image list
int GetPageImage(int nPage) const;
// sets/returns item's image index in the current image list
int GetPageImage(int nPage) const;
@@
-112,8
+91,6
@@
public:
// ----------
// remove one page from the notebook
bool DeletePage(int nPage);
// ----------
// remove one page from the notebook
bool DeletePage(int nPage);
- // remove one page from the notebook, without deleting
- bool RemovePage(int nPage);
// remove all pages
bool DeleteAllPages();
// adds a new page to the notebook (it will be deleted ny the notebook,
// remove all pages
bool DeleteAllPages();
// adds a new page to the notebook (it will be deleted ny the notebook,
@@
-128,8
+105,6
@@
public:
const wxString& strText,
bool bSelect = FALSE,
int imageId = -1);
const wxString& strText,
bool bSelect = FALSE,
int imageId = -1);
- // get the panel which represents the given page
- wxNotebookPage *GetPage(int nPage) { return m_aPages[nPage]; }
// Windows-only at present. Also, you must use the wxNB_FIXEDWIDTH
// style.
// Windows-only at present. Also, you must use the wxNB_FIXEDWIDTH
// style.
@@
-152,16
+127,18
@@
protected:
// common part of all ctors
void Init();
// common part of all ctors
void Init();
+ // remove one page from the notebook, without deleting
+ virtual wxNotebookPage *DoRemovePage(int nPage);
+
// helper functions
void ChangePage(int nOldSel, int nSel); // change pages
// helper functions
void ChangePage(int nOldSel, int nSel); // change pages
- wxImageList *m_pImageList; // we can have an associated image list
- wxArrayPages m_aPages; // array of pages
-
int m_nSelection; // the current selection (-1 if none)
DECLARE_DYNAMIC_CLASS(wxNotebook)
DECLARE_EVENT_TABLE()
};
int m_nSelection; // the current selection (-1 if none)
DECLARE_DYNAMIC_CLASS(wxNotebook)
DECLARE_EVENT_TABLE()
};
+#endif // wxUSE_NOTEBOOK
+
#endif // _NOTEBOOK_H
#endif // _NOTEBOOK_H