X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/336a6aba60f239bfc33650ffe97702494940a4f6..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/include/wx/mac/carbon/toolbar.h diff --git a/include/wx/mac/carbon/toolbar.h b/include/wx/mac/carbon/toolbar.h index 1aab6d801d..95987b58a0 100644 --- a/include/wx/mac/carbon/toolbar.h +++ b/include/wx/mac/carbon/toolbar.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: toolbar.h +// Name: wx/mac/carbon/toolbar.h // Purpose: wxToolBar class // Author: Stefan Csomor // Modified by: @@ -12,16 +12,12 @@ #ifndef _WX_TOOLBAR_H_ #define _WX_TOOLBAR_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "toolbar.h" -#endif - #if wxUSE_TOOLBAR #include "wx/tbarbase.h" #include "wx/dynarray.h" -WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr; +WXDLLEXPORT_DATA(extern const char) wxToolBarNameStr[]; class WXDLLEXPORT wxToolBar: public wxToolBarBase { @@ -33,7 +29,6 @@ class WXDLLEXPORT wxToolBar: public wxToolBarBase wxToolBar() { Init(); } - inline wxToolBar(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER|wxTB_HORIZONTAL, @@ -42,15 +37,19 @@ class WXDLLEXPORT wxToolBar: public wxToolBarBase Init(); Create(parent, id, pos, size, style, name); } - ~wxToolBar(); + virtual ~wxToolBar(); bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER|wxTB_HORIZONTAL, const wxString& name = wxToolBarNameStr); + virtual void SetWindowStyleFlag(long style); + // override/implement base class virtuals virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const; + virtual bool Show(bool show = true); + virtual bool IsShown() const; virtual bool Realize(); virtual void SetToolBitmapSize(const wxSize& size); @@ -58,17 +57,27 @@ class WXDLLEXPORT wxToolBar: public wxToolBarBase virtual void SetRows(int nRows); - // Add all the buttons + virtual void SetToolNormalBitmap(int id, const wxBitmap& bitmap); + virtual void SetToolDisabledBitmap(int id, const wxBitmap& bitmap); + + // Add all the buttons virtual wxString MacGetToolTipString( wxPoint &where ) ; void OnPaint(wxPaintEvent& event) ; void OnMouse(wxMouseEvent& event) ; virtual void MacSuperChangedPosition() ; + +#if wxMAC_USE_NATIVE_TOOLBAR + bool MacInstallNativeToolbar(bool usesNative); + bool MacWantsNativeToolbar(); + bool MacTopLevelHasNativeToolbar(bool *ownToolbarInstalled) const; +#endif protected: // common part of all ctors void Init(); - // implement base class pure virtuals + virtual void DoGetSize(int *width, int *height) const; + virtual wxSize DoGetBestSize() const; virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool); virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool); @@ -84,9 +93,14 @@ protected: wxObject *clientData, const wxString& shortHelp, const wxString& longHelp); - virtual wxToolBarToolBase *CreateTool(wxControl *control); + virtual wxToolBarToolBase *CreateTool(wxControl *control, + const wxString& label); DECLARE_EVENT_TABLE() +#if wxMAC_USE_NATIVE_TOOLBAR + bool m_macUsesNativeToolbar ; + void* m_macHIToolbarRef ; +#endif }; #endif // wxUSE_TOOLBAR