mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-13 01:29: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.
62 lines
2.0 KiB
C++
62 lines
2.0 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/generic/statline.h
|
|
// Purpose: a generic wxStaticLine class
|
|
// Author: Vadim Zeitlin
|
|
// Created: 28.06.99
|
|
// Copyright: (c) 1998 Vadim Zeitlin
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_GENERIC_STATLINE_H_
|
|
#define _WX_GENERIC_STATLINE_H_
|
|
|
|
class wxStaticBox;
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxStaticLine
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxStaticLine : public wxStaticLineBase
|
|
{
|
|
wxDECLARE_DYNAMIC_CLASS(wxStaticLine);
|
|
|
|
public:
|
|
// constructors and pseudo-constructors
|
|
wxStaticLine() { m_statbox = NULL; }
|
|
|
|
wxStaticLine( wxWindow *parent,
|
|
wxWindowID id = wxID_ANY,
|
|
const wxPoint &pos = wxDefaultPosition,
|
|
const wxSize &size = wxDefaultSize,
|
|
long style = wxLI_HORIZONTAL,
|
|
const wxString &name = wxStaticLineNameStr )
|
|
{
|
|
Create(parent, id, pos, size, style, name);
|
|
}
|
|
|
|
virtual ~wxStaticLine();
|
|
|
|
bool Create( wxWindow *parent,
|
|
wxWindowID id = wxID_ANY,
|
|
const wxPoint &pos = wxDefaultPosition,
|
|
const wxSize &size = wxDefaultSize,
|
|
long style = wxLI_HORIZONTAL,
|
|
const wxString &name = wxStaticLineNameStr );
|
|
|
|
// it's necessary to override this wxWindow function because we
|
|
// will want to return the main widget for m_statbox
|
|
//
|
|
WXWidget GetMainWidget() const;
|
|
|
|
// override wxWindow methods to make things work
|
|
virtual void DoSetSize(int x, int y, int width, int height,
|
|
int sizeFlags = wxSIZE_AUTO);
|
|
virtual void DoMoveWindow(int x, int y, int width, int height);
|
|
protected:
|
|
// we implement the static line using a static box
|
|
wxStaticBox *m_statbox;
|
|
};
|
|
|
|
#endif // _WX_GENERIC_STATLINE_H_
|
|
|