mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-15 10:39:13 +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.
112 lines
3.1 KiB
C++
112 lines
3.1 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/msw/statusbar.h
|
|
// Purpose: native implementation of wxStatusBar
|
|
// Author: Vadim Zeitlin
|
|
// Modified by:
|
|
// Created: 04.04.98
|
|
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_MSW_STATUSBAR_H_
|
|
#define _WX_MSW_STATUSBAR_H_
|
|
|
|
#if wxUSE_NATIVE_STATUSBAR
|
|
|
|
#include "wx/vector.h"
|
|
#include "wx/tooltip.h"
|
|
|
|
class WXDLLIMPEXP_FWD_CORE wxClientDC;
|
|
|
|
class WXDLLIMPEXP_CORE wxStatusBar : public wxStatusBarBase
|
|
{
|
|
public:
|
|
// ctors and such
|
|
wxStatusBar();
|
|
wxStatusBar(wxWindow *parent,
|
|
wxWindowID id = wxID_ANY,
|
|
long style = wxSTB_DEFAULT_STYLE,
|
|
const wxString& name = wxStatusBarNameStr)
|
|
{
|
|
m_pDC = NULL;
|
|
(void)Create(parent, id, style, name);
|
|
}
|
|
|
|
bool Create(wxWindow *parent,
|
|
wxWindowID id = wxID_ANY,
|
|
long style = wxSTB_DEFAULT_STYLE,
|
|
const wxString& name = wxStatusBarNameStr);
|
|
|
|
virtual ~wxStatusBar();
|
|
|
|
// implement base class methods
|
|
virtual void SetFieldsCount(int number = 1, const int *widths = NULL);
|
|
virtual void SetStatusWidths(int n, const int widths_field[]);
|
|
virtual void SetStatusStyles(int n, const int styles[]);
|
|
virtual void SetMinHeight(int height);
|
|
virtual bool GetFieldRect(int i, wxRect& rect) const;
|
|
|
|
virtual int GetBorderX() const;
|
|
virtual int GetBorderY() const;
|
|
|
|
// override some wxWindow virtual methods too
|
|
virtual bool SetFont(const wxFont& font);
|
|
|
|
virtual WXLRESULT MSWWindowProc(WXUINT nMsg,
|
|
WXWPARAM wParam,
|
|
WXLPARAM lParam);
|
|
|
|
protected:
|
|
// implement base class pure virtual method
|
|
virtual void DoUpdateStatusText(int number);
|
|
|
|
// override some base class virtuals
|
|
virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;
|
|
virtual wxSize DoGetBestSize() const;
|
|
virtual void DoMoveWindow(int x, int y, int width, int height);
|
|
#if wxUSE_TOOLTIPS
|
|
virtual bool MSWProcessMessage(WXMSG* pMsg);
|
|
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM* result);
|
|
#endif
|
|
|
|
// implementation of the public SetStatusWidths()
|
|
void MSWUpdateFieldsWidths();
|
|
|
|
// used by DoUpdateStatusText()
|
|
wxClientDC *m_pDC;
|
|
|
|
#if wxUSE_TOOLTIPS
|
|
// the tooltips used when wxSTB_SHOW_TIPS is given
|
|
wxVector<wxToolTip*> m_tooltips;
|
|
#endif
|
|
|
|
private:
|
|
struct MSWBorders
|
|
{
|
|
int horz,
|
|
vert,
|
|
between;
|
|
};
|
|
|
|
// retrieve all status bar borders using SB_GETBORDERS
|
|
MSWBorders MSWGetBorders() const;
|
|
|
|
// return the size of the border between the fields
|
|
int MSWGetBorderWidth() const;
|
|
|
|
struct MSWMetrics
|
|
{
|
|
int gripWidth,
|
|
textMargin;
|
|
};
|
|
|
|
// return the various status bar metrics
|
|
static const MSWMetrics& MSWGetMetrics();
|
|
|
|
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBar);
|
|
};
|
|
|
|
#endif // wxUSE_NATIVE_STATUSBAR
|
|
|
|
#endif // _WX_MSW_STATUSBAR_H_
|