X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/587ce561e1deabbfacf0d619fdd6bb3899430720..d098a3572c1812d7a976582a59bf29e529c8a424:/include/wx/gtk/notebook.h

diff --git a/include/wx/gtk/notebook.h b/include/wx/gtk/notebook.h
index 13b3f0b009..d8c772d7a0 100644
--- a/include/wx/gtk/notebook.h
+++ b/include/wx/gtk/notebook.h
@@ -16,6 +16,9 @@
 #endif
 
 #include "wx/defs.h"
+
+#if wxUSE_NOTEBOOK
+
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/control.h"
@@ -28,42 +31,6 @@ class wxImageList;
 class wxNotebook;
 class wxNotebookPage;
 
-// ----------------------------------------------------------------------------
-// notebook events
-// ----------------------------------------------------------------------------
-
-class wxNotebookEvent : public wxNotifyEvent
-{
-public:
-  wxNotebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0,
-                  int nSel = -1, int nOldSel = -1)
-  : wxNotifyEvent(commandType, id)
-  {
-      m_bAllow = TRUE;
-      m_nSel = nSel;
-      m_nOldSel = nOldSel;
-  }
-
-  // accessors
-  int GetSelection() const { return m_nSel; }
-  int GetOldSelection() const { return m_nOldSel; }
-
-  // for wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING event this method may be called
-  // to disallow the page change
-  void Veto() { m_bAllow = FALSE; }
-
-  // implementation: for wxNotebook usage only
-  bool Allowed() const { return m_bAllow; }
-
-private:
-  bool m_bAllow;
-
-  int m_nSel,     // currently selected page
-      m_nOldSel;  // previously selected page
-
-  DECLARE_DYNAMIC_CLASS(wxNotebookEvent)
-};
-
 //-----------------------------------------------------------------------------
 // wxNotebook
 //-----------------------------------------------------------------------------
@@ -163,6 +130,9 @@ public:
 
   void OnNavigationKey(wxNavigationKeyEvent& event);
 
+    // overridden from wxWindow to make tabbing work  
+  void SetFocus();
+
   // implementation
 
   void SetConstraintSizes(bool recurse);
@@ -180,33 +150,13 @@ public:
 
   wxImageList*    m_imageList;
   wxList          m_pages;
+  int             m_lastSelection;  /* hack */
 
   DECLARE_DYNAMIC_CLASS(wxNotebook)
   DECLARE_EVENT_TABLE()
 };
 
-// ----------------------------------------------------------------------------
-// event macros
-// ----------------------------------------------------------------------------
-typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
-
-#define EVT_NOTEBOOK_PAGE_CHANGED(id, fn)                                   \
-  {                                                                         \
-    wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,                                    \
-    id,                                                                     \
-    -1,                                                                     \
-    (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn,  \
-    NULL                                                                    \
-  },
-
-#define EVT_NOTEBOOK_PAGE_CHANGING(id, fn)                                  \
-  {                                                                         \
-    wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING,                                   \
-    id,                                                                     \
-    -1,                                                                     \
-    (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn,  \
-    NULL                                                                    \
-  },
+#endif
 
 #endif
     // __GTKNOTEBOOKH__