mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-27 08:15:33 +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.
84 lines
2.8 KiB
C++
84 lines
2.8 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/x11/private.h
|
|
// Purpose: Private declarations for X11 port
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created: 17/09/98
|
|
// Copyright: (c) Julian Smart
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_PRIVATE_H_
|
|
#define _WX_PRIVATE_H_
|
|
|
|
#include "wx/defs.h"
|
|
#include "wx/hashmap.h"
|
|
#include "wx/utils.h"
|
|
#if defined( __cplusplus ) && defined( __VMS )
|
|
#pragma message disable nosimpint
|
|
#endif
|
|
#include "X11/Xlib.h"
|
|
#include "X11/Xatom.h"
|
|
#include "X11/Xutil.h"
|
|
#if defined( __cplusplus ) && defined( __VMS )
|
|
#pragma message enable nosimpint
|
|
#endif
|
|
|
|
// Include common declarations
|
|
#include "wx/x11/privx.h"
|
|
|
|
#if wxUSE_PANGO
|
|
#include <pango/pango.h>
|
|
#endif
|
|
|
|
class WXDLLIMPEXP_FWD_CORE wxMouseEvent;
|
|
class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
|
|
class WXDLLIMPEXP_FWD_CORE wxWindow;
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// Some Unicode <-> UTF8 macros stolen from GTK
|
|
// ----------------------------------------------------------------------------
|
|
|
|
#if wxUSE_UNICODE
|
|
#define wxGTK_CONV(s) wxConvUTF8.cWX2MB(s)
|
|
#define wxGTK_CONV_BACK(s) wxConvUTF8.cMB2WX(s)
|
|
#else
|
|
#define wxGTK_CONV(s) s.c_str()
|
|
#define wxGTK_CONV_BACK(s) s
|
|
#endif
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// we maintain a hash table which contains the mapping from Widget to wxWindow
|
|
// corresponding to the window for this widget
|
|
// ----------------------------------------------------------------------------
|
|
|
|
WX_DECLARE_HASH_MAP(Window, wxWindow *, wxIntegerHash, wxIntegerEqual, wxWindowHash);
|
|
|
|
// these hashes are defined in app.cpp
|
|
extern wxWindowHash *wxWidgetHashTable;
|
|
extern wxWindowHash *wxClientWidgetHashTable;
|
|
|
|
extern void wxDeleteWindowFromTable(Window w);
|
|
extern wxWindow *wxGetWindowFromTable(Window w);
|
|
extern bool wxAddWindowToTable(Window w, wxWindow *win);
|
|
|
|
extern void wxDeleteClientWindowFromTable(Window w);
|
|
extern wxWindow *wxGetClientWindowFromTable(Window w);
|
|
extern bool wxAddClientWindowToTable(Window w, wxWindow *win);
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// TranslateXXXEvent() functions - translate X event to wxWindow one
|
|
// ----------------------------------------------------------------------------
|
|
extern bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Window window, XEvent *xevent);
|
|
extern bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Window window, XEvent *xevent, bool isAscii = FALSE);
|
|
|
|
extern Window wxGetWindowParent(Window window);
|
|
|
|
// Set the window manager decorations according to the
|
|
// given wxWidgets style
|
|
bool wxSetWMDecorations(Window w, long style);
|
|
bool wxMWMIsRunning(Window w);
|
|
|
|
#endif
|
|
// _WX_PRIVATE_H_
|