mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-09-22 12:21:41 +02: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.
109 lines
3.3 KiB
C++
109 lines
3.3 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/addremovectrl.h
|
|
// Purpose: wxAddRemoveCtrl declaration.
|
|
// Author: Vadim Zeitlin
|
|
// Created: 2015-01-29
|
|
// Copyright: (c) 2015 Vadim Zeitlin <vadim@wxwidgets.org>
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_ADDREMOVECTRL_H_
|
|
#define _WX_ADDREMOVECTRL_H_
|
|
|
|
#include "wx/panel.h"
|
|
|
|
#if wxUSE_ADDREMOVECTRL
|
|
|
|
extern WXDLLIMPEXP_DATA_ADV(const char) wxAddRemoveCtrlNameStr[];
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxAddRemoveAdaptor: used by wxAddRemoveCtrl to work with the list control
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_ADV wxAddRemoveAdaptor
|
|
{
|
|
public:
|
|
// Default ctor and trivial but virtual dtor.
|
|
wxAddRemoveAdaptor() { }
|
|
virtual ~wxAddRemoveAdaptor() { }
|
|
|
|
// Override to return the associated control.
|
|
virtual wxWindow* GetItemsCtrl() const = 0;
|
|
|
|
// Override to return whether a new item can be added to the control.
|
|
virtual bool CanAdd() const = 0;
|
|
|
|
// Override to return whether the currently selected item (if any) can be
|
|
// removed from the control.
|
|
virtual bool CanRemove() const = 0;
|
|
|
|
// Called when an item should be added, can only be called if CanAdd()
|
|
// currently returns true.
|
|
virtual void OnAdd() = 0;
|
|
|
|
// Called when the current item should be removed, can only be called if
|
|
// CanRemove() currently returns true.
|
|
virtual void OnRemove() = 0;
|
|
|
|
private:
|
|
wxDECLARE_NO_COPY_CLASS(wxAddRemoveAdaptor);
|
|
};
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxAddRemoveCtrl: a list-like control combined with add/remove buttons
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_ADV wxAddRemoveCtrl : public wxPanel
|
|
{
|
|
public:
|
|
wxAddRemoveCtrl()
|
|
{
|
|
Init();
|
|
}
|
|
|
|
wxAddRemoveCtrl(wxWindow* parent,
|
|
wxWindowID winid = wxID_ANY,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = 0,
|
|
const wxString& name = wxAddRemoveCtrlNameStr)
|
|
{
|
|
Init();
|
|
|
|
Create(parent, winid, pos, size, style, name);
|
|
}
|
|
|
|
bool Create(wxWindow* parent,
|
|
wxWindowID winid = wxID_ANY,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = 0,
|
|
const wxString& name = wxAddRemoveCtrlNameStr);
|
|
|
|
virtual ~wxAddRemoveCtrl();
|
|
|
|
// Must be called for the control to be usable, takes ownership of the
|
|
// pointer.
|
|
void SetAdaptor(wxAddRemoveAdaptor* adaptor);
|
|
|
|
// Set tooltips to use for the add and remove buttons.
|
|
void SetButtonsToolTips(const wxString& addtip, const wxString& removetip);
|
|
|
|
protected:
|
|
virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
|
|
|
|
private:
|
|
// Common part of all ctors.
|
|
void Init()
|
|
{
|
|
m_impl = NULL;
|
|
}
|
|
|
|
class wxAddRemoveImpl* m_impl;
|
|
|
|
wxDECLARE_NO_COPY_CLASS(wxAddRemoveCtrl);
|
|
};
|
|
|
|
#endif // wxUSE_ADDREMOVECTRL
|
|
|
|
#endif // _WX_ADDREMOVECTRL_H_
|