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.
114 lines
3.5 KiB
C++
114 lines
3.5 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/stattext.h
|
|
// Purpose: wxStaticText base header
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created:
|
|
// Copyright: (c) Julian Smart
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_STATTEXT_H_BASE_
|
|
#define _WX_STATTEXT_H_BASE_
|
|
|
|
#include "wx/defs.h"
|
|
|
|
#if wxUSE_STATTEXT
|
|
|
|
#include "wx/control.h"
|
|
|
|
/*
|
|
* wxStaticText flags
|
|
*/
|
|
#define wxST_NO_AUTORESIZE 0x0001
|
|
// free 0x0002 bit
|
|
#define wxST_ELLIPSIZE_START 0x0004
|
|
#define wxST_ELLIPSIZE_MIDDLE 0x0008
|
|
#define wxST_ELLIPSIZE_END 0x0010
|
|
|
|
#define wxST_ELLIPSIZE_MASK \
|
|
(wxST_ELLIPSIZE_START | wxST_ELLIPSIZE_MIDDLE | wxST_ELLIPSIZE_END)
|
|
|
|
extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticTextNameStr[];
|
|
|
|
class WXDLLIMPEXP_CORE wxStaticTextBase : public wxControl
|
|
{
|
|
public:
|
|
wxStaticTextBase() { }
|
|
|
|
// wrap the text of the control so that no line is longer than the given
|
|
// width (if possible: this function won't break words)
|
|
// This function will modify the value returned by GetLabel()!
|
|
void Wrap(int width);
|
|
|
|
// overridden base virtuals
|
|
virtual bool AcceptsFocus() const wxOVERRIDE { return false; }
|
|
virtual bool HasTransparentBackground() wxOVERRIDE { return true; }
|
|
|
|
bool IsEllipsized() const
|
|
{
|
|
return (GetWindowStyle() & wxST_ELLIPSIZE_MASK) != 0;
|
|
}
|
|
|
|
protected: // functions required for wxST_ELLIPSIZE_* support
|
|
|
|
// choose the default border for this window
|
|
virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
|
|
|
|
// Calls Ellipsize() on the real label if necessary. Unlike GetLabelText(),
|
|
// keeps the mnemonics instead of removing them.
|
|
virtual wxString GetEllipsizedLabel() const;
|
|
|
|
// Replaces parts of the string with ellipsis according to the ellipsize
|
|
// style. Shouldn't be called if we don't have any.
|
|
wxString Ellipsize(const wxString& label) const;
|
|
|
|
// to be called when updating the size of the static text:
|
|
// updates the label redoing ellipsization calculations
|
|
void UpdateLabel();
|
|
|
|
// These functions are platform-specific and must be overridden in ports
|
|
// which do not natively support ellipsization and they must be implemented
|
|
// in a way so that the m_labelOrig member of wxControl is not touched:
|
|
|
|
// returns the real label currently displayed inside the control.
|
|
virtual wxString DoGetLabel() const { return wxEmptyString; }
|
|
|
|
// sets the real label currently displayed inside the control,
|
|
// _without_ invalidating the size. The text passed is always markup-free
|
|
// but may contain the mnemonic characters.
|
|
virtual void DoSetLabel(const wxString& WXUNUSED(str)) { }
|
|
|
|
// Update the current size to match the best size unless wxST_NO_AUTORESIZE
|
|
// style is explicitly used.
|
|
void AutoResizeIfNecessary();
|
|
|
|
private:
|
|
wxDECLARE_NO_COPY_CLASS(wxStaticTextBase);
|
|
};
|
|
|
|
// see wx/generic/stattextg.h for the explanation
|
|
#ifndef wxNO_PORT_STATTEXT_INCLUDE
|
|
|
|
#if defined(__WXUNIVERSAL__)
|
|
#include "wx/univ/stattext.h"
|
|
#elif defined(__WXMSW__)
|
|
#include "wx/msw/stattext.h"
|
|
#elif defined(__WXMOTIF__)
|
|
#include "wx/motif/stattext.h"
|
|
#elif defined(__WXGTK20__)
|
|
#include "wx/gtk/stattext.h"
|
|
#elif defined(__WXGTK__)
|
|
#include "wx/gtk1/stattext.h"
|
|
#elif defined(__WXMAC__)
|
|
#include "wx/osx/stattext.h"
|
|
#elif defined(__WXQT__)
|
|
#include "wx/qt/stattext.h"
|
|
#endif
|
|
|
|
#endif // !wxNO_PORT_STATTEXT_INCLUDE
|
|
|
|
#endif // wxUSE_STATTEXT
|
|
|
|
#endif // _WX_STATTEXT_H_BASE_
|