X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6762286db6cf974817dead5b88bebf0e390dbb7e..8325504f4bf9dc557745f4dcb26b43c029d5106d:/include/wx/osx/toolbar.h

diff --git a/include/wx/osx/toolbar.h b/include/wx/osx/toolbar.h
index 6dd02028cb..df388af6eb 100644
--- a/include/wx/osx/toolbar.h
+++ b/include/wx/osx/toolbar.h
@@ -44,12 +44,16 @@ class WXDLLIMPEXP_CORE wxToolBar: public wxToolBarBase
             const wxString& name = wxToolBarNameStr);
 
     virtual void SetWindowStyleFlag(long style);
+    
+    virtual bool Destroy();
 
     // override/implement base class virtuals
     virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const;
 
+#ifndef __WXOSX_IPHONE__
     virtual bool Show(bool show = true);
     virtual bool IsShown() const;
+#endif
     virtual bool Realize();
 
     virtual void SetToolBitmapSize(const wxSize& size);
@@ -60,15 +64,18 @@ class WXDLLIMPEXP_CORE wxToolBar: public wxToolBarBase
     virtual void SetToolNormalBitmap(int id, const wxBitmap& bitmap);
     virtual void SetToolDisabledBitmap(int id, const wxBitmap& bitmap);
 
+#ifndef __WXOSX_IPHONE__
     // Add all the buttons
 
     virtual wxString MacGetToolTipString( wxPoint &where ) ;
     void OnPaint(wxPaintEvent& event) ;
     void OnMouse(wxMouseEvent& event) ;
     virtual void MacSuperChangedPosition() ;
-
+#endif
+    
 #if wxOSX_USE_NATIVE_TOOLBAR
     bool MacInstallNativeToolbar(bool usesNative);
+    void MacUninstallNativeToolbar();
     bool MacWantsNativeToolbar();
     bool MacTopLevelHasNativeToolbar(bool *ownToolbarInstalled) const;
 #endif
@@ -76,8 +83,10 @@ protected:
     // common part of all ctors
     void Init();
 
-    virtual void DoGetSize(int *width, int *height) const;
+#ifndef __WXOSX_IPHONE__
+   virtual void DoGetSize(int *width, int *height) const;
     virtual wxSize DoGetBestSize() const;
+#endif
     virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
     virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);
 
@@ -101,6 +110,9 @@ protected:
     bool m_macUsesNativeToolbar ;
     void* m_macToolbar ;
 #endif
+#ifdef __WXOSX_IPHONE__
+    WX_UIView m_macToolbar; 
+#endif
 };
 
 #endif // wxUSE_TOOLBAR