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.
177 lines
6.2 KiB
C++
177 lines
6.2 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/msw/combobox.h
|
|
// Purpose: wxComboBox class
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created: 01/02/97
|
|
// Copyright: (c) Julian Smart
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_COMBOBOX_H_
|
|
#define _WX_COMBOBOX_H_
|
|
|
|
#include "wx/choice.h"
|
|
#include "wx/textentry.h"
|
|
|
|
#if wxUSE_COMBOBOX
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// Combobox control
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxComboBox : public wxChoice,
|
|
public wxTextEntry
|
|
{
|
|
public:
|
|
wxComboBox() { Init(); }
|
|
|
|
wxComboBox(wxWindow *parent, wxWindowID id,
|
|
const wxString& value = wxEmptyString,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
int n = 0, const wxString choices[] = NULL,
|
|
long style = 0,
|
|
const wxValidator& validator = wxDefaultValidator,
|
|
const wxString& name = wxComboBoxNameStr)
|
|
{
|
|
Init();
|
|
Create(parent, id, value, pos, size, n, choices, style, validator, name);
|
|
|
|
}
|
|
|
|
wxComboBox(wxWindow *parent, wxWindowID id,
|
|
const wxString& value,
|
|
const wxPoint& pos,
|
|
const wxSize& size,
|
|
const wxArrayString& choices,
|
|
long style = 0,
|
|
const wxValidator& validator = wxDefaultValidator,
|
|
const wxString& name = wxComboBoxNameStr)
|
|
{
|
|
Init();
|
|
|
|
Create(parent, id, value, pos, size, choices, style, validator, name);
|
|
}
|
|
|
|
bool Create(wxWindow *parent,
|
|
wxWindowID id,
|
|
const wxString& value = wxEmptyString,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
int n = 0,
|
|
const wxString choices[] = NULL,
|
|
long style = 0,
|
|
const wxValidator& validator = wxDefaultValidator,
|
|
const wxString& name = wxComboBoxNameStr);
|
|
bool Create(wxWindow *parent,
|
|
wxWindowID id,
|
|
const wxString& value,
|
|
const wxPoint& pos,
|
|
const wxSize& size,
|
|
const wxArrayString& choices,
|
|
long style = 0,
|
|
const wxValidator& validator = wxDefaultValidator,
|
|
const wxString& name = wxComboBoxNameStr);
|
|
|
|
// See wxComboBoxBase discussion of IsEmpty().
|
|
bool IsListEmpty() const { return wxItemContainer::IsEmpty(); }
|
|
bool IsTextEmpty() const { return wxTextEntry::IsEmpty(); }
|
|
|
|
// resolve ambiguities among virtual functions inherited from both base
|
|
// classes
|
|
virtual void Clear();
|
|
virtual wxString GetValue() const;
|
|
virtual void SetValue(const wxString& value);
|
|
virtual wxString GetStringSelection() const
|
|
{ return wxChoice::GetStringSelection(); }
|
|
virtual void Popup() { MSWDoPopupOrDismiss(true); }
|
|
virtual void Dismiss() { MSWDoPopupOrDismiss(false); }
|
|
virtual void SetSelection(int n) { wxChoice::SetSelection(n); }
|
|
virtual void SetSelection(long from, long to)
|
|
{ wxTextEntry::SetSelection(from, to); }
|
|
virtual int GetSelection() const { return wxChoice::GetSelection(); }
|
|
virtual bool ContainsHWND(WXHWND hWnd) const;
|
|
virtual void GetSelection(long *from, long *to) const;
|
|
|
|
virtual bool IsEditable() const;
|
|
|
|
// implementation only from now on
|
|
virtual bool MSWCommand(WXUINT param, WXWORD id);
|
|
bool MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam);
|
|
virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
|
|
bool MSWShouldPreProcessMessage(WXMSG *pMsg);
|
|
|
|
// Standard event handling
|
|
void OnCut(wxCommandEvent& event);
|
|
void OnCopy(wxCommandEvent& event);
|
|
void OnPaste(wxCommandEvent& event);
|
|
void OnUndo(wxCommandEvent& event);
|
|
void OnRedo(wxCommandEvent& event);
|
|
void OnDelete(wxCommandEvent& event);
|
|
void OnSelectAll(wxCommandEvent& event);
|
|
|
|
void OnUpdateCut(wxUpdateUIEvent& event);
|
|
void OnUpdateCopy(wxUpdateUIEvent& event);
|
|
void OnUpdatePaste(wxUpdateUIEvent& event);
|
|
void OnUpdateUndo(wxUpdateUIEvent& event);
|
|
void OnUpdateRedo(wxUpdateUIEvent& event);
|
|
void OnUpdateDelete(wxUpdateUIEvent& event);
|
|
void OnUpdateSelectAll(wxUpdateUIEvent& event);
|
|
|
|
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
|
|
|
|
#if wxUSE_UXTHEME
|
|
// override wxTextEntry method to work around Windows bug
|
|
virtual bool SetHint(const wxString& hint);
|
|
#endif // wxUSE_UXTHEME
|
|
|
|
virtual void SetLayoutDirection(wxLayoutDirection dir) wxOVERRIDE;
|
|
|
|
protected:
|
|
#if wxUSE_TOOLTIPS
|
|
virtual void DoSetToolTip(wxToolTip *tip);
|
|
#endif
|
|
|
|
virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const;
|
|
|
|
// Override this one to avoid eating events from our popup listbox.
|
|
virtual wxWindow *MSWFindItem(long id, WXHWND hWnd) const;
|
|
|
|
// this is the implementation of GetEditHWND() which can also be used when
|
|
// we don't have the edit control, it simply returns NULL then
|
|
//
|
|
// try not to use this function unless absolutely necessary (as in the
|
|
// message handling code where the edit control might not be created yet
|
|
// for the messages we receive during the control creation) as normally
|
|
// just testing for IsEditable() and using GetEditHWND() should be enough
|
|
WXHWND GetEditHWNDIfAvailable() const;
|
|
|
|
virtual void EnableTextChangedEvents(bool enable)
|
|
{
|
|
m_allowTextEvents = enable;
|
|
}
|
|
|
|
private:
|
|
// there are the overridden wxTextEntry methods which should only be called
|
|
// when we do have an edit control so they assert if this is not the case
|
|
virtual wxWindow *GetEditableWindow();
|
|
virtual WXHWND GetEditHWND() const;
|
|
|
|
// common part of all ctors
|
|
void Init()
|
|
{
|
|
m_allowTextEvents = true;
|
|
}
|
|
|
|
// normally true, false if text events are currently disabled
|
|
bool m_allowTextEvents;
|
|
|
|
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxComboBox);
|
|
wxDECLARE_EVENT_TABLE();
|
|
};
|
|
|
|
#endif // wxUSE_COMBOBOX
|
|
|
|
#endif // _WX_COMBOBOX_H_
|