mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-19 12:31:17 +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.
71 lines
2.3 KiB
C++
71 lines
2.3 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/msw/statbox.h
|
|
// Purpose: wxStaticBox class
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created: 01/02/97
|
|
// Copyright: (c) Julian Smart
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_MSW_STATBOX_H_
|
|
#define _WX_MSW_STATBOX_H_
|
|
|
|
// Group box
|
|
class WXDLLIMPEXP_CORE wxStaticBox : public wxStaticBoxBase
|
|
{
|
|
public:
|
|
wxStaticBox() { }
|
|
|
|
wxStaticBox(wxWindow *parent, wxWindowID id,
|
|
const wxString& label,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = 0,
|
|
const wxString& name = wxStaticBoxNameStr)
|
|
{
|
|
Create(parent, id, label, pos, size, style, name);
|
|
}
|
|
|
|
bool Create(wxWindow *parent, wxWindowID id,
|
|
const wxString& label,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = 0,
|
|
const wxString& name = wxStaticBoxNameStr);
|
|
|
|
/// Implementation only
|
|
virtual void GetBordersForSizer(int *borderTop, int *borderOther) const;
|
|
|
|
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
|
|
|
|
// returns true if the platform should explicitly apply a theme border
|
|
virtual bool CanApplyThemeBorder() const { return false; }
|
|
|
|
protected:
|
|
virtual wxSize DoGetBestSize() const;
|
|
|
|
public:
|
|
virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
|
|
|
|
protected:
|
|
// return the region with all the windows inside this static box excluded
|
|
virtual WXHRGN MSWGetRegionWithoutChildren();
|
|
|
|
// remove the parts which are painted by static box itself from the given
|
|
// region which is embedded in a rectangle (0, 0)-(w, h)
|
|
virtual void MSWGetRegionWithoutSelf(WXHRGN hrgn, int w, int h);
|
|
|
|
// paint the given rectangle with our background brush/colour
|
|
virtual void PaintBackground(wxDC& dc, const struct tagRECT& rc);
|
|
// paint the foreground of the static box
|
|
virtual void PaintForeground(wxDC& dc, const struct tagRECT& rc);
|
|
|
|
void OnPaint(wxPaintEvent& event);
|
|
|
|
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticBox);
|
|
};
|
|
|
|
#endif // _WX_MSW_STATBOX_H_
|
|
|