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.
107 lines
3.0 KiB
C++
107 lines
3.0 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/collheaderctrl.h
|
|
// Purpose: wxCollapsibleHeaderCtrl
|
|
// Author: Tobias Taschner
|
|
// Created: 2015-09-19
|
|
// Copyright: (c) 2015 wxWidgets development team
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_COLLAPSIBLEHEADER_CTRL_H_
|
|
#define _WX_COLLAPSIBLEHEADER_CTRL_H_
|
|
|
|
#include "wx/defs.h"
|
|
|
|
#if wxUSE_COLLPANE
|
|
|
|
#include "wx/control.h"
|
|
|
|
// class name
|
|
extern WXDLLIMPEXP_DATA_CORE(const char) wxCollapsibleHeaderCtrlNameStr[];
|
|
|
|
//
|
|
// wxGenericCollapsibleHeaderCtrl
|
|
//
|
|
|
|
class WXDLLIMPEXP_CORE wxCollapsibleHeaderCtrlBase : public wxControl
|
|
{
|
|
public:
|
|
wxCollapsibleHeaderCtrlBase() { }
|
|
|
|
wxCollapsibleHeaderCtrlBase(wxWindow *parent,
|
|
wxWindowID id,
|
|
const wxString& label,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = wxBORDER_NONE,
|
|
const wxValidator& validator = wxDefaultValidator,
|
|
const wxString& name = wxCollapsibleHeaderCtrlNameStr)
|
|
{
|
|
Create(parent, id, label, pos, size, style, validator, name);
|
|
}
|
|
|
|
bool Create(wxWindow *parent,
|
|
wxWindowID id,
|
|
const wxString& label,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = wxBORDER_NONE,
|
|
const wxValidator& validator = wxDefaultValidator,
|
|
const wxString& name = wxCollapsibleHeaderCtrlNameStr)
|
|
{
|
|
if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
|
|
return false;
|
|
|
|
SetLabel(label);
|
|
|
|
return true;
|
|
}
|
|
|
|
virtual void SetCollapsed(bool collapsed = true) = 0;
|
|
|
|
virtual bool IsCollapsed() const = 0;
|
|
|
|
private:
|
|
|
|
wxDECLARE_NO_COPY_CLASS(wxCollapsibleHeaderCtrlBase);
|
|
};
|
|
|
|
wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COLLAPSIBLEHEADER_CHANGED, wxCommandEvent);
|
|
|
|
#define wxCollapsibleHeaderChangedHandler(func) \
|
|
wxEVENT_HANDLER_CAST(wxCommandEventFunction, func)
|
|
|
|
#define EVT_COLLAPSIBLEHEADER_CHANGED(id, fn) \
|
|
wx__DECLARE_EVT1(wxEVT_COLLAPSIBLEHEADER_CHANGED, id, wxCollapsibleHeaderChangedHandler(fn))
|
|
|
|
// Currently there is only the native implementation, use it for all ports.
|
|
|
|
#include "wx/generic/collheaderctrl.h"
|
|
|
|
class WXDLLIMPEXP_CORE wxCollapsibleHeaderCtrl
|
|
: public wxGenericCollapsibleHeaderCtrl
|
|
{
|
|
public:
|
|
wxCollapsibleHeaderCtrl() { }
|
|
|
|
wxCollapsibleHeaderCtrl(wxWindow *parent,
|
|
wxWindowID id,
|
|
const wxString& label,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = wxBORDER_NONE,
|
|
const wxValidator& validator = wxDefaultValidator,
|
|
const wxString& name = wxCollapsibleHeaderCtrlNameStr)
|
|
{
|
|
Create(parent, id, label, pos, size, style, validator, name);
|
|
}
|
|
|
|
private:
|
|
|
|
wxDECLARE_NO_COPY_CLASS(wxCollapsibleHeaderCtrl);
|
|
};
|
|
|
|
#endif // wxUSE_COLLPANE
|
|
|
|
#endif // _WX_COLLAPSIBLEHEADER_CTRL_H_
|