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.
82 lines
2.5 KiB
C++
82 lines
2.5 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/msw/anybutton.h
|
|
// Purpose: wxAnyButton class
|
|
// Author: Julian Smart
|
|
// Created: 1997-02-01 (extracted from button.h)
|
|
// Copyright: (c) Julian Smart
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_MSW_ANYBUTTON_H_
|
|
#define _WX_MSW_ANYBUTTON_H_
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// Common button functionality
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxAnyButton : public wxAnyButtonBase
|
|
{
|
|
public:
|
|
wxAnyButton()
|
|
{
|
|
m_imageData = NULL;
|
|
#if wxUSE_MARKUP
|
|
m_markupText = NULL;
|
|
#endif // wxUSE_MARKUP
|
|
}
|
|
|
|
virtual ~wxAnyButton();
|
|
|
|
// overridden base class methods
|
|
virtual void SetLabel(const wxString& label);
|
|
virtual bool SetBackgroundColour(const wxColour &colour);
|
|
virtual bool SetForegroundColour(const wxColour &colour);
|
|
|
|
// implementation from now on
|
|
virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
|
|
|
|
virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
|
|
|
|
// returns true if the platform should explicitly apply a theme border
|
|
virtual bool CanApplyThemeBorder() const { return false; }
|
|
|
|
protected:
|
|
// usually overridden base class virtuals
|
|
virtual wxSize DoGetBestSize() const;
|
|
|
|
virtual wxBitmap DoGetBitmap(State which) const;
|
|
virtual void DoSetBitmap(const wxBitmap& bitmap, State which);
|
|
virtual wxSize DoGetBitmapMargins() const;
|
|
virtual void DoSetBitmapMargins(wxCoord x, wxCoord y);
|
|
virtual void DoSetBitmapPosition(wxDirection dir);
|
|
|
|
#if wxUSE_MARKUP
|
|
virtual bool DoSetLabelMarkup(const wxString& markup);
|
|
#endif // wxUSE_MARKUP
|
|
|
|
// Increases the passed in size to account for the button image.
|
|
//
|
|
// Should only be called if we do have a button, i.e. if m_imageData is
|
|
// non-NULL.
|
|
void AdjustForBitmapSize(wxSize& size) const;
|
|
|
|
class wxButtonImageData *m_imageData;
|
|
|
|
#if wxUSE_MARKUP
|
|
class wxMarkupText *m_markupText;
|
|
#endif // wxUSE_MARKUP
|
|
|
|
// Switches button into owner-drawn mode: this is used if we need to draw
|
|
// something not supported by the native control, such as using non default
|
|
// colours or a bitmap on pre-XP systems.
|
|
void MakeOwnerDrawn();
|
|
bool IsOwnerDrawn() const;
|
|
|
|
virtual bool MSWIsPushed() const;
|
|
|
|
private:
|
|
wxDECLARE_NO_COPY_CLASS(wxAnyButton);
|
|
};
|
|
|
|
#endif // _WX_MSW_ANYBUTTON_H_
|