fixes to menu stock items support (patch 1547639)

[wxWidgets.git] / include / wx / mac / carbon / notebook.h

diff --git a/include/wx/mac/carbon/notebook.h b/include/wx/mac/carbon/notebook.h
index ae67da07cffbe033be0595135f0b642d2f51e88c..299b438dbee6292a8be1fc9cc4bf18eafdceff4e 100644 (file)
--- a/include/wx/mac/carbon/notebook.h
+++ b/include/wx/mac/carbon/notebook.h
@@ -50,7 +50,7 @@ public:
               long style = 0,
               const wxString& name = wxNotebookNameStr);
     // dtor
               long style = 0,
               const wxString& name = wxNotebookNameStr);
     // dtor

-  ~wxNotebook();
+  virtual ~wxNotebook();

 
   // accessors
   // ---------
 
   // accessors
   // ---------


@@ -114,9 +114,10 @@ public:
   // base class virtuals
   // -------------------
   virtual void Command(wxCommandEvent& event);
   // base class virtuals
   // -------------------
   virtual void Command(wxCommandEvent& event);

+    virtual wxInt32 MacControlHit(WXEVENTHANDLERREF handler, WXEVENTREF event);
+

 protected:
   virtual wxNotebookPage *DoRemovePage(size_t page) ;
 protected:
   virtual wxNotebookPage *DoRemovePage(size_t page) ;

-  virtual wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;

   // common part of all ctors
   void Init();
 
   // common part of all ctors
   void Init();