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.
107 lines
3.5 KiB
C++
107 lines
3.5 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/msw/textentry.h
|
|
// Purpose: wxMSW-specific wxTextEntry implementation
|
|
// Author: Vadim Zeitlin
|
|
// Created: 2007-09-26
|
|
// Copyright: (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_MSW_TEXTENTRY_H_
|
|
#define _WX_MSW_TEXTENTRY_H_
|
|
|
|
class wxTextAutoCompleteData; // private class used only by wxTextEntry itself
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxTextEntry: common part of wxComboBox and (single line) wxTextCtrl
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxTextEntry : public wxTextEntryBase
|
|
{
|
|
public:
|
|
wxTextEntry();
|
|
virtual ~wxTextEntry();
|
|
|
|
// implement wxTextEntryBase pure virtual methods
|
|
virtual void WriteText(const wxString& text);
|
|
virtual void Remove(long from, long to);
|
|
|
|
virtual void Copy();
|
|
virtual void Cut();
|
|
virtual void Paste();
|
|
|
|
virtual void Undo();
|
|
virtual void Redo();
|
|
virtual bool CanUndo() const;
|
|
virtual bool CanRedo() const;
|
|
|
|
virtual void SetInsertionPoint(long pos);
|
|
virtual long GetInsertionPoint() const;
|
|
virtual long GetLastPosition() const;
|
|
|
|
virtual void SetSelection(long from, long to)
|
|
{ DoSetSelection(from, to); }
|
|
virtual void GetSelection(long *from, long *to) const;
|
|
|
|
virtual bool IsEditable() const;
|
|
virtual void SetEditable(bool editable);
|
|
|
|
virtual void SetMaxLength(unsigned long len);
|
|
virtual void ForceUpper();
|
|
|
|
#if wxUSE_UXTHEME
|
|
virtual bool SetHint(const wxString& hint);
|
|
virtual wxString GetHint() const;
|
|
#endif // wxUSE_UXTHEME
|
|
|
|
protected:
|
|
virtual wxString DoGetValue() const;
|
|
|
|
// this is really a hook for multiline text controls as the single line
|
|
// ones don't need to ever scroll to show the selection but having it here
|
|
// allows us to put Remove() in the base class
|
|
enum
|
|
{
|
|
SetSel_NoScroll = 0, // don't do anything special
|
|
SetSel_Scroll = 1 // default: scroll to make the selection visible
|
|
};
|
|
virtual void DoSetSelection(long from, long to, int flags = SetSel_Scroll);
|
|
|
|
// margins functions
|
|
virtual bool DoSetMargins(const wxPoint& pt);
|
|
virtual wxPoint DoGetMargins() const;
|
|
|
|
// auto-completion uses COM under Windows so they won't work without
|
|
// wxUSE_OLE as OleInitialize() is not called then
|
|
#if wxUSE_OLE
|
|
virtual bool DoAutoCompleteStrings(const wxArrayString& choices);
|
|
#if wxUSE_DYNLIB_CLASS
|
|
virtual bool DoAutoCompleteFileNames(int flags);
|
|
#endif // wxUSE_DYNLIB_CLASS
|
|
virtual bool DoAutoCompleteCustom(wxTextCompleter *completer);
|
|
#endif // wxUSE_OLE
|
|
|
|
private:
|
|
// implement this to return the HWND of the EDIT control
|
|
virtual WXHWND GetEditHWND() const = 0;
|
|
|
|
#if wxUSE_OLE
|
|
// Get the auto-complete object creating it if necessary. Returns NULL if
|
|
// creating it failed.
|
|
wxTextAutoCompleteData *GetOrCreateCompleter();
|
|
|
|
// Various auto-completion-related stuff, only used if any of AutoComplete()
|
|
// methods are called. Use the function above to access it.
|
|
wxTextAutoCompleteData *m_autoCompleteData;
|
|
|
|
// It needs to call our GetEditableWindow() and GetEditHWND() methods.
|
|
friend class wxTextAutoCompleteData;
|
|
#endif // wxUSE_OLE
|
|
};
|
|
|
|
// We don't need the generic version.
|
|
#define wxHAS_NATIVE_TEXT_FORCEUPPER
|
|
|
|
#endif // _WX_MSW_TEXTENTRY_H_
|
|
|