mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-13 01:29: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.
72 lines
2.2 KiB
C++
72 lines
2.2 KiB
C++
/////////////////////////////////////////////////////////////////////////
|
|
// File: wx/msw/taskbar.h
|
|
// Purpose: Defines wxTaskBarIcon class for manipulating icons on the
|
|
// Windows task bar.
|
|
// Author: Julian Smart
|
|
// Modified by: Vaclav Slavik
|
|
// Created: 24/3/98
|
|
// Copyright: (c) Julian Smart
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_TASKBAR_H_
|
|
#define _WX_TASKBAR_H_
|
|
|
|
#include "wx/icon.h"
|
|
|
|
// private helper class:
|
|
class WXDLLIMPEXP_FWD_ADV wxTaskBarIconWindow;
|
|
|
|
class WXDLLIMPEXP_ADV wxTaskBarIcon : public wxTaskBarIconBase
|
|
{
|
|
public:
|
|
wxTaskBarIcon(wxTaskBarIconType iconType = wxTBI_DEFAULT_TYPE);
|
|
virtual ~wxTaskBarIcon();
|
|
|
|
// Accessors
|
|
bool IsOk() const { return true; }
|
|
bool IsIconInstalled() const { return m_iconAdded; }
|
|
|
|
// Operations
|
|
bool SetIcon(const wxIcon& icon, const wxString& tooltip = wxEmptyString);
|
|
bool RemoveIcon(void);
|
|
bool PopupMenu(wxMenu *menu);
|
|
|
|
// MSW-specific class methods
|
|
|
|
#if wxUSE_TASKBARICON_BALLOONS
|
|
// show a balloon notification (the icon must have been already initialized
|
|
// using SetIcon)
|
|
//
|
|
// title and text are limited to 63 and 255 characters respectively, msec
|
|
// is the timeout, in milliseconds, before the balloon disappears (will be
|
|
// clamped down to the allowed 10-30s range by Windows if it's outside it)
|
|
// and flags can include wxICON_ERROR/INFO/WARNING to show a corresponding
|
|
// icon
|
|
//
|
|
// return true if balloon was shown, false on error (incorrect parameters
|
|
// or function unsupported by OS)
|
|
bool ShowBalloon(const wxString& title,
|
|
const wxString& text,
|
|
unsigned msec = 0,
|
|
int flags = 0,
|
|
const wxIcon& icon = wxNullIcon);
|
|
#endif // wxUSE_TASKBARICON_BALLOONS
|
|
|
|
protected:
|
|
friend class wxTaskBarIconWindow;
|
|
|
|
long WindowProc(unsigned int msg, unsigned int wParam, long lParam);
|
|
void RegisterWindowMessages();
|
|
|
|
|
|
wxTaskBarIconWindow *m_win;
|
|
bool m_iconAdded;
|
|
wxIcon m_icon;
|
|
wxString m_strTooltip;
|
|
|
|
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon);
|
|
};
|
|
|
|
#endif // _WX_TASKBAR_H_
|