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.
94 lines
3.4 KiB
C++
94 lines
3.4 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/gtk/control.h
|
|
// Purpose:
|
|
// Author: Robert Roebling
|
|
// Copyright: (c) 1998 Robert Roebling, Julian Smart
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_GTK_CONTROL_H_
|
|
#define _WX_GTK_CONTROL_H_
|
|
|
|
typedef struct _GtkLabel GtkLabel;
|
|
typedef struct _GtkFrame GtkFrame;
|
|
typedef struct _GtkEntry GtkEntry;
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// wxControl
|
|
//-----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxControl : public wxControlBase
|
|
{
|
|
typedef wxControlBase base_type;
|
|
public:
|
|
wxControl();
|
|
wxControl(wxWindow *parent, wxWindowID id,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize, long style = 0,
|
|
const wxValidator& validator = wxDefaultValidator,
|
|
const wxString& name = wxControlNameStr)
|
|
{
|
|
Create(parent, id, pos, size, style, validator, name);
|
|
}
|
|
|
|
bool Create(wxWindow *parent, wxWindowID id,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize, long style = 0,
|
|
const wxValidator& validator = wxDefaultValidator,
|
|
const wxString& name = wxControlNameStr);
|
|
|
|
virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE;
|
|
#ifdef __WXGTK3__
|
|
virtual bool SetFont(const wxFont& font) wxOVERRIDE;
|
|
#endif
|
|
|
|
protected:
|
|
virtual wxSize DoGetBestSize() const wxOVERRIDE;
|
|
void PostCreation(const wxSize& size);
|
|
|
|
// sets the label to the given string and also sets it for the given widget
|
|
void GTKSetLabelForLabel(GtkLabel *w, const wxString& label);
|
|
#if wxUSE_MARKUP
|
|
void GTKSetLabelWithMarkupForLabel(GtkLabel *w, const wxString& label);
|
|
#endif // wxUSE_MARKUP
|
|
|
|
// GtkFrame helpers
|
|
GtkWidget* GTKCreateFrame(const wxString& label);
|
|
void GTKSetLabelForFrame(GtkFrame *w, const wxString& label);
|
|
void GTKFrameApplyWidgetStyle(GtkFrame* w, GtkRcStyle* rc);
|
|
void GTKFrameSetMnemonicWidget(GtkFrame* w, GtkWidget* widget);
|
|
|
|
// remove mnemonics ("&"s) from the label
|
|
static wxString GTKRemoveMnemonics(const wxString& label);
|
|
|
|
// converts wx label to GTK+ label, i.e. basically replace "&"s with "_"s
|
|
static wxString GTKConvertMnemonics(const wxString &label);
|
|
|
|
// converts wx label to GTK+ labels preserving Pango markup
|
|
static wxString GTKConvertMnemonicsWithMarkup(const wxString& label);
|
|
|
|
// These are used by GetDefaultAttributes
|
|
static wxVisualAttributes
|
|
GetDefaultAttributesFromGTKWidget(GtkWidget* widget,
|
|
bool useBase = false,
|
|
int state = 0);
|
|
|
|
// Widgets that use the style->base colour for the BG colour should
|
|
// override this and return true.
|
|
virtual bool UseGTKStyleBase() const { return false; }
|
|
|
|
// Fix sensitivity due to bug in GTK+ < 2.14
|
|
void GTKFixSensitivity(bool onlyIfUnderMouse = true);
|
|
|
|
// Ask GTK+ for preferred size. Use it after setting the font.
|
|
wxSize GTKGetPreferredSize(GtkWidget* widget) const;
|
|
|
|
// Inner margins in a GtkEntry
|
|
wxPoint GTKGetEntryMargins(GtkEntry* entry) const;
|
|
|
|
private:
|
|
wxDECLARE_DYNAMIC_CLASS(wxControl);
|
|
};
|
|
|
|
#endif // _WX_GTK_CONTROL_H_
|