Add wxToolBarBase::DoSetToolBitmapSize() which does everything that SetToolBitmapSize() used to do and make SetToolBitmapSize() itself also remember the size passed to it in a new field, so that we could check that we don't decrease the bitmap size below the size requested by the application, while still being able to decrease it if necessary due to a DPI change. This allows SetToolBitmapSize() to continue working as before, i.e. scale the bitmaps up if necessary without ever scaling them down, but also allows them to resize in both directions when DPI changes. Closes #22105.
133 lines
4.3 KiB
C++
133 lines
4.3 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/osx/toolbar.h
|
|
// Purpose: wxToolBar class
|
|
// Author: Stefan Csomor
|
|
// Modified by:
|
|
// Created: 1998-01-01
|
|
// Copyright: (c) Stefan Csomor
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_TOOLBAR_H_
|
|
#define _WX_TOOLBAR_H_
|
|
|
|
#if wxUSE_TOOLBAR
|
|
|
|
#include "wx/tbarbase.h"
|
|
#include "wx/dynarray.h"
|
|
|
|
class WXDLLIMPEXP_CORE wxToolBar: public wxToolBarBase
|
|
{
|
|
wxDECLARE_DYNAMIC_CLASS(wxToolBar);
|
|
public:
|
|
/*
|
|
* Public interface
|
|
*/
|
|
|
|
wxToolBar() { Init(); }
|
|
|
|
wxToolBar(wxWindow *parent, wxWindowID id,
|
|
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
|
|
long style = wxTB_DEFAULT_STYLE,
|
|
const wxString& name = wxASCII_STR(wxToolBarNameStr))
|
|
{
|
|
Init();
|
|
Create(parent, id, pos, size, style, name);
|
|
}
|
|
virtual ~wxToolBar();
|
|
|
|
bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
|
|
long style = wxTB_DEFAULT_STYLE,
|
|
const wxString& name = wxASCII_STR(wxToolBarNameStr));
|
|
|
|
virtual void SetWindowStyleFlag(long style) wxOVERRIDE;
|
|
|
|
virtual bool Destroy() wxOVERRIDE;
|
|
|
|
// override/implement base class virtuals
|
|
virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const wxOVERRIDE;
|
|
|
|
#ifndef __WXOSX_IPHONE__
|
|
virtual bool Show(bool show = true) wxOVERRIDE;
|
|
virtual bool IsShown() const wxOVERRIDE;
|
|
#endif
|
|
virtual bool Realize() wxOVERRIDE;
|
|
|
|
virtual wxSize GetToolSize() const wxOVERRIDE;
|
|
|
|
virtual void SetRows(int nRows) wxOVERRIDE;
|
|
|
|
|
|
virtual void SetToolNormalBitmap(int id, const wxBitmapBundle& bitmap) wxOVERRIDE;
|
|
virtual void SetToolDisabledBitmap(int id, const wxBitmapBundle& bitmap) wxOVERRIDE;
|
|
|
|
#ifndef __WXOSX_IPHONE__
|
|
// Add all the buttons
|
|
|
|
virtual wxString MacGetToolTipString( wxPoint &where ) wxOVERRIDE;
|
|
void OnPaint(wxPaintEvent& event) ;
|
|
void OnMouse(wxMouseEvent& event) ;
|
|
virtual void MacSuperChangedPosition() wxOVERRIDE;
|
|
#endif
|
|
|
|
#if wxOSX_USE_NATIVE_TOOLBAR
|
|
// make all tools selectable
|
|
void OSXSetSelectableTools(bool set);
|
|
void OSXSelectTool(int toolId);
|
|
|
|
bool MacInstallNativeToolbar(bool usesNative);
|
|
void MacUninstallNativeToolbar();
|
|
bool MacWantsNativeToolbar();
|
|
bool MacTopLevelHasNativeToolbar(bool *ownToolbarInstalled) const;
|
|
#endif
|
|
|
|
virtual wxToolBarToolBase *CreateTool(int id,
|
|
const wxString& label,
|
|
const wxBitmapBundle& bmpNormal,
|
|
const wxBitmapBundle& bmpDisabled = wxNullBitmap,
|
|
wxItemKind kind = wxITEM_NORMAL,
|
|
wxObject *clientData = NULL,
|
|
const wxString& shortHelp = wxEmptyString,
|
|
const wxString& longHelp = wxEmptyString) wxOVERRIDE;
|
|
virtual wxToolBarToolBase *CreateTool(wxControl *control,
|
|
const wxString& label) wxOVERRIDE;
|
|
|
|
protected:
|
|
// common part of all ctors
|
|
void Init();
|
|
|
|
void DoLayout();
|
|
|
|
void DoSetSize(int x, int y, int width, int height, int sizeFlags) wxOVERRIDE;
|
|
|
|
#ifndef __WXOSX_IPHONE__
|
|
virtual void DoGetSize(int *width, int *height) const wxOVERRIDE;
|
|
virtual wxSize DoGetBestSize() const wxOVERRIDE;
|
|
#endif
|
|
#ifdef __WXOSX_COCOA__
|
|
virtual void DoGetPosition(int*x, int *y) const wxOVERRIDE;
|
|
#endif
|
|
virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE;
|
|
virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE;
|
|
|
|
virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable) wxOVERRIDE;
|
|
virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle) wxOVERRIDE;
|
|
virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle) wxOVERRIDE;
|
|
|
|
virtual void DoSetToolBitmapSize(const wxSize& size) wxOVERRIDE;
|
|
|
|
wxDECLARE_EVENT_TABLE();
|
|
#if wxOSX_USE_NATIVE_TOOLBAR
|
|
bool m_macUsesNativeToolbar ;
|
|
void* m_macToolbar ;
|
|
#endif
|
|
#ifdef __WXOSX_IPHONE__
|
|
WX_UIView m_macToolbar;
|
|
#endif
|
|
};
|
|
|
|
#endif // wxUSE_TOOLBAR
|
|
|
|
#endif
|
|
// _WX_TOOLBAR_H_
|