mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-13 09:39:11 +01:00
822326eea9
From wxWidgets master 81570ae070b35c9d52de47b1f14897f3ff1a66c7. include/wx/defs.h -- __w64 warning disable patch by comex brought forward. include/wx/msw/window.h -- added GetContentScaleFactor() which was not implemented on Windows but is necessary for wxBitmap scaling on Mac OS X so it needs to work to avoid #ifdef-ing the code. src/gtk/window.cpp -- Modified DoSetClientSize() to direct call wxWindowGTK::DoSetSize() instead of using public wxWindowBase::SetSize() which now prevents derived classes (like wxAuiToolbar) intercepting the call and breaking it. This matches Windows which does NOT need to call DoSetSize internally. End result is this fixes Dolphin's debug tools toolbars on Linux. src/osx/window_osx.cpp -- Same fix as for GTK since it has the same issue. src/msw/radiobox.cpp -- Hacked to fix display in HiDPI (was clipping off end of text). Updated CMakeLists for Linux and Mac OS X. Small code changes to Dolphin to fix debug error boxes, deprecation warnings, and retain previous UI behavior on Windows.
131 lines
4.3 KiB
C++
131 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 = 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 = 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 void SetToolBitmapSize(const wxSize& size) wxOVERRIDE;
|
|
virtual wxSize GetToolSize() const wxOVERRIDE;
|
|
|
|
virtual void SetRows(int nRows) wxOVERRIDE;
|
|
|
|
virtual void SetToolNormalBitmap(int id, const wxBitmap& bitmap) wxOVERRIDE;
|
|
virtual void SetToolDisabledBitmap(int id, const wxBitmap& 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 wxBitmap& bmpNormal,
|
|
const wxBitmap& 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;
|
|
|
|
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_
|