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.
143 lines
4.4 KiB
C++
143 lines
4.4 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/gauge.h
|
|
// Purpose: wxGauge interface
|
|
// Author: Vadim Zeitlin
|
|
// Modified by:
|
|
// Created: 20.02.01
|
|
// Copyright: (c) 1996-2001 wxWidgets team
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_GAUGE_H_BASE_
|
|
#define _WX_GAUGE_H_BASE_
|
|
|
|
#include "wx/defs.h"
|
|
|
|
#if wxUSE_GAUGE
|
|
|
|
#include "wx/control.h"
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxGauge style flags
|
|
// ----------------------------------------------------------------------------
|
|
|
|
#define wxGA_HORIZONTAL wxHORIZONTAL
|
|
#define wxGA_VERTICAL wxVERTICAL
|
|
|
|
// Available since Windows 7 only. With this style, the value of guage will
|
|
// reflect on the taskbar button.
|
|
#define wxGA_PROGRESS 0x0010
|
|
// Win32 only, is default (and only) on some other platforms
|
|
#define wxGA_SMOOTH 0x0020
|
|
// QT only, display current completed percentage (text default format "%p%")
|
|
#define wxGA_TEXT 0x0040
|
|
|
|
// GTK and Mac always have native implementation of the indeterminate mode
|
|
// wxMSW has native implementation only if comctl32.dll >= 6.00
|
|
#if !defined(__WXGTK20__) && !defined(__WXMAC__)
|
|
#define wxGAUGE_EMULATE_INDETERMINATE_MODE 1
|
|
#else
|
|
#define wxGAUGE_EMULATE_INDETERMINATE_MODE 0
|
|
#endif
|
|
|
|
extern WXDLLIMPEXP_DATA_CORE(const char) wxGaugeNameStr[];
|
|
|
|
class WXDLLIMPEXP_FWD_CORE wxAppProgressIndicator;
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxGauge: a progress bar
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxGaugeBase : public wxControl
|
|
{
|
|
public:
|
|
wxGaugeBase() : m_rangeMax(0), m_gaugePos(0),
|
|
m_appProgressIndicator(NULL) { }
|
|
|
|
virtual ~wxGaugeBase();
|
|
|
|
bool Create(wxWindow *parent,
|
|
wxWindowID id,
|
|
int range,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = wxGA_HORIZONTAL,
|
|
const wxValidator& validator = wxDefaultValidator,
|
|
const wxString& name = wxGaugeNameStr);
|
|
|
|
// determinate mode API
|
|
|
|
// set/get the control range
|
|
virtual void SetRange(int range);
|
|
virtual int GetRange() const;
|
|
|
|
virtual void SetValue(int pos);
|
|
virtual int GetValue() const;
|
|
|
|
// indeterminate mode API
|
|
virtual void Pulse();
|
|
|
|
// simple accessors
|
|
bool IsVertical() const { return HasFlag(wxGA_VERTICAL); }
|
|
|
|
// overridden base class virtuals
|
|
virtual bool AcceptsFocus() const wxOVERRIDE { return false; }
|
|
|
|
// Deprecated methods not doing anything since a long time.
|
|
wxDEPRECATED_MSG("Remove calls to this method, it doesn't do anything")
|
|
void SetShadowWidth(int WXUNUSED(w)) { }
|
|
|
|
wxDEPRECATED_MSG("Remove calls to this method, it always returns 0")
|
|
int GetShadowWidth() const { return 0; }
|
|
|
|
wxDEPRECATED_MSG("Remove calls to this method, it doesn't do anything")
|
|
void SetBezelFace(int WXUNUSED(w)) { }
|
|
|
|
wxDEPRECATED_MSG("Remove calls to this method, it always returns 0")
|
|
int GetBezelFace() const { return 0; }
|
|
|
|
protected:
|
|
virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
|
|
|
|
// Initialize m_appProgressIndicator if necessary, i.e. if this object has
|
|
// wxGA_PROGRESS style. This method is supposed to be called from the
|
|
// derived class Create() if it doesn't call the base class Create(), which
|
|
// already does it, after initializing the window style and range.
|
|
void InitProgressIndicatorIfNeeded();
|
|
|
|
|
|
// the max position
|
|
int m_rangeMax;
|
|
|
|
// the current position
|
|
int m_gaugePos;
|
|
|
|
#if wxGAUGE_EMULATE_INDETERMINATE_MODE
|
|
int m_nDirection; // can be wxRIGHT or wxLEFT
|
|
#endif
|
|
|
|
wxAppProgressIndicator *m_appProgressIndicator;
|
|
|
|
wxDECLARE_NO_COPY_CLASS(wxGaugeBase);
|
|
};
|
|
|
|
#if defined(__WXUNIVERSAL__)
|
|
#include "wx/univ/gauge.h"
|
|
#elif defined(__WXMSW__)
|
|
#include "wx/msw/gauge.h"
|
|
#elif defined(__WXMOTIF__)
|
|
#include "wx/motif/gauge.h"
|
|
#elif defined(__WXGTK20__)
|
|
#include "wx/gtk/gauge.h"
|
|
#elif defined(__WXGTK__)
|
|
#include "wx/gtk1/gauge.h"
|
|
#elif defined(__WXMAC__)
|
|
#include "wx/osx/gauge.h"
|
|
#elif defined(__WXQT__)
|
|
#include "wx/qt/gauge.h"
|
|
#endif
|
|
|
|
#endif // wxUSE_GAUGE
|
|
|
|
#endif
|
|
// _WX_GAUGE_H_BASE_
|