bugfixes

[wxWidgets.git] / include / wx / msw / notebook.h

diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h
index 4f59ab01cfe3183b62013ef9301f06f58af85e38..265274a036d3b26a25465760f4eb536f406691bd 100644 (file)
--- a/include/wx/msw/notebook.h
+++ b/include/wx/msw/notebook.h
@@ -5,7 +5,7 @@
 // Modified by: Vadim Zeitlin for Windows version
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Modified by: Vadim Zeitlin for Windows version
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _NOTEBOOK_H
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _NOTEBOOK_H


@@ -18,6 +18,7 @@
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------

+

 #ifndef   _DYNARRAY_H
   #include <wx/dynarray.h>
 #endif  //_DYNARRAY_H
 #ifndef   _DYNARRAY_H
   #include <wx/dynarray.h>
 #endif  //_DYNARRAY_H


@@ -27,42 +28,22 @@
 // ----------------------------------------------------------------------------
 
 // fwd declarations
 // ----------------------------------------------------------------------------
 
 // fwd declarations

-class wxImageList;
-class wxWindow;
+class WXDLLEXPORT wxImageList;
+class WXDLLEXPORT wxWindow;

 
 // array of notebook pages
 
 // array of notebook pages

-typedef wxWindow wxNotebookPage;  // so far, any window can be a page
-WX_DEFINE_ARRAY(wxNotebookPage *, wxArrayPages);
-
-// ----------------------------------------------------------------------------
-// notebook events
-// ----------------------------------------------------------------------------
-class WXDLLEXPORT wxNotebookEvent : public wxCommandEvent
-{
-public:
-  wxNotebookEvent(WXTYPE commandType = 0, int id = 0, 
-                  int nSel = -1, int nOldSel = -1)
-    : wxCommandEvent(commandType, id) { m_nSel = nSel; m_nOldSel = nOldSel; }
-
-  // accessors
-  int GetSelection() const { return m_nSel; }
-  int GetOldSelection() const { return m_nOldSel; }
+typedef wxWindow WXDLLEXPORT wxNotebookPage;  // so far, any window can be a page

 
 

-private:
-  int m_nSel,     // currently selected page
-      m_nOldSel;  // previously selected page
-
-  DECLARE_DYNAMIC_CLASS(wxNotebookEvent)
-};
+WX_DEFINE_ARRAY(wxNotebookPage *, wxArrayPages);

 
 // ----------------------------------------------------------------------------
 // wxNotebook
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxNotebook
 // ----------------------------------------------------------------------------
 

-// @@@ 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 wxNotebook : public wxControl
+// 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

 {
 public:
   // ctors
 {
 public:
   // ctors


@@ -71,17 +52,17 @@ public:
   wxNotebook();
     // the same arguments as for wxControl (@@@ any special styles?)
   wxNotebook(wxWindow *parent,
   wxNotebook();
     // the same arguments as for wxControl (@@@ any special styles?)
   wxNotebook(wxWindow *parent,

-             const wxWindowID id, 
+             wxWindowID id,

              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,

-             const long style = 0,
+             long style = 0,

              const wxString& name = "notebook");
     // Create() function
   bool Create(wxWindow *parent,
              const wxString& name = "notebook");
     // Create() function
   bool Create(wxWindow *parent,

-              const wxWindowID id, 
+              wxWindowID id,

               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,

-              const long style = 0,
+              long style = 0,

               const wxString& name = "notebook");
     // dtor
   ~wxNotebook();
               const wxString& name = "notebook");
     // dtor
   ~wxNotebook();


@@ -118,11 +99,6 @@ public:
   int  GetPageImage(int nPage) const;
   bool SetPageImage(int nPage, int nImage);
 
   int  GetPageImage(int nPage) const;
   bool SetPageImage(int nPage, int nImage);
 

-  // each page can have some user-defined data associated with it:
-    // set/retrieve this pointer
-  bool  SetPageData(int nPage, void* data);
-  void* GetPageData(int nPage) const;
-

     // currently it's always 1 because wxGTK doesn't support multi-row
     // tab controls
   int GetRowCount() const;
     // currently it's always 1 because wxGTK doesn't support multi-row
     // tab controls
   int GetRowCount() const;


@@ -137,6 +113,8 @@ 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,


@@ -144,27 +122,32 @@ public:
   bool AddPage(wxNotebookPage *pPage,
                const wxString& strText,
                bool bSelect = FALSE,
   bool AddPage(wxNotebookPage *pPage,
                const wxString& strText,
                bool bSelect = FALSE,

-               int imageId = -1,
-               void* data = NULL);
+               int imageId = -1);

     // the same as AddPage(), but adds it at the specified position
   bool InsertPage(int nPage,
                   wxNotebookPage *pPage,
                   const wxString& strText,
                   bool bSelect = FALSE,
     // the same as AddPage(), but adds it at the specified position
   bool InsertPage(int nPage,
                   wxNotebookPage *pPage,
                   const wxString& strText,
                   bool bSelect = FALSE,

-                  int imageId = -1,
-                  void* data = NULL);
+                  int imageId = -1);

     // get the panel which represents the given page
   wxNotebookPage *GetPage(int nPage) { return m_aPages[nPage]; }
 
     // 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.
+  void SetTabSize(const wxSize& sz);
+

   // callbacks
   // ---------
   void OnSize(wxSizeEvent& event);
   void OnSelChange(wxNotebookEvent& event);
   // callbacks
   // ---------
   void OnSize(wxSizeEvent& event);
   void OnSelChange(wxNotebookEvent& event);

-  
+  void OnSetFocus(wxFocusEvent& event);
+  void OnNavigationKey(wxNavigationKeyEvent& event);
+

   // base class virtuals
   // -------------------
   // base class virtuals
   // -------------------

-  virtual void Command(wxCommandEvent& event);
-  virtual bool MSWNotify(const WXWPARAM wParam, const WXLPARAM lParam);
+  virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
+  virtual void SetConstraintSizes(bool recurse = TRUE);
+  virtual bool DoPhase(int nPhase);

 
 protected:
   // common part of all ctors
 
 protected:
   // common part of all ctors


@@ -172,7 +155,6 @@ protected:
 
   // helper functions
   void ChangePage(int nOldSel, int nSel); // change pages
 
   // helper functions
   void ChangePage(int nOldSel, int nSel); // change pages

-  void FitPage(wxNotebookPage *pPage);    // fit a page in the tab control

 
   wxImageList  *m_pImageList; // we can have an associated image list
   wxArrayPages  m_aPages;     // array of pages
 
   wxImageList  *m_pImageList; // we can have an associated image list
   wxArrayPages  m_aPages;     // array of pages


@@ -183,27 +165,4 @@ protected:
   DECLARE_EVENT_TABLE()
 };
 
   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 // _NOTEBOOK_H
 #endif // _NOTEBOOK_H