mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-09-22 12:21:41 +02: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.
169 lines
7 KiB
C++
169 lines
7 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/x11/privx.h
|
|
// Purpose: Private declarations common to X11 and Motif ports
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created: 17/09/98
|
|
// Copyright: (c) Julian Smart
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_PRIVX_H_
|
|
#define _WX_PRIVX_H_
|
|
|
|
#include "wx/defs.h"
|
|
#include "wx/utils.h"
|
|
#include "wx/colour.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
|
|
|
|
class WXDLLIMPEXP_FWD_CORE wxMouseEvent;
|
|
class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
|
|
class WXDLLIMPEXP_FWD_CORE wxWindow;
|
|
class WXDLLIMPEXP_FWD_CORE wxRegion;
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// key events related functions
|
|
// ----------------------------------------------------------------------------
|
|
|
|
WXPixel wxGetBestMatchingPixel(Display *display, XColor *desiredColor, Colormap cmap);
|
|
Pixmap XCreateInsensitivePixmap( Display *display, Pixmap pixmap );
|
|
|
|
extern XColor g_itemColors[];
|
|
extern int wxComputeColours (Display *display, const wxColour * back, const wxColour * fore);
|
|
|
|
// For convenience
|
|
inline Display* wxGlobalDisplay() { return (Display*) wxGetDisplay(); }
|
|
|
|
#define wxMAX_RGB 0xff
|
|
#define wxMAX_SV 1000
|
|
#define wxSIGN(x) ((x < 0) ? -x : x)
|
|
#define wxH_WEIGHT 4
|
|
#define wxS_WEIGHT 1
|
|
#define wxV_WEIGHT 2
|
|
|
|
typedef struct wx_hsv {
|
|
int h,s,v;
|
|
} wxHSV;
|
|
|
|
#define wxMax3(x,y,z) ((x > y) ? ((x > z) ? x : z) : ((y > z) ? y : z))
|
|
#define wxMin3(x,y,z) ((x < y) ? ((x < z) ? x : z) : ((y < z) ? y : z))
|
|
|
|
void wxHSVToXColor(wxHSV *hsv,XColor *xcolor);
|
|
void wxXColorToHSV(wxHSV *hsv,XColor *xcolor);
|
|
void wxAllocNearestColor(Display *display,Colormap colormap,XColor *xcolor);
|
|
void wxAllocColor(Display *display,Colormap colormap,XColor *xcolor);
|
|
|
|
// For debugging
|
|
wxString wxGetXEventName(XEvent& event);
|
|
|
|
#if wxUSE_NANOX
|
|
#define XEventGetWindow(event) event->general.wid
|
|
#define XEventGetType(event) event->general.type
|
|
#define XConfigureEventGetX(event) ((int) event->update.x)
|
|
#define XConfigureEventGetY(event) ((int) event->update.y)
|
|
#define XConfigureEventGetWidth(event) ((int) event->update.width)
|
|
#define XConfigureEventGetHeight(event) ((int) event->update.height)
|
|
#define XExposeEventGetX(event) event->exposure.x
|
|
#define XExposeEventGetY(event) event->exposure.y
|
|
#define XExposeEventGetWidth(event) event->exposure.width
|
|
#define XExposeEventGetHeight(event) event->exposure.height
|
|
#define XButtonEventGetTime(event) (wxGetLocalTime())
|
|
#define XButtonEventLChanged(event) (event->button.changebuttons & GR_BUTTON_L)
|
|
#define XButtonEventMChanged(event) (event->button.changebuttons & GR_BUTTON_M)
|
|
#define XButtonEventRChanged(event) (event->button.changebuttons & GR_BUTTON_R)
|
|
#define XButtonEventLIsDown(x) ((x)->button.buttons & GR_BUTTON_L)
|
|
#define XButtonEventMIsDown(x) ((x)->button.buttons & GR_BUTTON_M)
|
|
#define XButtonEventRIsDown(x) ((x)->button.buttons & GR_BUTTON_R)
|
|
#define XButtonEventShiftIsDown(x) (x->button.modifiers & MWKMOD_SHIFT)
|
|
#define XButtonEventCtrlIsDown(x) (x->button.modifiers & MWKMOD_CTRL)
|
|
#define XButtonEventAltIsDown(x) (x->button.modifiers & MWKMOD_ALT)
|
|
#define XButtonEventMetaIsDown(x) (x->button.modifiers & MWKMOD_META)
|
|
#define XButtonEventGetX(event) (event->button.x)
|
|
#define XButtonEventGetY(event) (event->button.y)
|
|
#define XKeyEventGetTime(event) (wxGetLocalTime())
|
|
#define XKeyEventGetX(event) (event->keystroke.x)
|
|
#define XKeyEventGetY(event) (event->keystroke.y)
|
|
#define XKeyEventShiftIsDown(x) (x->keystroke.modifiers & MWKMOD_SHIFT)
|
|
#define XKeyEventCtrlIsDown(x) (x->keystroke.modifiers & MWKMOD_CTRL)
|
|
#define XKeyEventAltIsDown(x) (x->keystroke.modifiers & MWKMOD_ALT)
|
|
#define XKeyEventMetaIsDown(x) (x->keystroke.modifiers & MWKMOD_META)
|
|
#define XFontStructGetAscent(f) f->info.baseline
|
|
|
|
#else
|
|
|
|
#define XEventGetWindow(event) event->xany.window
|
|
#define XEventGetType(event) event->xany.type
|
|
#define XConfigureEventGetX(event) event->xconfigure.x
|
|
#define XConfigureEventGetY(event) event->xconfigure.y
|
|
#define XConfigureEventGetWidth(event) event->xconfigure.width
|
|
#define XConfigureEventGetHeight(event) event->xconfigure.height
|
|
#define XExposeEventGetX(event) event->xexpose.x
|
|
#define XExposeEventGetY(event) event->xexpose.y
|
|
#define XExposeEventGetWidth(event) event->xexpose.width
|
|
#define XExposeEventGetHeight(event) event->xexpose.height
|
|
#define XButtonEventGetTime(event) (event->xbutton.time)
|
|
#define XButtonEventLChanged(event) (event->xbutton.button == Button1)
|
|
#define XButtonEventMChanged(event) (event->xbutton.button == Button2)
|
|
#define XButtonEventRChanged(event) (event->xbutton.button == Button3)
|
|
#define XButtonEventLIsDown(x) ((x)->xbutton.state & Button1Mask)
|
|
#define XButtonEventMIsDown(x) ((x)->xbutton.state & Button2Mask)
|
|
#define XButtonEventRIsDown(x) ((x)->xbutton.state & Button3Mask)
|
|
#define XButtonEventShiftIsDown(x) (x->xbutton.state & ShiftMask)
|
|
#define XButtonEventCtrlIsDown(x) (x->xbutton.state & ControlMask)
|
|
#define XButtonEventAltIsDown(x) (x->xbutton.state & Mod3Mask)
|
|
#define XButtonEventMetaIsDown(x) (x->xbutton.state & Mod1Mask)
|
|
#define XButtonEventGetX(event) (event->xbutton.x)
|
|
#define XButtonEventGetY(event) (event->xbutton.y)
|
|
#define XKeyEventGetTime(event) (event->xkey.time)
|
|
#define XKeyEventShiftIsDown(x) (x->xkey.state & ShiftMask)
|
|
#define XKeyEventCtrlIsDown(x) (x->xkey.state & ControlMask)
|
|
#define XKeyEventAltIsDown(x) (x->xkey.state & Mod3Mask)
|
|
#define XKeyEventMetaIsDown(x) (x->xkey.state & Mod1Mask)
|
|
#define XKeyEventGetX(event) (event->xkey.x)
|
|
#define XKeyEventGetY(event) (event->xkey.y)
|
|
#define XFontStructGetAscent(f) f->ascent
|
|
#endif
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// Misc functions
|
|
// ----------------------------------------------------------------------------
|
|
|
|
bool wxDoSetShape( Display* xdisplay, Window xwindow, const wxRegion& region );
|
|
|
|
class WXDLLIMPEXP_CORE wxXVisualInfo
|
|
{
|
|
public:
|
|
wxXVisualInfo();
|
|
~wxXVisualInfo();
|
|
void Init( Display* dpy, XVisualInfo* visualInfo );
|
|
|
|
int m_visualType; // TrueColor, DirectColor etc.
|
|
int m_visualDepth;
|
|
int m_visualColormapSize;
|
|
void *m_visualColormap;
|
|
int m_visualScreen;
|
|
unsigned long m_visualRedMask;
|
|
unsigned long m_visualGreenMask;
|
|
unsigned long m_visualBlueMask;
|
|
int m_visualRedShift;
|
|
int m_visualGreenShift;
|
|
int m_visualBlueShift;
|
|
int m_visualRedPrec;
|
|
int m_visualGreenPrec;
|
|
int m_visualBluePrec;
|
|
|
|
unsigned char *m_colorCube;
|
|
};
|
|
|
|
bool wxFillXVisualInfo( wxXVisualInfo* vi, Display* dpy );
|
|
|
|
#endif // _WX_PRIVX_H_
|