mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-15 10:39:13 +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.
124 lines
4.0 KiB
C++
124 lines
4.0 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/generic/buttonbar.h
|
|
// Purpose: wxButtonToolBar declaration
|
|
// Author: Julian Smart, after Robert Roebling, Vadim Zeitlin, SciTech
|
|
// Modified by:
|
|
// Created: 2006-04-13
|
|
// Copyright: (c) Julian Smart, Robert Roebling, Vadim Zeitlin,
|
|
// SciTech Software, Inc.
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_BUTTONBAR_H_
|
|
#define _WX_BUTTONBAR_H_
|
|
|
|
#include "wx/bmpbuttn.h"
|
|
#include "wx/toolbar.h"
|
|
|
|
class WXDLLIMPEXP_FWD_CORE wxButtonToolBarTool;
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxButtonToolBar
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxButtonToolBar : public wxToolBarBase
|
|
{
|
|
public:
|
|
// construction/destruction
|
|
wxButtonToolBar() { Init(); }
|
|
wxButtonToolBar(wxWindow *parent,
|
|
wxWindowID id,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = 0,
|
|
const wxString& name = wxToolBarNameStr)
|
|
{
|
|
Init();
|
|
|
|
Create(parent, id, pos, size, style, name);
|
|
}
|
|
|
|
bool Create( wxWindow *parent,
|
|
wxWindowID id,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = 0,
|
|
const wxString& name = wxToolBarNameStr );
|
|
|
|
virtual ~wxButtonToolBar();
|
|
|
|
virtual bool Realize() wxOVERRIDE;
|
|
|
|
virtual void SetToolShortHelp(int id, const wxString& helpString) wxOVERRIDE;
|
|
virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const wxOVERRIDE;
|
|
|
|
protected:
|
|
// common part of all ctors
|
|
void Init();
|
|
|
|
// implement base class pure virtuals
|
|
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 wxToolBarToolBase *CreateTool(int id,
|
|
const wxString& label,
|
|
const wxBitmap& bmpNormal,
|
|
const wxBitmap& bmpDisabled,
|
|
wxItemKind kind,
|
|
wxObject *clientData,
|
|
const wxString& shortHelp,
|
|
const wxString& longHelp) wxOVERRIDE;
|
|
virtual wxToolBarToolBase *CreateTool(wxControl *control,
|
|
const wxString& label) wxOVERRIDE;
|
|
|
|
virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
|
|
|
|
// calculate layout
|
|
void DoLayout();
|
|
|
|
// get the bounding rect for the given tool
|
|
wxRect GetToolRect(wxToolBarToolBase *tool) const;
|
|
|
|
// get the rect limits depending on the orientation: top/bottom for a
|
|
// vertical toolbar, left/right for a horizontal one
|
|
void GetRectLimits(const wxRect& rect, wxCoord *start, wxCoord *end) const;
|
|
|
|
// receives button commands
|
|
void OnCommand(wxCommandEvent& event);
|
|
|
|
// paints a border
|
|
void OnPaint(wxPaintEvent& event);
|
|
|
|
// detects mouse clicks outside buttons
|
|
void OnLeftUp(wxMouseEvent& event);
|
|
|
|
private:
|
|
// have we calculated the positions of our tools?
|
|
bool m_needsLayout;
|
|
|
|
// the width of a separator
|
|
wxCoord m_widthSeparator;
|
|
|
|
// the total size of all toolbar elements
|
|
wxCoord m_maxWidth,
|
|
m_maxHeight;
|
|
|
|
// the height of a label
|
|
int m_labelHeight;
|
|
|
|
// the space above the label
|
|
int m_labelMargin;
|
|
|
|
private:
|
|
wxDECLARE_DYNAMIC_CLASS(wxButtonToolBar);
|
|
wxDECLARE_EVENT_TABLE();
|
|
};
|
|
|
|
#endif
|
|
// _WX_BUTTONBAR_H_
|
|
|