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.
95 lines
2.4 KiB
C++
95 lines
2.4 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/generic/caret.h
|
|
// Purpose: generic wxCaret class
|
|
// Author: Vadim Zeitlin (original code by Robert Roebling)
|
|
// Modified by:
|
|
// Created: 25.05.99
|
|
// Copyright: (c) wxWidgets team
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_CARET_H_
|
|
#define _WX_CARET_H_
|
|
|
|
#include "wx/timer.h"
|
|
#include "wx/dc.h"
|
|
#include "wx/overlay.h"
|
|
|
|
#ifdef wxHAS_NATIVE_OVERLAY
|
|
#define wxHAS_CARET_USING_OVERLAYS
|
|
#endif
|
|
|
|
class WXDLLIMPEXP_FWD_CORE wxCaret;
|
|
|
|
class WXDLLIMPEXP_CORE wxCaretTimer : public wxTimer
|
|
{
|
|
public:
|
|
wxCaretTimer(wxCaret *caret);
|
|
virtual void Notify() wxOVERRIDE;
|
|
|
|
private:
|
|
wxCaret *m_caret;
|
|
};
|
|
|
|
class WXDLLIMPEXP_CORE wxCaret : public wxCaretBase
|
|
{
|
|
public:
|
|
// ctors
|
|
// -----
|
|
// default - use Create()
|
|
wxCaret() : m_timer(this) { InitGeneric(); }
|
|
// creates a block caret associated with the given window
|
|
wxCaret(wxWindowBase *window, int width, int height)
|
|
: wxCaretBase(window, width, height), m_timer(this) { InitGeneric(); }
|
|
wxCaret(wxWindowBase *window, const wxSize& size)
|
|
: wxCaretBase(window, size), m_timer(this) { InitGeneric(); }
|
|
|
|
virtual ~wxCaret();
|
|
|
|
// implementation
|
|
// --------------
|
|
|
|
// called by wxWindow (not using the event tables)
|
|
virtual void OnSetFocus() wxOVERRIDE;
|
|
virtual void OnKillFocus() wxOVERRIDE;
|
|
|
|
// called by wxCaretTimer
|
|
void OnTimer();
|
|
|
|
protected:
|
|
virtual void DoShow() wxOVERRIDE;
|
|
virtual void DoHide() wxOVERRIDE;
|
|
virtual void DoMove() wxOVERRIDE;
|
|
virtual void DoSize() wxOVERRIDE;
|
|
|
|
// blink the caret once
|
|
void Blink();
|
|
|
|
// refresh the caret
|
|
void Refresh();
|
|
|
|
// draw the caret on the given DC
|
|
void DoDraw(wxDC *dc, wxWindow* win);
|
|
|
|
private:
|
|
// GTK specific initialization
|
|
void InitGeneric();
|
|
|
|
#ifdef wxHAS_CARET_USING_OVERLAYS
|
|
// the overlay for displaying the caret
|
|
wxOverlay m_overlay;
|
|
#else
|
|
// the bitmap holding the part of window hidden by the caret when it was
|
|
// at (m_xOld, m_yOld)
|
|
wxBitmap m_bmpUnderCaret;
|
|
int m_xOld,
|
|
m_yOld;
|
|
#endif
|
|
|
|
wxCaretTimer m_timer;
|
|
bool m_blinkedOut, // true => caret hidden right now
|
|
m_hasFocus; // true => our window has focus
|
|
};
|
|
|
|
#endif // _WX_CARET_H_
|