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.
116 lines
3.9 KiB
C++
116 lines
3.9 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/x11/toplevel.h
|
|
// Purpose: wxTopLevelWindowX11 is the X11 implementation of wxTLW
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created: 20.09.01
|
|
// Copyright: (c) 2002 Julian Smart
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_X11_TOPLEVEL_H_
|
|
#define _WX_X11_TOPLEVEL_H_
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxTopLevelWindowX11
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxTopLevelWindowX11 : public wxTopLevelWindowBase
|
|
{
|
|
public:
|
|
// constructors and such
|
|
wxTopLevelWindowX11() { Init(); }
|
|
|
|
wxTopLevelWindowX11(wxWindow *parent,
|
|
wxWindowID id,
|
|
const wxString& title,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = wxDEFAULT_FRAME_STYLE,
|
|
const wxString& name = wxFrameNameStr)
|
|
{
|
|
Init();
|
|
|
|
(void)Create(parent, id, title, pos, size, style, name);
|
|
}
|
|
|
|
bool Create(wxWindow *parent,
|
|
wxWindowID id,
|
|
const wxString& title,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = wxDEFAULT_FRAME_STYLE,
|
|
const wxString& name = wxFrameNameStr);
|
|
|
|
virtual ~wxTopLevelWindowX11();
|
|
|
|
// implement base class pure virtuals
|
|
virtual void Maximize(bool maximize = true);
|
|
virtual bool IsMaximized() const;
|
|
virtual void Iconize(bool iconize = true);
|
|
virtual bool IsIconized() const;
|
|
virtual void SetIcons(const wxIconBundle& icons);
|
|
virtual void Restore();
|
|
|
|
virtual bool Show( bool show = true );
|
|
|
|
virtual bool ShowFullScreen( bool show, long style = wxFULLSCREEN_ALL );
|
|
virtual bool IsFullScreen() const { return m_fsIsShowing; }
|
|
|
|
virtual void SetTitle( const wxString& title);
|
|
virtual wxString GetTitle() const;
|
|
|
|
// implementation
|
|
void SetNeedResizeInIdle( bool set = true )
|
|
{ m_needResizeInIdle = set; }
|
|
void SetConfigureGeometry( int x, int y, int width, int height )
|
|
{ m_x = x; m_y = y; m_width = width; m_height = height; }
|
|
|
|
virtual bool SetShape(const wxRegion& region);
|
|
|
|
// For implementation purposes - sometimes decorations make the
|
|
// client area smaller
|
|
virtual wxPoint GetClientAreaOrigin() const;
|
|
|
|
virtual void OnInternalIdle();
|
|
|
|
protected:
|
|
// common part of all ctors
|
|
void Init();
|
|
|
|
// set the icon for the window
|
|
void DoSetIcon( const wxIcon& icon );
|
|
|
|
// For implementation of delayed resize events
|
|
bool m_needResizeInIdle;
|
|
|
|
virtual void DoGetClientSize( int *width, int *height ) const;
|
|
virtual void DoGetSize( int *width, int *height ) const;
|
|
virtual void DoSetClientSize(int width, int height);
|
|
virtual void DoSetSize(int x, int y,
|
|
int width, int height,
|
|
int sizeFlags = wxSIZE_AUTO);
|
|
virtual void DoGetPosition( int *x, int *y ) const;
|
|
|
|
// Is the frame currently iconized?
|
|
bool m_iconized;
|
|
|
|
// Should the frame be maximized when it will be shown? set by Maximize()
|
|
// when it is called while the frame is hidden
|
|
bool m_maximizeOnShow;
|
|
|
|
// Data to save/restore when calling ShowFullScreen
|
|
long m_fsStyle; // Passed to ShowFullScreen
|
|
wxRect m_fsOldSize;
|
|
bool m_fsIsMaximized;
|
|
bool m_fsIsShowing;
|
|
wxString m_title;
|
|
|
|
// Geometry
|
|
int m_x,m_y,m_width,m_height;
|
|
};
|
|
|
|
// list of all frames and modeless dialogs
|
|
//extern WXDLLIMPEXP_DATA_CORE(wxWindowList) wxModelessWindows;
|
|
|
|
#endif // _WX_X11_TOPLEVEL_H_
|