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.
113 lines
3.5 KiB
C++
113 lines
3.5 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/nonownedwnd.h
|
|
// Purpose: declares wxNonTopLevelWindow class
|
|
// Author: Vaclav Slavik
|
|
// Modified by:
|
|
// Created: 2006-12-24
|
|
// Copyright: (c) 2006 TT-Solutions
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_NONOWNEDWND_H_
|
|
#define _WX_NONOWNEDWND_H_
|
|
|
|
#include "wx/window.h"
|
|
|
|
// Styles that can be used with any wxNonOwnedWindow:
|
|
#define wxFRAME_SHAPED 0x0010 // Create a window that is able to be shaped
|
|
|
|
class WXDLLIMPEXP_FWD_CORE wxGraphicsPath;
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxNonOwnedWindow: a window that is not a child window of another one.
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxNonOwnedWindowBase : public wxWindow
|
|
{
|
|
public:
|
|
// Set the shape of the window to the given region.
|
|
// Returns true if the platform supports this feature (and the
|
|
// operation is successful.)
|
|
bool SetShape(const wxRegion& region)
|
|
{
|
|
// This style is in fact only needed by wxOSX/Carbon so once we don't
|
|
// use this port any more, we could get rid of this requirement, but
|
|
// for now you must specify wxFRAME_SHAPED for SetShape() to work on
|
|
// all platforms.
|
|
wxCHECK_MSG
|
|
(
|
|
HasFlag(wxFRAME_SHAPED), false,
|
|
wxS("Shaped windows must be created with the wxFRAME_SHAPED style.")
|
|
);
|
|
|
|
return region.IsEmpty() ? DoClearShape() : DoSetRegionShape(region);
|
|
}
|
|
|
|
#if wxUSE_GRAPHICS_CONTEXT
|
|
// Set the shape using the specified path.
|
|
bool SetShape(const wxGraphicsPath& path)
|
|
{
|
|
wxCHECK_MSG
|
|
(
|
|
HasFlag(wxFRAME_SHAPED), false,
|
|
wxS("Shaped windows must be created with the wxFRAME_SHAPED style.")
|
|
);
|
|
|
|
return DoSetPathShape(path);
|
|
}
|
|
#endif // wxUSE_GRAPHICS_CONTEXT
|
|
|
|
|
|
// Overridden base class methods.
|
|
// ------------------------------
|
|
|
|
virtual void AdjustForParentClientOrigin(int& WXUNUSED(x), int& WXUNUSED(y),
|
|
int WXUNUSED(sizeFlags) = 0) const wxOVERRIDE
|
|
{
|
|
// Non owned windows positions don't need to be adjusted for parent
|
|
// client area origin so simply do nothing here.
|
|
}
|
|
|
|
virtual void InheritAttributes() wxOVERRIDE
|
|
{
|
|
// Non owned windows don't inherit attributes from their parent window
|
|
// (if the parent frame is red, it doesn't mean that all dialogs shown
|
|
// by it should be red as well), so don't do anything here neither.
|
|
}
|
|
|
|
protected:
|
|
virtual bool DoClearShape()
|
|
{
|
|
return false;
|
|
}
|
|
|
|
virtual bool DoSetRegionShape(const wxRegion& WXUNUSED(region))
|
|
{
|
|
return false;
|
|
}
|
|
|
|
#if wxUSE_GRAPHICS_CONTEXT
|
|
virtual bool DoSetPathShape(const wxGraphicsPath& WXUNUSED(path))
|
|
{
|
|
return false;
|
|
}
|
|
#endif // wxUSE_GRAPHICS_CONTEXT
|
|
};
|
|
|
|
#if defined(__WXDFB__)
|
|
#include "wx/dfb/nonownedwnd.h"
|
|
#elif defined(__WXGTK20__)
|
|
#include "wx/gtk/nonownedwnd.h"
|
|
#elif defined(__WXMAC__)
|
|
#include "wx/osx/nonownedwnd.h"
|
|
#elif defined(__WXMSW__)
|
|
#include "wx/msw/nonownedwnd.h"
|
|
#else
|
|
// No special class needed in other ports, they can derive both wxTLW and
|
|
// wxPopupWindow directly from wxWindow and don't implement SetShape().
|
|
class wxNonOwnedWindow : public wxNonOwnedWindowBase
|
|
{
|
|
};
|
|
#endif
|
|
|
|
#endif // _WX_NONOWNEDWND_H_
|