mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-19 12:31:17 +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.
116 lines
3.4 KiB
C++
116 lines
3.4 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/msw/combo.h
|
|
// Purpose: wxComboCtrl class
|
|
// Author: Jaakko Salli
|
|
// Modified by:
|
|
// Created: Apr-30-2006
|
|
// Copyright: (c) Jaakko Salli
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_COMBOCONTROL_H_
|
|
#define _WX_COMBOCONTROL_H_
|
|
|
|
// NB: Definition of _WX_COMBOCONTROL_H_ is used in wx/generic/combo.h to
|
|
// determine whether there is native wxComboCtrl, so make sure you
|
|
// use it in all native wxComboCtrls.
|
|
|
|
#if wxUSE_COMBOCTRL
|
|
|
|
#if wxUSE_TIMER
|
|
#include "wx/timer.h"
|
|
#define wxUSE_COMBOCTRL_POPUP_ANIMATION 1
|
|
#endif
|
|
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// Native wxComboCtrl
|
|
// ----------------------------------------------------------------------------
|
|
|
|
// Define this only if native implementation includes all features
|
|
#define wxCOMBOCONTROL_FULLY_FEATURED
|
|
|
|
extern WXDLLIMPEXP_DATA_CORE(const char) wxComboBoxNameStr[];
|
|
|
|
class WXDLLIMPEXP_CORE wxComboCtrl : public wxComboCtrlBase
|
|
{
|
|
public:
|
|
// ctors and such
|
|
wxComboCtrl() : wxComboCtrlBase() { Init(); }
|
|
|
|
wxComboCtrl(wxWindow *parent,
|
|
wxWindowID id = wxID_ANY,
|
|
const wxString& value = wxEmptyString,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = 0,
|
|
const wxValidator& validator = wxDefaultValidator,
|
|
const wxString& name = wxComboBoxNameStr)
|
|
: wxComboCtrlBase()
|
|
{
|
|
Init();
|
|
|
|
(void)Create(parent, id, value, pos, size, style, validator, name);
|
|
}
|
|
|
|
bool Create(wxWindow *parent,
|
|
wxWindowID id = wxID_ANY,
|
|
const wxString& value = wxEmptyString,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = 0,
|
|
const wxValidator& validator = wxDefaultValidator,
|
|
const wxString& name = wxComboBoxNameStr);
|
|
|
|
virtual ~wxComboCtrl();
|
|
|
|
virtual void PrepareBackground( wxDC& dc, const wxRect& rect, int flags ) const;
|
|
virtual bool IsKeyPopupToggle(const wxKeyEvent& event) const;
|
|
|
|
static int GetFeatures() { return wxComboCtrlFeatures::All; }
|
|
|
|
#if wxUSE_COMBOCTRL_POPUP_ANIMATION
|
|
void OnTimerEvent(wxTimerEvent& WXUNUSED(event)) { DoTimerEvent(); }
|
|
|
|
protected:
|
|
void DoTimerEvent();
|
|
|
|
virtual bool AnimateShow( const wxRect& rect, int flags );
|
|
#endif // wxUSE_COMBOCTRL_POPUP_ANIMATION
|
|
|
|
protected:
|
|
|
|
// Dummy method - we override all functions that call this
|
|
virtual WXHWND GetEditHWND() const { return NULL; }
|
|
|
|
// customization
|
|
virtual void OnResize();
|
|
virtual wxCoord GetNativeTextIndent() const;
|
|
|
|
// event handlers
|
|
void OnPaintEvent( wxPaintEvent& event );
|
|
void OnMouseEvent( wxMouseEvent& event );
|
|
|
|
virtual bool HasTransparentBackground() { return IsDoubleBuffered(); }
|
|
|
|
private:
|
|
void Init();
|
|
|
|
#if wxUSE_COMBOCTRL_POPUP_ANIMATION
|
|
// Popup animation related
|
|
wxMilliClock_t m_animStart;
|
|
wxTimer m_animTimer;
|
|
wxRect m_animRect;
|
|
int m_animFlags;
|
|
#endif
|
|
|
|
wxDECLARE_EVENT_TABLE();
|
|
|
|
wxDECLARE_DYNAMIC_CLASS(wxComboCtrl);
|
|
};
|
|
|
|
|
|
#endif // wxUSE_COMBOCTRL
|
|
#endif
|
|
// _WX_COMBOCONTROL_H_
|