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.
72 lines
2.2 KiB
C++
72 lines
2.2 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/panel.h
|
|
// Purpose: Base header for wxPanel
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created:
|
|
// Copyright: (c) Julian Smart
|
|
// (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
|
|
// Licence: wxWindows Licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_PANEL_H_BASE_
|
|
#define _WX_PANEL_H_BASE_
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// headers and forward declarations
|
|
// ----------------------------------------------------------------------------
|
|
|
|
#include "wx/window.h"
|
|
#include "wx/containr.h"
|
|
|
|
class WXDLLIMPEXP_FWD_CORE wxControlContainer;
|
|
|
|
extern WXDLLIMPEXP_DATA_CORE(const char) wxPanelNameStr[];
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxPanel contains other controls and implements TAB traversal between them
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxPanelBase : public wxNavigationEnabled<wxWindow>
|
|
{
|
|
public:
|
|
wxPanelBase() { }
|
|
|
|
// Derived classes should also provide this constructor:
|
|
/*
|
|
wxPanelBase(wxWindow *parent,
|
|
wxWindowID winid = wxID_ANY,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = wxTAB_TRAVERSAL | wxNO_BORDER,
|
|
const wxString& name = wxPanelNameStr);
|
|
*/
|
|
|
|
// Pseudo ctor
|
|
bool Create(wxWindow *parent,
|
|
wxWindowID winid = wxID_ANY,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = wxTAB_TRAVERSAL | wxNO_BORDER,
|
|
const wxString& name = wxPanelNameStr);
|
|
|
|
|
|
// implementation from now on
|
|
// --------------------------
|
|
|
|
virtual void InitDialog() wxOVERRIDE;
|
|
|
|
private:
|
|
wxDECLARE_NO_COPY_CLASS(wxPanelBase);
|
|
};
|
|
|
|
#if defined(__WXUNIVERSAL__)
|
|
#include "wx/univ/panel.h"
|
|
#elif defined(__WXMSW__)
|
|
#include "wx/msw/panel.h"
|
|
#else
|
|
#define wxHAS_GENERIC_PANEL
|
|
#include "wx/generic/panelg.h"
|
|
#endif
|
|
|
|
#endif // _WX_PANELH_BASE_
|