mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-18 03:59:14 +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.
86 lines
4.1 KiB
C
86 lines
4.1 KiB
C
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/msw/init.h
|
|
// Purpose: Windows-specific wxEntry() overload
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created: 01/02/97
|
|
// Copyright: (c) Julian Smart
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_MSW_INIT_H_
|
|
#define _WX_MSW_INIT_H_
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// Windows-specific wxEntry() overload and wxIMPLEMENT_WXWIN_MAIN definition
|
|
// ----------------------------------------------------------------------------
|
|
|
|
// we need HINSTANCE declaration to define WinMain()
|
|
#include "wx/msw/wrapwin.h"
|
|
|
|
#ifndef SW_SHOWNORMAL
|
|
#define SW_SHOWNORMAL 1
|
|
#endif
|
|
|
|
// WinMain() is always ANSI, even in Unicode build.
|
|
typedef char *wxCmdLineArgType;
|
|
|
|
// Windows-only overloads of wxEntry() and wxEntryStart() which take the
|
|
// parameters passed to WinMain() instead of those passed to main()
|
|
extern WXDLLIMPEXP_CORE bool
|
|
wxEntryStart(HINSTANCE hInstance,
|
|
HINSTANCE hPrevInstance = NULL,
|
|
wxCmdLineArgType pCmdLine = NULL,
|
|
int nCmdShow = SW_SHOWNORMAL);
|
|
|
|
extern WXDLLIMPEXP_CORE int
|
|
wxEntry(HINSTANCE hInstance,
|
|
HINSTANCE hPrevInstance = NULL,
|
|
wxCmdLineArgType pCmdLine = NULL,
|
|
int nCmdShow = SW_SHOWNORMAL);
|
|
|
|
#if defined(__BORLANDC__) && wxUSE_UNICODE
|
|
// Borland C++ has the following nonstandard behaviour: when the -WU
|
|
// command line flag is used, the linker expects to find wWinMain instead
|
|
// of WinMain. This flag causes the compiler to define _UNICODE and
|
|
// UNICODE symbols and there's no way to detect its use, so we have to
|
|
// define both WinMain and wWinMain so that wxIMPLEMENT_WXWIN_MAIN works
|
|
// for both code compiled with and without -WU.
|
|
// See http://sourceforge.net/tracker/?func=detail&atid=309863&aid=1935997&group_id=9863
|
|
// for more details.
|
|
#define wxIMPLEMENT_WXWIN_MAIN_BORLAND_NONSTANDARD \
|
|
extern "C" int WINAPI wWinMain(HINSTANCE hInstance, \
|
|
HINSTANCE hPrevInstance, \
|
|
wchar_t * WXUNUSED(lpCmdLine), \
|
|
int nCmdShow) \
|
|
{ \
|
|
wxDISABLE_DEBUG_SUPPORT(); \
|
|
\
|
|
/* NB: wxEntry expects lpCmdLine argument to be char*, not */ \
|
|
/* wchar_t*, but fortunately it's not used anywhere */ \
|
|
/* and we can simply pass NULL in: */ \
|
|
return wxEntry(hInstance, hPrevInstance, NULL, nCmdShow); \
|
|
}
|
|
#else
|
|
#define wxIMPLEMENT_WXWIN_MAIN_BORLAND_NONSTANDARD
|
|
#endif // defined(__BORLANDC__) && wxUSE_UNICODE
|
|
|
|
#define wxIMPLEMENT_WXWIN_MAIN \
|
|
extern "C" int WINAPI WinMain(HINSTANCE hInstance, \
|
|
HINSTANCE hPrevInstance, \
|
|
wxCmdLineArgType WXUNUSED(lpCmdLine), \
|
|
int nCmdShow) \
|
|
{ \
|
|
wxDISABLE_DEBUG_SUPPORT(); \
|
|
\
|
|
/* NB: We pass NULL in place of lpCmdLine to behave the same as */ \
|
|
/* Borland-specific wWinMain() above. If it becomes needed */ \
|
|
/* to pass lpCmdLine to wxEntry() here, you'll have to fix */ \
|
|
/* wWinMain() above too. */ \
|
|
return wxEntry(hInstance, hPrevInstance, NULL, nCmdShow); \
|
|
} \
|
|
wxIMPLEMENT_WXWIN_MAIN_BORLAND_NONSTANDARD
|
|
|
|
|
|
#endif // _WX_MSW_INIT_H_
|