mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-12 09:09:12 +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.
127 lines
4.4 KiB
Plaintext
127 lines
4.4 KiB
Plaintext
/////////////////////////////////////////////////////////////////////////////
|
|
// File: wx.rc
|
|
// Purpose: wxWindows resource definitions. ALWAYS include
|
|
// this in your application resource file.
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created:
|
|
// Copyright: (c) Julian Smart
|
|
// Licence: wxWindows Licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#include <windows.h>
|
|
|
|
#include "wx/msw/rcdefs.h"
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// This is the MDI Window menu
|
|
//
|
|
|
|
wxWindowMenu MENU DISCARDABLE
|
|
BEGIN
|
|
POPUP "&Window"
|
|
BEGIN
|
|
MENUITEM "&Cascade", 4002
|
|
MENUITEM "Tile &Horizontally", 4001
|
|
MENUITEM "Tile &Vertically", 4005
|
|
MENUITEM "", -1
|
|
MENUITEM "&Arrange Icons", 4003
|
|
MENUITEM "&Next", 4004
|
|
END
|
|
END
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// Standard wxWindows Cursors
|
|
//
|
|
|
|
WXCURSOR_HAND CURSOR DISCARDABLE "wx/msw/hand.cur"
|
|
WXCURSOR_BULLSEYE CURSOR DISCARDABLE "wx/msw/bullseye.cur"
|
|
WXCURSOR_PENCIL CURSOR DISCARDABLE "wx/msw/pencil.cur"
|
|
WXCURSOR_MAGNIFIER CURSOR DISCARDABLE "wx/msw/magnif1.cur"
|
|
WXCURSOR_ROLLER CURSOR DISCARDABLE "wx/msw/roller.cur"
|
|
WXCURSOR_PBRUSH CURSOR DISCARDABLE "wx/msw/pbrush.cur"
|
|
WXCURSOR_PLEFT CURSOR DISCARDABLE "wx/msw/pntleft.cur"
|
|
WXCURSOR_PRIGHT CURSOR DISCARDABLE "wx/msw/pntright.cur"
|
|
WXCURSOR_BLANK CURSOR DISCARDABLE "wx/msw/blank.cur"
|
|
WXCURSOR_CROSS CURSOR DISCARDABLE "wx/msw/cross.cur"
|
|
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// Default Icons
|
|
//
|
|
|
|
// First wx icon in alphabetical order.
|
|
//
|
|
// Notice that it also may be used by Explorer as the application icon if the
|
|
// main program doesn't define any icons preceding this one in alphabetical
|
|
// order (i.e. any icons defined by it start with "wy", "x", "y" or "z") in
|
|
// 16*16 or 32*32 sizes.
|
|
wxICON_AAA ICON "wx/msw/std.ico"
|
|
|
|
//wxDEFAULT_FRAME ICON "wx/msw/std.ico"
|
|
//wxDEFAULT_MDIPARENTFRAME ICON "wx/msw/mdi.ico"
|
|
//wxDEFAULT_MDICHILDFRAME ICON "wx/msw/child.ico"
|
|
|
|
// Standard small icons
|
|
wxICON_SMALL_CLOSED_FOLDER ICON "wx/msw/folder1.ico"
|
|
wxICON_SMALL_OPEN_FOLDER ICON "wx/msw/folder2.ico"
|
|
wxICON_SMALL_FILE ICON "wx/msw/file1.ico"
|
|
wxICON_SMALL_COMPUTER ICON "wx/msw/computer.ico"
|
|
wxICON_SMALL_DRIVE ICON "wx/msw/drive.ico"
|
|
wxICON_SMALL_CDROM ICON "wx/msw/cdrom.ico"
|
|
wxICON_SMALL_FLOPPY ICON "wx/msw/floppy.ico"
|
|
wxICON_SMALL_REMOVEABLE ICON "wx/msw/removble.ico"
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// Bitmaps
|
|
//
|
|
|
|
// For wxContextHelpButton
|
|
csquery BITMAP "wx/msw/csquery.bmp"
|
|
|
|
// For obtaining the RGB values of standard colours
|
|
wxBITMAP_STD_COLOURS BITMAP "wx/msw/colours.bmp"
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// Include manifest file for common controls library v6 required to use themes.
|
|
//
|
|
// Predefining wxUSE_NO_MANIFEST as 1 always disables the use of the manifest.
|
|
// Otherwise we include it only if wxUSE_RC_MANIFEST is defined as 1.
|
|
//
|
|
|
|
#if !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0)
|
|
|
|
#if defined(wxUSE_RC_MANIFEST) && wxUSE_RC_MANIFEST
|
|
|
|
// see "about isolated applications" topic in MSDN
|
|
#ifdef ISOLATION_AWARE_ENABLED
|
|
#define wxMANIFEST_ID 2
|
|
#else
|
|
#define wxMANIFEST_ID 1
|
|
#endif
|
|
|
|
#if defined(WX_CPU_AMD64)
|
|
wxMANIFEST_ID 24 "wx/msw/amd64.manifest"
|
|
#elif defined(WX_CPU_IA64)
|
|
wxMANIFEST_ID 24 "wx/msw/ia64.manifest"
|
|
#elif defined(WX_CPU_X86)
|
|
wxMANIFEST_ID 24 "wx/msw/wx.manifest"
|
|
#else
|
|
// Notice that if the manifest is included, WX_CPU_XXX constant corresponding
|
|
// to the architecture we're compiling for must be defined. This can be done
|
|
// either manually in your make/project file or by configuring the resource
|
|
// compiler paths to search in $(WXWIN)/lib/$(COMPILER_PREFIX)_lib/mswu[d]
|
|
// directory for its include files, as wx/msw/rcdefs.h file in this directory
|
|
// is generated during wxWidgets build and contains the correct definition.
|
|
#error "One of WX_CPU_XXX constants must be defined. See comment above."
|
|
#endif
|
|
|
|
#endif // wxUSE_RC_MANIFEST
|
|
|
|
#endif // !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0)
|