new native toolbar implementation (turned off by default, not supporting embedded...

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

diff --git a/include/wx/mac/carbon/frame.h b/include/wx/mac/carbon/frame.h
index f92f7196fcaf0dbfe3aa73397ef937e8af797589..f8285f16a43c1106b8c1594589474653d5e6cdf5 100644 (file)
--- a/include/wx/mac/carbon/frame.h
+++ b/include/wx/mac/carbon/frame.h
@@ -59,13 +59,13 @@ public:
     // implementation only from now on
     // -------------------------------
 
-    // override some more virtuals
-    virtual bool Enable(bool enable = TRUE) ;
-
     // get the origin of the client area (which may be different from (0, 0)
     // if the frame has a toolbar) in client coordinates
     virtual wxPoint GetClientAreaOrigin() const;
 
+    // override some more virtuals
+    virtual bool Enable(bool enable = TRUE) ;
+
     // event handlers
     void OnActivate(wxActivateEvent& event);
     void OnSysColourChanged(wxSysColourChangedEvent& event);
@@ -77,6 +77,7 @@ public:
                                      const wxString& name = wxToolBarNameStr);
 
     virtual void PositionToolBar();
+    virtual void SetToolBar(wxToolBar *toolbar);
 #endif // wxUSE_TOOLBAR
 
     // Status bar
@@ -115,6 +116,8 @@ protected:
     // the last focused child: we restore focus to it on activation
     wxWindow             *m_winLastFocused;
 
+    virtual bool        MacIsChildOfClientArea( const wxWindow* child ) const ;
+
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxFrame)