hack to allow icons in wxStaticBitmap as well as bitmaps

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

diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h
index 2514158818888a56b9c47fa38fb66b5d893d37ec..3f4697fab98f8452cbff96dabe795553a033d47c 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


@@ -27,26 +27,41 @@
 // ----------------------------------------------------------------------------
 
 // 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
+typedef wxWindow WXDLLEXPORT wxNotebookPage;  // so far, any window can be a page
+
+#undef WXDLLEXPORTLOCAL
+#define WXDLLEXPORTLOCAL WXDLLEXPORT
+

 WX_DEFINE_ARRAY(wxNotebookPage *, wxArrayPages);
 
 WX_DEFINE_ARRAY(wxNotebookPage *, wxArrayPages);
 

+#undef  WXDLLEXPORTLOCAL
+#define WXDLLEXPORTLOCAL
+

 // ----------------------------------------------------------------------------
 // notebook events
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // notebook events
 // ----------------------------------------------------------------------------

-class WXDLLEXPORT wxNotebookEvent : public wxCommandEvent
+class WXDLLEXPORT wxNotebookEvent : public wxNotifyEvent

 {
 public:
 {
 public:

-  wxNotebookEvent(WXTYPE commandType = 0, int id = 0, 
+  wxNotebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0,

                   int nSel = -1, int nOldSel = -1)
                   int nSel = -1, int nOldSel = -1)

-    : wxCommandEvent(commandType, id) { m_nSel = nSel; m_nOldSel = nOldSel; }
+  : wxNotifyEvent(commandType, id)
+  {
+      m_nSel = nSel;
+      m_nOldSel = nOldSel;
+  }

 
   // accessors
 
   // accessors

+    // the currently selected page (-1 if none)

   int GetSelection() const { return m_nSel; }
   int GetSelection() const { return m_nSel; }

+  void SetSelection(int nSel) { m_nSel = nSel; }
+    // the page that was selected before the change (-1 if none)

   int GetOldSelection() const { return m_nOldSel; }
   int GetOldSelection() const { return m_nOldSel; }

+  void SetOldSelection(int nOldSel) { m_nOldSel = nOldSel; }

 
 private:
   int m_nSel,     // currently selected page
 
 private:
   int m_nSel,     // currently selected page


@@ -62,7 +77,7 @@ private:
 // @@@ 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
 // @@@ 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
+class WXDLLEXPORT wxNotebook : public wxControl

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


@@ -71,14 +86,14 @@ 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,

-             wxWindowID id, 
+             wxWindowID id,

              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,
              const wxString& name = "notebook");
     // Create() function
   bool Create(wxWindow *parent,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,
              const wxString& name = "notebook");
     // Create() function
   bool Create(wxWindow *parent,

-              wxWindowID id, 
+              wxWindowID id,

               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = 0,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = 0,


@@ -118,11 +133,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 +147,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 +156,34 @@ 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);
+  void OnEraseBackground(wxEraseEvent& event);
+

   // base class virtuals
   // -------------------
   virtual void Command(wxCommandEvent& event);
   // base class virtuals
   // -------------------
   virtual void Command(wxCommandEvent& event);

-  virtual bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam);
+  virtual bool MSWNotify(WXWPARAM wParam, 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 +191,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


@@ -199,7 +217,7 @@ typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
 
 #define EVT_NOTEBOOK_PAGE_CHANGING(id, fn)                                  \
   {                                                                         \
 
 #define EVT_NOTEBOOK_PAGE_CHANGING(id, fn)                                  \
   {                                                                         \

-    wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, \                                 \
+    wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING,                                   \

     id,                                                                     \
     -1,                                                                     \
     (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn,  \
     id,                                                                     \
     -1,                                                                     \
     (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn,  \