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.
99 lines
3.2 KiB
C++
99 lines
3.2 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/msw/calctrl.h
|
|
// Purpose: wxCalendarCtrl control implementation for MSW
|
|
// Author: Vadim Zeitlin
|
|
// Copyright: (C) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_MSW_CALCTRL_H_
|
|
#define _WX_MSW_CALCTRL_H_
|
|
|
|
class WXDLLIMPEXP_ADV wxCalendarCtrl : public wxCalendarCtrlBase
|
|
{
|
|
public:
|
|
wxCalendarCtrl() { Init(); }
|
|
wxCalendarCtrl(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)
|
|
{
|
|
Init();
|
|
|
|
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 bool SetDate(const wxDateTime& date);
|
|
virtual wxDateTime GetDate() const;
|
|
|
|
virtual bool SetDateRange(const wxDateTime& lowerdate = wxDefaultDateTime,
|
|
const wxDateTime& upperdate = wxDefaultDateTime);
|
|
virtual bool GetDateRange(wxDateTime *lowerdate, wxDateTime *upperdate) const;
|
|
|
|
virtual bool EnableMonthChange(bool enable = true);
|
|
|
|
virtual void Mark(size_t day, bool mark);
|
|
virtual void SetHoliday(size_t day);
|
|
|
|
virtual wxCalendarHitTestResult HitTest(const wxPoint& pos,
|
|
wxDateTime *date = NULL,
|
|
wxDateTime::WeekDay *wd = NULL);
|
|
|
|
virtual void SetWindowStyleFlag(long style);
|
|
|
|
protected:
|
|
virtual wxSize DoGetBestSize() const;
|
|
|
|
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
|
|
|
|
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
|
|
|
|
void MSWOnClick(wxMouseEvent& event);
|
|
void MSWOnDoubleClick(wxMouseEvent& event);
|
|
|
|
private:
|
|
void Init();
|
|
|
|
// bring the control in sync with m_marks
|
|
void UpdateMarks();
|
|
|
|
// set first day of week in the control to correspond to our
|
|
// wxCAL_MONDAY_FIRST flag
|
|
void UpdateFirstDayOfWeek();
|
|
|
|
// reset holiday information
|
|
virtual void ResetHolidayAttrs() { m_holidays = 0; }
|
|
|
|
// redisplay holidays
|
|
virtual void RefreshHolidays() { UpdateMarks(); }
|
|
|
|
|
|
// current date, we need to store it instead of simply retrieving it from
|
|
// the control as needed in order to be able to generate the correct events
|
|
// from MSWOnNotify()
|
|
wxDateTime m_date;
|
|
|
|
// bit field containing the state (marked or not) of all days in the month
|
|
wxUint32 m_marks;
|
|
|
|
// the same but indicating whether a day is a holiday or not
|
|
wxUint32 m_holidays;
|
|
|
|
|
|
wxDECLARE_DYNAMIC_CLASS(wxCalendarCtrl);
|
|
wxDECLARE_NO_COPY_CLASS(wxCalendarCtrl);
|
|
};
|
|
|
|
#endif // _WX_MSW_CALCTRL_H_
|