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.
109 lines
3.8 KiB
C++
109 lines
3.8 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/osx/toplevel.h
|
|
// Purpose: wxTopLevelWindowMac is the Mac implementation of wxTLW
|
|
// Author: Stefan Csomor
|
|
// Modified by:
|
|
// Created: 20.09.01
|
|
// Copyright: (c) 2001 Stefan Csomor
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_MSW_TOPLEVEL_H_
|
|
#define _WX_MSW_TOPLEVEL_H_
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxTopLevelWindowMac
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxTopLevelWindowMac : public wxTopLevelWindowBase
|
|
{
|
|
public:
|
|
// constructors and such
|
|
wxTopLevelWindowMac() { Init(); }
|
|
|
|
wxTopLevelWindowMac(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);
|
|
}
|
|
|
|
virtual ~wxTopLevelWindowMac();
|
|
|
|
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);
|
|
|
|
bool Create(wxWindow *parent, WXWindow nativeWindow);
|
|
|
|
virtual bool Destroy() wxOVERRIDE;
|
|
|
|
virtual wxPoint GetClientAreaOrigin() const wxOVERRIDE;
|
|
|
|
// Attracts the users attention to this window if the application is
|
|
// inactive (should be called when a background event occurs)
|
|
virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO) wxOVERRIDE;
|
|
|
|
// implement base class pure virtuals
|
|
virtual void Maximize(bool maximize = true) wxOVERRIDE;
|
|
virtual bool IsMaximized() const wxOVERRIDE;
|
|
virtual void Iconize(bool iconize = true) wxOVERRIDE;
|
|
virtual bool IsIconized() const wxOVERRIDE;
|
|
virtual void Restore() wxOVERRIDE;
|
|
|
|
virtual bool IsActive() wxOVERRIDE;
|
|
|
|
virtual void ShowWithoutActivating() wxOVERRIDE;
|
|
bool EnableFullScreenView(bool enable = true) wxOVERRIDE;
|
|
virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) wxOVERRIDE;
|
|
virtual bool IsFullScreen() const wxOVERRIDE;
|
|
|
|
// implementation from now on
|
|
// --------------------------
|
|
|
|
virtual void SetTitle( const wxString& title) wxOVERRIDE;
|
|
virtual wxString GetTitle() const wxOVERRIDE;
|
|
|
|
// EnableCloseButton(false) used to disable the "Close"
|
|
// button on the title bar
|
|
virtual bool EnableCloseButton(bool enable = true) wxOVERRIDE;
|
|
virtual bool EnableMaximizeButton(bool enable = true) wxOVERRIDE;
|
|
virtual bool EnableMinimizeButton(bool enable = true) wxOVERRIDE;
|
|
|
|
virtual void SetLabel(const wxString& label) wxOVERRIDE { SetTitle( label ); }
|
|
virtual wxString GetLabel() const wxOVERRIDE { return GetTitle(); }
|
|
|
|
virtual void OSXSetModified(bool modified) wxOVERRIDE;
|
|
virtual bool OSXIsModified() const wxOVERRIDE;
|
|
|
|
virtual void SetRepresentedFilename(const wxString& filename) wxOVERRIDE;
|
|
|
|
// do *not* call this to iconize the frame, this is a private function!
|
|
void OSXSetIconizeState(bool iconic);
|
|
|
|
protected:
|
|
// common part of all ctors
|
|
void Init();
|
|
|
|
// 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;
|
|
|
|
private :
|
|
wxDECLARE_EVENT_TABLE();
|
|
};
|
|
|
|
#endif // _WX_MSW_TOPLEVEL_H_
|