guarding agains NULL

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

diff --git a/include/wx/osx/toolbar.h b/include/wx/osx/toolbar.h
index df388af6eb3635fe6caa4fb05799911e7eb1f758..4bed1ab647448c6a7fd3de49dbebb0367db740c7 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)


@@ -44,7 +42,7 @@ class WXDLLIMPEXP_CORE wxToolBar: public wxToolBarBase
             const wxString& name = wxToolBarNameStr);
 
     virtual void SetWindowStyleFlag(long style);
             const wxString& name = wxToolBarNameStr);
 
     virtual void SetWindowStyleFlag(long style);

-    
+

     virtual bool Destroy();
 
     // override/implement base class virtuals
     virtual bool Destroy();
 
     // override/implement base class virtuals


@@ -72,20 +70,39 @@ 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);
     void MacUninstallNativeToolbar();
     bool MacWantsNativeToolbar();
     bool MacTopLevelHasNativeToolbar(bool *ownToolbarInstalled) const;
 #endif
 #if wxOSX_USE_NATIVE_TOOLBAR
     bool MacInstallNativeToolbar(bool usesNative);
     void MacUninstallNativeToolbar();
     bool MacWantsNativeToolbar();
     bool MacTopLevelHasNativeToolbar(bool *ownToolbarInstalled) const;
 #endif

+
+    virtual wxToolBarToolBase *CreateTool(int id,
+                                          const wxString& label,
+                                          const wxBitmap& bmpNormal,
+                                          const wxBitmap& bmpDisabled = wxNullBitmap,
+                                          wxItemKind kind = wxITEM_NORMAL,
+                                          wxObject *clientData = NULL,
+                                          const wxString& shortHelp = wxEmptyString,
+                                          const wxString& longHelp = wxEmptyString);
+    virtual wxToolBarToolBase *CreateTool(wxControl *control,
+                                          const wxString& label);
+

 protected:
     // common part of all ctors
     void Init();
 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__
 
 #ifndef __WXOSX_IPHONE__

-   virtual void DoGetSize(int *width, int *height) const;
+    virtual void DoGetSize(int *width, int *height) const;

     virtual wxSize DoGetBestSize() const;
     virtual wxSize DoGetBestSize() const;

+#endif
+#ifdef __WXOSX_COCOA__
+    virtual void DoGetPosition(int*x, int *y) const;

 #endif
     virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
     virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);
 #endif
     virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
     virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);


@@ -94,24 +111,13 @@ protected:
     virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle);
     virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
 
     virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle);
     virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
 

-    virtual wxToolBarToolBase *CreateTool(int id,
-                                          const wxString& label,
-                                          const wxBitmap& bmpNormal,
-                                          const wxBitmap& bmpDisabled,
-                                          wxItemKind kind,
-                                          wxObject *clientData,
-                                          const wxString& shortHelp,
-                                          const wxString& longHelp);
-    virtual wxToolBarToolBase *CreateTool(wxControl *control,
-                                          const wxString& label);
-

     DECLARE_EVENT_TABLE()
 #if wxOSX_USE_NATIVE_TOOLBAR
     bool m_macUsesNativeToolbar ;
     void* m_macToolbar ;
 #endif
 #ifdef __WXOSX_IPHONE__
     DECLARE_EVENT_TABLE()
 #if wxOSX_USE_NATIVE_TOOLBAR
     bool m_macUsesNativeToolbar ;
     void* m_macToolbar ;
 #endif
 #ifdef __WXOSX_IPHONE__

-    WX_UIView m_macToolbar; 
+    WX_UIView m_macToolbar;

 #endif
 };
 
 #endif
 };