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.
115 lines
3.4 KiB
C++
115 lines
3.4 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/osx/textentry.h
|
|
// Purpose: wxTextEntry class
|
|
// Author: Stefan Csomor
|
|
// Modified by: Kevin Ollivier
|
|
// Created: 1998-01-01
|
|
// Copyright: (c) Stefan Csomor
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_OSX_TEXTENTRY_H_
|
|
#define _WX_OSX_TEXTENTRY_H_
|
|
|
|
#if wxUSE_SYSTEM_OPTIONS
|
|
// set this to 'true' if you want to use the 'classic' MLTE-based implementation
|
|
// instead of the HIView-based implementation in 10.3 and upwards, the former
|
|
// has more features (backgrounds etc.), but may show redraw artefacts and other
|
|
// problems depending on your usage; hence, the default is 'false'.
|
|
#define wxMAC_TEXTCONTROL_USE_MLTE wxT("mac.textcontrol-use-mlte")
|
|
// set this to 'true' if you want editable text controls to have spell checking turned
|
|
// on by default, you can change this setting individually on a control using MacCheckSpelling
|
|
#define wxMAC_TEXTCONTROL_USE_SPELL_CHECKER wxT("mac.textcontrol-use-spell-checker")
|
|
#endif
|
|
|
|
#include "wx/control.h"
|
|
|
|
// forward decl for wxListWidgetImpl implementation type.
|
|
class WXDLLIMPEXP_FWD_CORE wxTextWidgetImpl;
|
|
|
|
class WXDLLIMPEXP_CORE wxTextEntry: public wxTextEntryBase
|
|
{
|
|
|
|
public:
|
|
wxTextEntry();
|
|
virtual ~wxTextEntry();
|
|
|
|
virtual bool IsEditable() const;
|
|
|
|
// If the return values from and to are the same, there is no selection.
|
|
virtual void GetSelection(long* from, long* to) const;
|
|
|
|
// operations
|
|
// ----------
|
|
|
|
// editing
|
|
virtual void Clear();
|
|
virtual void Remove(long from, long to);
|
|
|
|
// set the max number of characters which may be entered
|
|
// in a single line text control
|
|
virtual void SetMaxLength(unsigned long len);
|
|
|
|
virtual void ForceUpper();
|
|
|
|
// writing text inserts it at the current position;
|
|
// appending always inserts it at the end
|
|
virtual void WriteText(const wxString& text);
|
|
|
|
// Clipboard operations
|
|
virtual void Copy();
|
|
virtual void Cut();
|
|
virtual void Paste();
|
|
|
|
virtual bool CanCopy() const;
|
|
virtual bool CanCut() const;
|
|
virtual bool CanPaste() const;
|
|
|
|
// Undo/redo
|
|
virtual void Undo();
|
|
virtual void Redo();
|
|
|
|
virtual bool CanUndo() const;
|
|
virtual bool CanRedo() const;
|
|
|
|
// Insertion point
|
|
virtual void SetInsertionPoint(long pos);
|
|
virtual void SetInsertionPointEnd();
|
|
virtual long GetInsertionPoint() const;
|
|
virtual wxTextPos GetLastPosition() const;
|
|
|
|
virtual void SetSelection(long from, long to);
|
|
virtual void SetEditable(bool editable);
|
|
|
|
virtual bool SendMaxLenEvent();
|
|
|
|
// set the grayed out hint text
|
|
virtual bool SetHint(const wxString& hint);
|
|
virtual wxString GetHint() const;
|
|
|
|
// Implementation
|
|
// --------------
|
|
|
|
virtual wxTextWidgetImpl * GetTextPeer() const;
|
|
wxTextCompleter *OSXGetCompleter() const { return m_completer; }
|
|
|
|
protected:
|
|
|
|
virtual wxString DoGetValue() const;
|
|
|
|
virtual bool DoAutoCompleteStrings(const wxArrayString& choices);
|
|
virtual bool DoAutoCompleteCustom(wxTextCompleter *completer);
|
|
|
|
// The object providing auto-completions or NULL if none.
|
|
wxTextCompleter *m_completer;
|
|
|
|
bool m_editable;
|
|
|
|
// need to make this public because of the current implementation via callbacks
|
|
unsigned long m_maxLength;
|
|
|
|
private:
|
|
wxString m_hintString;
|
|
};
|
|
|
|
#endif // _WX_OSX_TEXTENTRY_H_
|