mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-18 03:59:14 +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.
70 lines
2.4 KiB
C++
70 lines
2.4 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/gtk/calctrl.h
|
|
// Purpose: wxGtkCalendarCtrl control
|
|
// Author: Marcin Wojdyr
|
|
// Copyright: (C) 2008 Marcin Wojdyr
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef GTK_CALCTRL_H__
|
|
#define GTK_CALCTRL_H__
|
|
|
|
class WXDLLIMPEXP_ADV wxGtkCalendarCtrl : public wxCalendarCtrlBase
|
|
{
|
|
public:
|
|
wxGtkCalendarCtrl() {}
|
|
wxGtkCalendarCtrl(wxWindow *parent,
|
|
wxWindowID id,
|
|
const wxDateTime& date = wxDefaultDateTime,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = wxCAL_SHOW_HOLIDAYS,
|
|
const wxString& name = wxCalendarNameStr)
|
|
{
|
|
Create(parent, id, date, pos, size, style, name);
|
|
}
|
|
|
|
bool Create(wxWindow *parent,
|
|
wxWindowID id,
|
|
const wxDateTime& date = wxDefaultDateTime,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = wxCAL_SHOW_HOLIDAYS,
|
|
const wxString& name = wxCalendarNameStr);
|
|
|
|
virtual ~wxGtkCalendarCtrl() {}
|
|
|
|
virtual bool SetDate(const wxDateTime& date) wxOVERRIDE;
|
|
virtual wxDateTime GetDate() const wxOVERRIDE;
|
|
|
|
virtual bool SetDateRange(const wxDateTime& lowerdate = wxDefaultDateTime,
|
|
const wxDateTime& upperdate = wxDefaultDateTime) wxOVERRIDE;
|
|
virtual bool GetDateRange(wxDateTime *lowerdate, wxDateTime *upperdate) const wxOVERRIDE;
|
|
|
|
virtual bool EnableMonthChange(bool enable = true) wxOVERRIDE;
|
|
|
|
virtual void Mark(size_t day, bool mark) wxOVERRIDE;
|
|
|
|
// implementation
|
|
// --------------
|
|
|
|
void GTKGenerateEvent(wxEventType type);
|
|
|
|
private:
|
|
bool IsInValidRange(const wxDateTime& dt) const;
|
|
|
|
// Range of the dates that can be selected by user, either or both may be
|
|
// invalid to indicate that no corresponding restriction is set.
|
|
wxDateTime m_validStart,
|
|
m_validEnd;
|
|
|
|
// Last known selected date, may be different from the real selection in
|
|
// the control while a handler for day-selected is running.
|
|
wxDateTime m_selectedDate;
|
|
|
|
wxDECLARE_DYNAMIC_CLASS(wxGtkCalendarCtrl);
|
|
wxDECLARE_NO_COPY_CLASS(wxGtkCalendarCtrl);
|
|
};
|
|
|
|
#endif // GTK_CALCTRL_H__
|