mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-15 18:49: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.
81 lines
2.5 KiB
C++
81 lines
2.5 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/gtk/anybutton.h
|
|
// Purpose: wxGTK wxAnyButton class declaration
|
|
// Author: Robert Roebling
|
|
// Created: 1998-05-20 (extracted from button.h)
|
|
// Copyright: (c) 1998 Robert Roebling
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_GTK_ANYBUTTON_H_
|
|
#define _WX_GTK_ANYBUTTON_H_
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// wxAnyButton
|
|
//-----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxAnyButton : public wxAnyButtonBase
|
|
{
|
|
public:
|
|
wxAnyButton()
|
|
{
|
|
m_isCurrent =
|
|
m_isPressed = false;
|
|
}
|
|
|
|
virtual bool Enable( bool enable = true ) wxOVERRIDE;
|
|
|
|
// implementation
|
|
// --------------
|
|
|
|
static wxVisualAttributes
|
|
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
|
|
|
|
// called from GTK callbacks: they update the button state and call
|
|
// GTKUpdateBitmap()
|
|
void GTKMouseEnters();
|
|
void GTKMouseLeaves();
|
|
void GTKPressed();
|
|
void GTKReleased();
|
|
|
|
protected:
|
|
virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE;
|
|
|
|
virtual wxBitmap DoGetBitmap(State which) const wxOVERRIDE;
|
|
virtual void DoSetBitmap(const wxBitmap& bitmap, State which) wxOVERRIDE;
|
|
virtual void DoSetBitmapPosition(wxDirection dir) wxOVERRIDE;
|
|
|
|
private:
|
|
typedef wxAnyButtonBase base_type;
|
|
|
|
// focus event handler: calls GTKUpdateBitmap()
|
|
void GTKOnFocus(wxFocusEvent& event);
|
|
|
|
// update the bitmap to correspond to the current button state
|
|
void GTKUpdateBitmap();
|
|
|
|
// return the state whose bitmap is being currently shown (so this is
|
|
// different from the real current state, e.g. it could be State_Normal
|
|
// even if the button is pressed if no button was set for State_Pressed)
|
|
State GTKGetCurrentBitmapState() const;
|
|
|
|
// show the given bitmap (must be valid)
|
|
void GTKDoShowBitmap(const wxBitmap& bitmap);
|
|
|
|
|
|
// the bitmaps for the different state of the buttons, all of them may be
|
|
// invalid and the button only shows a bitmap at all if State_Normal bitmap
|
|
// is valid
|
|
wxBitmap m_bitmaps[State_Max];
|
|
|
|
// true iff mouse is currently over the button
|
|
bool m_isCurrent;
|
|
|
|
// true iff the button is in pressed state
|
|
bool m_isPressed;
|
|
|
|
wxDECLARE_NO_COPY_CLASS(wxAnyButton);
|
|
};
|
|
|
|
#endif // _WX_GTK_ANYBUTTON_H_
|