mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-02-09 21:40:10 +00: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.
146 lines
4.5 KiB
C++
146 lines
4.5 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: src/msw/ownerdrw.cpp
|
|
// Purpose: implementation of wxOwnerDrawn class
|
|
// Author: Vadim Zeitlin
|
|
// Modified by: Marcin Malich
|
|
// Created: 13.11.97
|
|
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
// For compilers that support precompilation, includes "wx.h".
|
|
#include "wx/wxprec.h"
|
|
|
|
#ifdef __BORLANDC__
|
|
#pragma hdrstop
|
|
#endif
|
|
|
|
#if wxUSE_OWNER_DRAWN
|
|
|
|
#include "wx/ownerdrw.h"
|
|
#include "wx/msw/dc.h"
|
|
#include "wx/msw/private.h"
|
|
#include "wx/msw/private/dc.h"
|
|
#include "wx/msw/wrapcctl.h" // for HIMAGELIST
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// constants for base class
|
|
// ----------------------------------------------------------------------------
|
|
|
|
int wxOwnerDrawnBase::ms_defaultMargin = 3;
|
|
|
|
// ============================================================================
|
|
// implementation of wxOwnerDrawn class
|
|
// ============================================================================
|
|
|
|
// draw the item
|
|
bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc,
|
|
wxODAction, wxODStatus stat)
|
|
{
|
|
// we do nothing if item isn't ownerdrawn
|
|
if ( !IsOwnerDrawn() )
|
|
return true;
|
|
|
|
wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl();
|
|
HDC hdc = GetHdcOf(*impl);
|
|
|
|
RECT rect;
|
|
wxCopyRectToRECT(rc, rect);
|
|
|
|
{
|
|
// set the font and colors
|
|
wxFont font;
|
|
GetFontToUse(font);
|
|
|
|
wxColour colText, colBack;
|
|
GetColourToUse(stat, colText, colBack);
|
|
|
|
SelectInHDC selFont(hdc, GetHfontOf(font));
|
|
|
|
wxMSWImpl::wxTextColoursChanger textCol(hdc, colText, colBack);
|
|
wxMSWImpl::wxBkModeChanger bkMode(hdc, wxBRUSHSTYLE_TRANSPARENT);
|
|
|
|
|
|
AutoHBRUSH hbr(wxColourToPalRGB(colBack));
|
|
SelectInHDC selBrush(hdc, hbr);
|
|
|
|
::FillRect(hdc, &rect, hbr);
|
|
|
|
// using native API because it recognizes '&'
|
|
|
|
wxString text = GetName();
|
|
|
|
SIZE sizeRect;
|
|
::GetTextExtentPoint32(hdc, text.c_str(), text.length(), &sizeRect);
|
|
|
|
int flags = DST_PREFIXTEXT;
|
|
if ( (stat & wxODDisabled) && !(stat & wxODSelected) )
|
|
flags |= DSS_DISABLED;
|
|
|
|
if ( (stat & wxODHidePrefix) )
|
|
flags |= DSS_HIDEPREFIX;
|
|
|
|
int x = rc.x + GetMarginWidth();
|
|
int y = rc.y + (rc.GetHeight() - sizeRect.cy) / 2;
|
|
int cx = rc.GetWidth() - GetMarginWidth();
|
|
int cy = sizeRect.cy;
|
|
|
|
::DrawState(hdc, NULL, NULL, wxMSW_CONV_LPARAM(text),
|
|
text.length(), x, y, cx, cy, flags);
|
|
|
|
} // reset to default the font, colors and brush
|
|
|
|
if (stat & wxODHasFocus)
|
|
::DrawFocusRect(hdc, &rect);
|
|
|
|
return true;
|
|
}
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// global helper functions implemented here
|
|
// ----------------------------------------------------------------------------
|
|
|
|
BOOL wxDrawStateBitmap(HDC hDC, HBITMAP hBitmap, int x, int y, UINT uState)
|
|
{
|
|
// determine size of bitmap image
|
|
BITMAP bmp;
|
|
if ( !::GetObject(hBitmap, sizeof(BITMAP), &bmp) )
|
|
return FALSE;
|
|
|
|
BOOL result;
|
|
|
|
switch ( uState )
|
|
{
|
|
case wxDSB_NORMAL:
|
|
case wxDSB_SELECTED:
|
|
{
|
|
// uses image list functions to draw
|
|
// - normal bitmap with support transparency
|
|
// (image list internally create mask etc.)
|
|
// - blend bitmap with the background colour
|
|
// (like default selected items)
|
|
HIMAGELIST hIml = ::ImageList_Create(bmp.bmWidth, bmp.bmHeight,
|
|
ILC_COLOR32 | ILC_MASK, 1, 1);
|
|
::ImageList_Add(hIml, hBitmap, NULL);
|
|
UINT fStyle = uState == wxDSB_SELECTED ? ILD_SELECTED : ILD_NORMAL;
|
|
result = ::ImageList_Draw(hIml, 0, hDC, x, y, fStyle);
|
|
::ImageList_Destroy(hIml);
|
|
}
|
|
break;
|
|
|
|
case wxDSB_DISABLED:
|
|
result = ::DrawState(hDC, NULL, NULL, (LPARAM)hBitmap, 0, x, y,
|
|
bmp.bmWidth, bmp.bmHeight,
|
|
DST_BITMAP | DSS_DISABLED);
|
|
break;
|
|
|
|
default:
|
|
wxFAIL_MSG( wxT("DrawStateBitmap: unknown wxDSBStates value") );
|
|
result = FALSE;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
#endif // wxUSE_OWNER_DRAWN
|