projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Silence Clang warning about numeric_limits<> specialization.
[wxWidgets.git]
/
include
/
wx
/
os2
/
notebook.h
diff --git
a/include/wx/os2/notebook.h
b/include/wx/os2/notebook.h
index 48e60c5b08c81e9fa351b03c3fca3493b35b8309..82a7601880e84e3fd6f65091632326c690a77614 100644
(file)
--- a/
include/wx/os2/notebook.h
+++ b/
include/wx/os2/notebook.h
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: notebook.h
+// Name:
wx/os2/
notebook.h
// Purpose: MSW/GTK compatible notebook (a.k.a. property sheet)
// Author: David Webster
// Modified by:
// Purpose: MSW/GTK compatible notebook (a.k.a. property sheet)
// Author: David Webster
// Modified by:
@@
-23,7
+23,7
@@
// wxNotebook
// ----------------------------------------------------------------------------
// wxNotebook
// ----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxNotebook : public wxNotebookBase
+class WXDLL
IMPEXP_CORE
wxNotebook : public wxNotebookBase
{
public:
//
{
public:
//
@@
-41,7
+41,7
@@
public:
,const wxPoint& rPos = wxDefaultPosition
,const wxSize& rSize = wxDefaultSize
,long lStyle = 0
,const wxPoint& rPos = wxDefaultPosition
,const wxSize& rSize = wxDefaultSize
,long lStyle = 0
- ,const wxString& rsName =
"notebook"
+ ,const wxString& rsName =
wxNotebookNameStr
);
bool Create( wxWindow* pParent
);
bool Create( wxWindow* pParent
@@
-49,7
+49,7
@@
public:
,const wxPoint& rPos = wxDefaultPosition
,const wxSize& rSize = wxDefaultSize
,long lStyle = 0
,const wxPoint& rPos = wxDefaultPosition
,const wxSize& rSize = wxDefaultSize
,long lStyle = 0
- ,const wxString& rsName =
"notebook"
+ ,const wxString& rsName =
wxNotebookNameStr
);
//
);
//
@@
-57,27
+57,25
@@
public:
// ---------
// Get number of pages in the dialog
//
// ---------
// Get number of pages in the dialog
//
- size_t GetPageCount(void) const;
+
virtual
size_t GetPageCount(void) const;
//
// Set the currently selected page, return the index of the previously
//
// Set the currently selected page, return the index of the previously
- // selected one (or
-1
on error)
+ // selected one (or
wxNOT_FOUND
on error)
// NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events
//
// NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events
//
-
int SetSelection(in
t nPage);
+
int SetSelection(size_
t nPage);
- //
- // Get the currently selected page
- //
- inline int GetSelection(void) const { return m_nSelection; }
+ // changes selected page without sending events
+ int ChangeSelection(size_t nPage);
//
// Set/Get the title of a page
//
//
// Set/Get the title of a page
//
-
bool SetPageText( in
t nPage
-
,const wxString& sStrText
-
);
-
wxString GetPageText(in
t nPage) const;
+
bool SetPageText( size_
t nPage
+ ,const wxString& sStrText
+ );
+
wxString GetPageText(size_
t nPage) const;
//
// Image list stuff: each page may have an image associated with it. All
//
// Image list stuff: each page may have an image associated with it. All
@@
-92,10
+90,10
@@
public:
//
// Sets/returns item's image index in the current image list
//
//
// Sets/returns item's image index in the current image list
//
-
int GetPageImage(in
t nPage) const;
-
bool SetPageImage( in
t nPage
-
,int nImage
-
);
+
int GetPageImage(size_
t nPage) const;
+
bool SetPageImage( size_
t nPage
+ ,int nImage
+ );
//
// Currently it's always 1 because wxGTK doesn't support multi-row
//
// Currently it's always 1 because wxGTK doesn't support multi-row
@@
-127,19
+125,19
@@
public:
//
bool AddPage( wxNotebookPage* pPage
,const wxString& rsStrText
//
bool AddPage( wxNotebookPage* pPage
,const wxString& rsStrText
- ,bool bSelect =
FALSE
+ ,bool bSelect =
false
,int nImageId = -1
);
//
// The same as AddPage(), but adds it at the specified position
//
,int nImageId = -1
);
//
// The same as AddPage(), but adds it at the specified position
//
-
bool InsertPage( in
t nPage
-
,wxNotebookPage* pPage
-
,const wxString& rsStrText
- ,bool bSelect = FALSE
-
,int nImageId = -1
-
);
+
bool InsertPage( size_
t nPage
+ ,wxNotebookPage* pPage
+ ,const wxString& rsStrText
+ ,bool bSelect = false
+ ,int nImageId = -1
+ );
//
// Windows-only at present. Also, you must use the wxNB_FIXEDWIDTH
//
// Windows-only at present. Also, you must use the wxNB_FIXEDWIDTH
@@
-152,7
+150,7
@@
public:
// ---------
//
void OnSize(wxSizeEvent& rEvent);
// ---------
//
void OnSize(wxSizeEvent& rEvent);
- void OnSelChange(wx
Notebook
Event& rEvent);
+ void OnSelChange(wx
BookCtrl
Event& rEvent);
void OnSetFocus(wxFocusEvent& rEvent);
void OnNavigationKey(wxNavigationKeyEvent& rEvent);
void OnSetFocus(wxFocusEvent& rEvent);
void OnNavigationKey(wxNavigationKeyEvent& rEvent);
@@
-165,7
+163,7
@@
public:
,WXWORD wPos
,WXHWND hControl
);
,WXWORD wPos
,WXHWND hControl
);
- virtual void SetConstraintSizes(bool bRecurse =
TRUE
);
+ virtual void SetConstraintSizes(bool bRecurse =
true
);
virtual bool DoPhase(int nPhase);
protected:
virtual bool DoPhase(int nPhase);
protected:
@@
-184,14
+182,12
@@
protected:
//
// Remove one page from the notebook, without deleting
//
//
// Remove one page from the notebook, without deleting
//
- virtual wxNotebookPage* DoRemovePage(
in
t nPage);
+ virtual wxNotebookPage* DoRemovePage(
size_
t nPage);
//
// Helper functions
//
//
// Helper functions
//
- int m_nSelection; // The current selection (-1 if none)
-
private:
wxArrayLong m_alPageId;
int m_nTabSize; // holds the largest tab size
private:
wxArrayLong m_alPageId;
int m_nTabSize; // holds the largest tab size
@@
-203,4
+199,3
@@
private:
#endif // wxUSE_NOTEBOOK
#endif // _NOTEBOOK_H
#endif // wxUSE_NOTEBOOK
#endif // _NOTEBOOK_H
-