mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-09-22 20:31:50 +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.
103 lines
3.1 KiB
C++
103 lines
3.1 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/statline.h
|
|
// Purpose: wxStaticLine class interface
|
|
// Author: Vadim Zeitlin
|
|
// Created: 28.06.99
|
|
// Copyright: (c) 1999 Vadim Zeitlin
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_STATLINE_H_BASE_
|
|
#define _WX_STATLINE_H_BASE_
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// headers
|
|
// ----------------------------------------------------------------------------
|
|
|
|
// this defines wxUSE_STATLINE
|
|
#include "wx/defs.h"
|
|
|
|
#if wxUSE_STATLINE
|
|
|
|
// the base class declaration
|
|
#include "wx/control.h"
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// global variables
|
|
// ----------------------------------------------------------------------------
|
|
|
|
// the default name for objects of class wxStaticLine
|
|
extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticLineNameStr[];
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxStaticLine - a line in a dialog
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxStaticLineBase : public wxControl
|
|
{
|
|
public:
|
|
// constructor
|
|
wxStaticLineBase() { }
|
|
|
|
// is the line vertical?
|
|
bool IsVertical() const { return (GetWindowStyle() & wxLI_VERTICAL) != 0; }
|
|
|
|
// get the default size for the "lesser" dimension of the static line
|
|
static int GetDefaultSize() { return 2; }
|
|
|
|
// overridden base class virtuals
|
|
virtual bool AcceptsFocus() const wxOVERRIDE { return false; }
|
|
|
|
protected:
|
|
// choose the default border for this window
|
|
virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
|
|
|
|
// set the right size for the right dimension
|
|
wxSize AdjustSize(const wxSize& size) const
|
|
{
|
|
wxSize sizeReal(size);
|
|
if ( IsVertical() )
|
|
{
|
|
if ( size.x == wxDefaultCoord )
|
|
sizeReal.x = GetDefaultSize();
|
|
}
|
|
else
|
|
{
|
|
if ( size.y == wxDefaultCoord )
|
|
sizeReal.y = GetDefaultSize();
|
|
}
|
|
|
|
return sizeReal;
|
|
}
|
|
|
|
virtual wxSize DoGetBestSize() const wxOVERRIDE
|
|
{
|
|
return AdjustSize(wxDefaultSize);
|
|
}
|
|
|
|
wxDECLARE_NO_COPY_CLASS(wxStaticLineBase);
|
|
};
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// now include the actual class declaration
|
|
// ----------------------------------------------------------------------------
|
|
|
|
#if defined(__WXUNIVERSAL__)
|
|
#include "wx/univ/statline.h"
|
|
#elif defined(__WXMSW__)
|
|
#include "wx/msw/statline.h"
|
|
#elif defined(__WXGTK20__)
|
|
#include "wx/gtk/statline.h"
|
|
#elif defined(__WXGTK__)
|
|
#include "wx/gtk1/statline.h"
|
|
#elif defined(__WXMAC__)
|
|
#include "wx/osx/statline.h"
|
|
#elif defined(__WXQT__)
|
|
#include "wx/qt/statline.h"
|
|
#else // use generic implementation for all other platforms
|
|
#include "wx/generic/statline.h"
|
|
#endif
|
|
|
|
#endif // wxUSE_STATLINE
|
|
|
|
#endif // _WX_STATLINE_H_BASE_
|