mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-19 12:31:17 +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.
76 lines
2.6 KiB
C++
76 lines
2.6 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: include/wx/msw/taskbarbutton.h
|
|
// Purpose: Defines wxTaskBarButtonImpl class.
|
|
// Author: Chaobin Zhang <zhchbin@gmail.com>
|
|
// Created: 2014-06-01
|
|
// Copyright: (c) 2014 wxWidgets development team
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_MSW_TASKBARBUTTON_H_
|
|
#define _WX_MSW_TASKBARBUTTON_H_
|
|
|
|
#include "wx/defs.h"
|
|
|
|
#if wxUSE_TASKBARBUTTON
|
|
|
|
#include "wx/vector.h"
|
|
#include "wx/taskbarbutton.h"
|
|
|
|
class WXDLLIMPEXP_FWD_CORE wxITaskbarList3;
|
|
|
|
class WXDLLIMPEXP_CORE wxTaskBarButtonImpl : public wxTaskBarButton
|
|
{
|
|
public:
|
|
virtual ~wxTaskBarButtonImpl();
|
|
|
|
virtual void SetProgressRange(int range) wxOVERRIDE;
|
|
virtual void SetProgressValue(int value) wxOVERRIDE;
|
|
virtual void PulseProgress() wxOVERRIDE;
|
|
virtual void Show(bool show = true) wxOVERRIDE;
|
|
virtual void Hide() wxOVERRIDE;
|
|
virtual void SetThumbnailTooltip(const wxString& tooltip) wxOVERRIDE;
|
|
virtual void SetProgressState(wxTaskBarButtonState state) wxOVERRIDE;
|
|
virtual void SetOverlayIcon(const wxIcon& icon,
|
|
const wxString& description = wxString()) wxOVERRIDE;
|
|
virtual void SetThumbnailClip(const wxRect& rect) wxOVERRIDE;
|
|
virtual void SetThumbnailContents(const wxWindow *child) wxOVERRIDE;
|
|
virtual bool InsertThumbBarButton(size_t pos,
|
|
wxThumbBarButton *button) wxOVERRIDE;
|
|
virtual bool AppendThumbBarButton(wxThumbBarButton *button) wxOVERRIDE;
|
|
virtual bool AppendSeparatorInThumbBar() wxOVERRIDE;
|
|
virtual wxThumbBarButton* RemoveThumbBarButton(
|
|
wxThumbBarButton *button) wxOVERRIDE;
|
|
virtual wxThumbBarButton* RemoveThumbBarButton(int id) wxOVERRIDE;
|
|
wxThumbBarButton* GetThumbBarButtonByIndex(size_t index);
|
|
bool InitOrUpdateThumbBarButtons();
|
|
virtual void Realize() wxOVERRIDE;
|
|
|
|
private:
|
|
// This ctor is only used by wxTaskBarButton::New()
|
|
wxTaskBarButtonImpl(wxITaskbarList3* taskbarList, wxWindow* parent);
|
|
|
|
wxWindow* m_parent;
|
|
wxITaskbarList3 *m_taskbarList;
|
|
|
|
typedef wxVector<wxThumbBarButton*> wxThumbBarButtons;
|
|
wxThumbBarButtons m_thumbBarButtons;
|
|
|
|
int m_progressRange;
|
|
int m_progressValue;
|
|
wxTaskBarButtonState m_progressState;
|
|
wxString m_thumbnailTooltip;
|
|
wxIcon m_overlayIcon;
|
|
wxString m_overlayIconDescription;
|
|
wxRect m_thumbnailClipRect;
|
|
bool m_hasInitThumbnailToolbar;
|
|
|
|
friend wxTaskBarButton* wxTaskBarButton::New(wxWindow*);
|
|
|
|
wxDECLARE_NO_COPY_CLASS(wxTaskBarButtonImpl);
|
|
};
|
|
|
|
#endif // wxUSE_TASKBARBUTTON
|
|
|
|
#endif // _WX_MSW_TASKBARBUTTON_H_
|