Simplify backend enum naming, we do not need separate values for gtk and osx webkit...

[wxWidgets.git] / include / wx / osx / toolbar.h

diff --git a/include/wx/osx/toolbar.h b/include/wx/osx/toolbar.h
index 46d94b5edc420999a3a14fb84c4535acba55fe01..f8d789ec3551e9bc2410dd2c642d82e6b20fcf3b 100644 (file)
--- a/include/wx/osx/toolbar.h
+++ b/include/wx/osx/toolbar.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/mac/carbon/toolbar.h
+// Name:        wx/osx/toolbar.h

 // Purpose:     wxToolBar class
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxToolBar class
 // Author:      Stefan Csomor
 // Modified by:


@@ -17,8 +17,6 @@
 #include "wx/tbarbase.h"
 #include "wx/dynarray.h"
 
 #include "wx/tbarbase.h"
 #include "wx/dynarray.h"
 

-WXDLLIMPEXP_DATA_CORE(extern const char) wxToolBarNameStr[];
-

 class WXDLLIMPEXP_CORE wxToolBar: public wxToolBarBase
 {
   DECLARE_DYNAMIC_CLASS(wxToolBar)
 class WXDLLIMPEXP_CORE wxToolBar: public wxToolBarBase
 {
   DECLARE_DYNAMIC_CLASS(wxToolBar)


@@ -45,6 +43,8 @@ class WXDLLIMPEXP_CORE wxToolBar: public wxToolBarBase
 
     virtual void SetWindowStyleFlag(long style);
 
 
     virtual void SetWindowStyleFlag(long style);
 

+    virtual bool Destroy();
+

     // override/implement base class virtuals
     virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const;
 
     // override/implement base class virtuals
     virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const;
 


@@ -70,15 +70,20 @@ class WXDLLIMPEXP_CORE wxToolBar: public wxToolBarBase
     void OnMouse(wxMouseEvent& event) ;
     virtual void MacSuperChangedPosition() ;
 #endif
     void OnMouse(wxMouseEvent& event) ;
     virtual void MacSuperChangedPosition() ;
 #endif

-    
+

 #if wxOSX_USE_NATIVE_TOOLBAR
     bool MacInstallNativeToolbar(bool usesNative);
 #if wxOSX_USE_NATIVE_TOOLBAR
     bool MacInstallNativeToolbar(bool usesNative);

+    void MacUninstallNativeToolbar();

     bool MacWantsNativeToolbar();
     bool MacTopLevelHasNativeToolbar(bool *ownToolbarInstalled) const;
 #endif
 protected:
     // common part of all ctors
     void Init();
     bool MacWantsNativeToolbar();
     bool MacTopLevelHasNativeToolbar(bool *ownToolbarInstalled) const;
 #endif
 protected:
     // common part of all ctors
     void Init();

+    
+    void DoLayout();
+    
+    void DoSetSize(int x, int y, int width, int height, int sizeFlags);

 
 #ifndef __WXOSX_IPHONE__
    virtual void DoGetSize(int *width, int *height) const;
 
 #ifndef __WXOSX_IPHONE__
    virtual void DoGetSize(int *width, int *height) const;


@@ -108,7 +113,7 @@ protected:
     void* m_macToolbar ;
 #endif
 #ifdef __WXOSX_IPHONE__
     void* m_macToolbar ;
 #endif
 #ifdef __WXOSX_IPHONE__

-    WX_UIView m_macToolbar; 
+    WX_UIView m_macToolbar;

 #endif
 };
 
 #endif
 };