mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-13 17:49:14 +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.
99 lines
3.0 KiB
C++
99 lines
3.0 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/generic/collpaneg.h
|
|
// Purpose: wxGenericCollapsiblePane
|
|
// Author: Francesco Montorsi
|
|
// Modified by:
|
|
// Created: 8/10/2006
|
|
// Copyright: (c) Francesco Montorsi
|
|
// Licence: wxWindows Licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_COLLAPSABLE_PANE_H_GENERIC_
|
|
#define _WX_COLLAPSABLE_PANE_H_GENERIC_
|
|
|
|
// forward declared
|
|
class WXDLLIMPEXP_FWD_CORE wxCollapsibleHeaderCtrl;
|
|
class WXDLLIMPEXP_FWD_CORE wxStaticLine;
|
|
|
|
#include "wx/containr.h"
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxGenericCollapsiblePane
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxGenericCollapsiblePane :
|
|
public wxNavigationEnabled<wxCollapsiblePaneBase>
|
|
{
|
|
public:
|
|
wxGenericCollapsiblePane() { Init(); }
|
|
|
|
wxGenericCollapsiblePane(wxWindow *parent,
|
|
wxWindowID winid,
|
|
const wxString& label,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = wxCP_DEFAULT_STYLE,
|
|
const wxValidator& val = wxDefaultValidator,
|
|
const wxString& name = wxCollapsiblePaneNameStr)
|
|
{
|
|
Init();
|
|
|
|
Create(parent, winid, label, pos, size, style, val, name);
|
|
}
|
|
|
|
virtual ~wxGenericCollapsiblePane();
|
|
|
|
bool Create(wxWindow *parent,
|
|
wxWindowID winid,
|
|
const wxString& label,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = wxCP_DEFAULT_STYLE,
|
|
const wxValidator& val = wxDefaultValidator,
|
|
const wxString& name = wxCollapsiblePaneNameStr);
|
|
|
|
// public wxCollapsiblePane API
|
|
virtual void Collapse(bool collapse = true) wxOVERRIDE;
|
|
virtual void SetLabel(const wxString &label) wxOVERRIDE;
|
|
|
|
virtual bool IsCollapsed() const wxOVERRIDE
|
|
{ return m_pPane==NULL || !m_pPane->IsShown(); }
|
|
virtual wxWindow *GetPane() const wxOVERRIDE
|
|
{ return m_pPane; }
|
|
virtual wxString GetLabel() const wxOVERRIDE;
|
|
|
|
virtual bool Layout() wxOVERRIDE;
|
|
|
|
|
|
// for the generic collapsible pane only:
|
|
wxControl* GetControlWidget() const
|
|
{ return (wxControl*)m_pButton; }
|
|
|
|
// implementation only, don't use
|
|
void OnStateChange(const wxSize& sizeNew);
|
|
|
|
protected:
|
|
// overridden methods
|
|
virtual wxSize DoGetBestSize() const wxOVERRIDE;
|
|
|
|
int GetBorder() const;
|
|
|
|
// child controls
|
|
wxCollapsibleHeaderCtrl *m_pButton;
|
|
wxStaticLine *m_pStaticLine;
|
|
wxWindow *m_pPane;
|
|
wxSizer *m_sz;
|
|
|
|
private:
|
|
void Init();
|
|
|
|
// event handlers
|
|
void OnButton(wxCommandEvent &ev);
|
|
void OnSize(wxSizeEvent &ev);
|
|
|
|
wxDECLARE_DYNAMIC_CLASS(wxGenericCollapsiblePane);
|
|
wxDECLARE_EVENT_TABLE();
|
|
};
|
|
|
|
#endif // _WX_COLLAPSABLE_PANE_H_GENERIC_
|