mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-14 10:09:13 +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.
53 lines
1.6 KiB
C++
53 lines
1.6 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/generic/private/notifmsg.h
|
|
// Purpose: wxGenericNotificationMessage declarations
|
|
// Author: Tobias Taschner
|
|
// Created: 2015-08-04
|
|
// Copyright: (c) 2015 wxWidgets development team
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_GENERIC_PRIVATE_NOTIFMSG_H_
|
|
#define _WX_GENERIC_PRIVATE_NOTIFMSG_H_
|
|
|
|
#include "wx/private/notifmsg.h"
|
|
|
|
class wxGenericNotificationMessageImpl : public wxNotificationMessageImpl
|
|
{
|
|
public:
|
|
wxGenericNotificationMessageImpl(wxNotificationMessageBase* notification);
|
|
|
|
virtual ~wxGenericNotificationMessageImpl();
|
|
|
|
virtual bool Show(int timeout) wxOVERRIDE;
|
|
|
|
virtual bool Close() wxOVERRIDE;
|
|
|
|
virtual void SetTitle(const wxString& title) wxOVERRIDE;
|
|
|
|
virtual void SetMessage(const wxString& message) wxOVERRIDE;
|
|
|
|
virtual void SetParent(wxWindow *parent) wxOVERRIDE;
|
|
|
|
virtual void SetFlags(int flags) wxOVERRIDE;
|
|
|
|
virtual void SetIcon(const wxIcon& icon) wxOVERRIDE;
|
|
|
|
virtual bool AddAction(wxWindowID actionid, const wxString &label) wxOVERRIDE;
|
|
|
|
// get/set the default timeout (used if Timeout_Auto is specified)
|
|
static int GetDefaultTimeout() { return ms_timeout; }
|
|
static void SetDefaultTimeout(int timeout);
|
|
|
|
private:
|
|
// default timeout
|
|
static int ms_timeout;
|
|
|
|
// notification message is represented by a frame in this implementation
|
|
class wxNotificationMessageWindow *m_window;
|
|
|
|
wxDECLARE_NO_COPY_CLASS(wxGenericNotificationMessageImpl);
|
|
};
|
|
|
|
#endif // _WX_GENERIC_PRIVATE_NOTIFMSG_H_
|