projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't accept focus in the dummy main generic spin control window.
[wxWidgets.git]
/
include
/
wx
/
gtk
/
notebook.h
diff --git
a/include/wx/gtk/notebook.h
b/include/wx/gtk/notebook.h
index 2921c3583cc819fa3b6393d0a75e5ea14ea91030..45cb903ea5dbb9b5a8eabc3c662efd4109b98234 100644
(file)
--- a/
include/wx/gtk/notebook.h
+++ b/
include/wx/gtk/notebook.h
@@
-8,14
+8,14
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifndef _
_GTKNOTEBOOKH_
_
-#define _
_GTKNOTEBOOKH_
_
+#ifndef _
WX_GTKNOTEBOOK_H
_
+#define _
WX_GTKNOTEBOOK_H
_
//-----------------------------------------------------------------------------
// internal class
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// internal class
//-----------------------------------------------------------------------------
-class WXDLLIMPEXP_CORE wxGtkNotebookPage;
+class WXDLLIMPEXP_
FWD_
CORE wxGtkNotebookPage;
#include "wx/list.h"
WX_DECLARE_LIST(wxGtkNotebookPage, wxGtkNotebookPagesList);
#include "wx/list.h"
WX_DECLARE_LIST(wxGtkNotebookPage, wxGtkNotebookPagesList);
@@
-52,10
+52,13
@@
public:
// set the currently selected page, return the index of the previously
// selected one (or -1 on error)
// NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events
// set the currently selected page, return the index of the previously
// selected one (or -1 on error)
// NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events
- int SetSelection(size_t nPage);
+ int SetSelection(size_t nPage) { return DoSetSelection(nPage, SetSelection_SendEvent); }
// get the currently selected page
int GetSelection() const;
// get the currently selected page
int GetSelection() const;
+ // changes selected page without sending events
+ int ChangeSelection(size_t nPage) { return DoSetSelection(nPage); }
+
// set/get the title of a page
bool SetPageText(size_t nPage, const wxString& strText);
wxString GetPageText(size_t nPage) const;
// set/get the title of a page
bool SetPageText(size_t nPage, const wxString& strText);
wxString GetPageText(size_t nPage) const;
@@
-104,12
+107,6
@@
public:
bool DoPhase(int phase);
#endif
bool DoPhase(int phase);
#endif
- // set all page's attributes
- void DoApplyWidgetStyle(GtkRcStyle *style);
-
- // report if window belongs to notebook
- bool IsOwnGtkWindow( GdkWindow *window );
-
// common part of all ctors
void Init();
// common part of all ctors
void Init();
@@
-119,24
+116,29
@@
public:
// the additional page data (the pages themselves are in m_pages array)
wxGtkNotebookPagesList m_pagesData;
// the additional page data (the pages themselves are in m_pages array)
wxGtkNotebookPagesList m_pagesData;
- // for reasons explained in gtk/notebook.cpp we store the current
- // selection internally instead of querying the notebook for it
- int m_selection;
-
- // flag set to true while we're inside "switch_page" callback
- bool m_inSwitchPage;
+ // we need to store the old selection since there
+ // is no other way to know about it at the time
+ // of the change selection event
+ int m_oldSelection;
protected:
protected:
+ // set all page's attributes
+ virtual void DoApplyWidgetStyle(GtkRcStyle *style);
+ virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
+
// remove one page from the notebook but do not destroy it
virtual wxNotebookPage *DoRemovePage(size_t nPage);
// remove one page from the notebook but do not destroy it
virtual wxNotebookPage *DoRemovePage(size_t nPage);
+ int DoSetSelection(size_t nPage, int flags = 0);
+
private:
// the padding set by SetPadding()
int m_padding;
private:
// the padding set by SetPadding()
int m_padding;
+ virtual void AddChildGTK(wxWindowGTK* child);
+
DECLARE_DYNAMIC_CLASS(wxNotebook)
DECLARE_EVENT_TABLE()
};
DECLARE_DYNAMIC_CLASS(wxNotebook)
DECLARE_EVENT_TABLE()
};
-#endif
- // __GTKNOTEBOOKH__
+#endif // _WX_GTKNOTEBOOK_H_