mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-13 09:39: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.
164 lines
5.0 KiB
C++
164 lines
5.0 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/osx/nonownedwnd.h
|
|
// Purpose: declares wxNonOwnedWindow class
|
|
// Author: Stefan Csomor
|
|
// Modified by:
|
|
// Created: 2008-03-24
|
|
// Copyright: (c) 2008 Stefan Csomor
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_MAC_NONOWNEDWND_H_
|
|
#define _WX_MAC_NONOWNEDWND_H_
|
|
|
|
#include "wx/window.h"
|
|
|
|
#include "wx/graphics.h"
|
|
|
|
#if wxUSE_SYSTEM_OPTIONS
|
|
#define wxMAC_WINDOW_PLAIN_TRANSITION wxT("mac.window-plain-transition")
|
|
#endif
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// wxNonOwnedWindow
|
|
//-----------------------------------------------------------------------------
|
|
|
|
// This class represents "non-owned" window. A window is owned by another
|
|
// window if it has a parent and is positioned within the parent. For example,
|
|
// wxFrame is non-owned, because even though it can have a parent, it's
|
|
// location is independent of it. This class is for internal use only, it's
|
|
// the base class for wxTopLevelWindow and wxPopupWindow.
|
|
|
|
class wxNonOwnedWindowImpl;
|
|
|
|
class WXDLLIMPEXP_CORE wxNonOwnedWindow : public wxNonOwnedWindowBase
|
|
{
|
|
public:
|
|
// constructors and such
|
|
wxNonOwnedWindow() { Init(); }
|
|
|
|
wxNonOwnedWindow(wxWindow *parent,
|
|
wxWindowID id,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = 0,
|
|
const wxString& name = wxPanelNameStr)
|
|
{
|
|
Init();
|
|
|
|
(void)Create(parent, id, pos, size, style, name);
|
|
}
|
|
|
|
bool Create(wxWindow *parent,
|
|
wxWindowID id,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = 0,
|
|
const wxString& name = wxPanelNameStr);
|
|
|
|
bool Create(wxWindow *parent, WXWindow nativeWindow);
|
|
|
|
virtual ~wxNonOwnedWindow();
|
|
|
|
virtual void SubclassWin(WXWindow nativeWindow);
|
|
virtual void UnsubclassWin();
|
|
|
|
virtual wxPoint GetClientAreaOrigin() const;
|
|
|
|
// implement base class pure virtuals
|
|
|
|
virtual bool SetTransparent(wxByte alpha);
|
|
virtual bool CanSetTransparent();
|
|
|
|
virtual bool SetBackgroundStyle(wxBackgroundStyle style);
|
|
|
|
virtual void Update();
|
|
|
|
WXWindow GetWXWindow() const ;
|
|
static wxNonOwnedWindow* GetFromWXWindow( WXWindow win );
|
|
|
|
// implementation from now on
|
|
// --------------------------
|
|
|
|
// These accessors are Mac-specific and don't exist in other ports.
|
|
const wxRegion& GetShape() const { return m_shape; }
|
|
#if wxUSE_GRAPHICS_CONTEXT
|
|
const wxGraphicsPath& GetShapePath() { return m_shapePath; }
|
|
#endif // wxUSE_GRAPHICS_CONTEXT
|
|
|
|
// activation hooks only necessary for MDI Implementation
|
|
static void MacDelayedDeactivation(long timestamp);
|
|
virtual void MacActivate( long timestamp , bool inIsActivating ) ;
|
|
|
|
virtual void SetWindowStyleFlag(long flags);
|
|
|
|
virtual void Raise();
|
|
virtual void Lower();
|
|
virtual bool Show( bool show = true );
|
|
|
|
virtual void SetExtraStyle(long exStyle) ;
|
|
|
|
virtual bool SetBackgroundColour( const wxColour &colour );
|
|
|
|
wxNonOwnedWindowImpl* GetNonOwnedPeer() const { return m_nowpeer; }
|
|
|
|
#if wxOSX_USE_COCOA_OR_IPHONE
|
|
// override the base class method to return an NSWindow instead of NSView
|
|
virtual void *OSXGetViewOrWindow() const;
|
|
#endif // Cocoa
|
|
|
|
// osx specific event handling common for all osx-ports
|
|
|
|
virtual void HandleActivated( double timestampsec, bool didActivate );
|
|
virtual void HandleResized( double timestampsec );
|
|
virtual void HandleMoved( double timestampsec );
|
|
virtual void HandleResizing( double timestampsec, wxRect* rect );
|
|
|
|
void OSXHandleMiniaturize(double WXUNUSED(timestampsec), bool miniaturized);
|
|
|
|
void WindowWasPainted();
|
|
|
|
virtual bool Destroy();
|
|
|
|
protected:
|
|
// common part of all ctors
|
|
void Init();
|
|
|
|
virtual void DoGetPosition( int *x, int *y ) const;
|
|
virtual void DoGetSize( int *width, int *height ) const;
|
|
virtual void DoMoveWindow(int x, int y, int width, int height);
|
|
virtual void DoGetClientSize(int *width, int *height) const;
|
|
|
|
virtual bool OSXShowWithEffect(bool show,
|
|
wxShowEffect effect,
|
|
unsigned timeout);
|
|
|
|
virtual bool DoClearShape();
|
|
virtual bool DoSetRegionShape(const wxRegion& region);
|
|
#if wxUSE_GRAPHICS_CONTEXT
|
|
virtual bool DoSetPathShape(const wxGraphicsPath& path);
|
|
#endif // wxUSE_GRAPHICS_CONTEXT
|
|
|
|
virtual void WillBeDestroyed();
|
|
|
|
wxNonOwnedWindowImpl* m_nowpeer ;
|
|
|
|
// wxWindowMac* m_macFocus ;
|
|
|
|
static wxNonOwnedWindow *s_macDeactivateWindow;
|
|
|
|
private :
|
|
static clock_t s_lastFlush;
|
|
|
|
wxRegion m_shape;
|
|
#if wxUSE_GRAPHICS_CONTEXT
|
|
wxGraphicsPath m_shapePath;
|
|
#endif // wxUSE_GRAPHICS_CONTEXT
|
|
};
|
|
|
|
// list of all frames and modeless dialogs
|
|
extern WXDLLIMPEXP_DATA_CORE(wxWindowList) wxModelessWindows;
|
|
|
|
|
|
#endif // _WX_MAC_NONOWNEDWND_H_
|