wxRadioBox fixed on mac

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

diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h
index 9b0af68f26bef8507c3bb724b9c2149e03e07046..fde5197f806eb7024a4025855a92edc6f8259a17 100644 (file)
--- a/include/wx/msw/notebook.h
+++ b/include/wx/msw/notebook.h
@@ -18,50 +18,31 @@
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------

-#ifndef   _DYNARRAY_H
-  #include <wx/dynarray.h>
-#endif  //_DYNARRAY_H
+
+#include "wx/control.h"
+#include "wx/dynarray.h"

 
 // ----------------------------------------------------------------------------
 // types
 // ----------------------------------------------------------------------------
 
 // fwd declarations
 
 // ----------------------------------------------------------------------------
 // types
 // ----------------------------------------------------------------------------
 
 // fwd declarations

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

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

+//typedef wxWindow WXDLLEXPORT wxNotebookPage;  // so far, any window can be a page

 typedef wxWindow wxNotebookPage;  // so far, any window can be a page
 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(wxEventType commandType = wxEVT_NULL, 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; }

 
 

-private:
-  int m_nSel,     // currently selected page
-      m_nOldSel;  // previously selected page
-
-  DECLARE_DYNAMIC_CLASS(wxNotebookEvent)
-};
+WX_DEFINE_EXPORTED_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
+// 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:
 class WXDLLEXPORT wxNotebook : public wxControl
 {
 public:


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


@@ -111,6 +92,7 @@ public:
   // 3) set for each page it's image
     // associate image list with a control
   void SetImageList(wxImageList* imageList);
   // 3) set for each page it's image
     // associate image list with a control
   void SetImageList(wxImageList* imageList);

+  void AssignImageList(wxImageList* imageList);

     // get pointer (may be NULL) to the associated image list
   wxImageList* GetImageList() const { return m_pImageList; }
 
     // get pointer (may be NULL) to the associated image list
   wxImageList* GetImageList() const { return m_pImageList; }
 


@@ -132,6 +114,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,


@@ -149,18 +133,20 @@ public:
     // 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);
   void OnSetFocus(wxFocusEvent& event);
   void OnNavigationKey(wxNavigationKeyEvent& event);
   // callbacks
   // ---------
   void OnSize(wxSizeEvent& event);
   void OnSelChange(wxNotebookEvent& event);
   void OnSetFocus(wxFocusEvent& event);
   void OnNavigationKey(wxNavigationKeyEvent& event);

-  
->>>>>>> 1.5
+

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

-  virtual void Command(wxCommandEvent& event);
-  virtual bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam);
+  virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);

   virtual void SetConstraintSizes(bool recurse = TRUE);
   virtual bool DoPhase(int nPhase);
 
   virtual void SetConstraintSizes(bool recurse = TRUE);
   virtual bool DoPhase(int nPhase);
 


@@ -172,6 +158,7 @@ protected:
   void ChangePage(int nOldSel, int nSel); // change pages
 
   wxImageList  *m_pImageList; // we can have an associated image list
   void ChangePage(int nOldSel, int nSel); // change pages
 
   wxImageList  *m_pImageList; // we can have an associated image list

+  bool          m_bOwnsImageList;

   wxArrayPages  m_aPages;     // array of pages
 
   int m_nSelection;           // the current selection (-1 if none)
   wxArrayPages  m_aPages;     // array of pages
 
   int m_nSelection;           // the current selection (-1 if none)


@@ -180,27 +167,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