Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-08-17 08:53:06 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Remove wxUSE_GEOMETRY

Browse Source 
Disabling it doesn't save much on code size and the build without it is
currently broken anyhow, so just remove the possibility to turn it off.

Closes #26388.

Closes #26402.
This commit is contained in:
stevecor
2026-04-24 19:10:09 +02:00
committed by Vadim Zeitlin
parent bad7d09d4f
commit 1bc4900ed6
20 changed files with 0 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/cmake/options.cmake
-1
View File
@@ -221,7 +221,6 @@ if(WIN32 OR APPLE)
wx_option(wxUSE_FSVOLUME "use wxFSVolume class")
endif()
wx_option(wxUSE_FSWATCHER "use wxFileSystemWatcher class")
wx_option(wxUSE_GEOMETRY "use geometry class")
wx_option(wxUSE_LOG "use logging system")
wx_option(wxUSE_MIMETYPE "use wxMimeTypesManager")
wx_option(wxUSE_PRINTF_POS_PARAMS "use wxVsnprintf() which supports positional parameters")
build/cmake/setup.h.in
-2
View File
@@ -420,8 +420,6 @@
#cmakedefine01 wxUSE_DISPLAY
#cmakedefine01 wxUSE_GEOMETRY
#cmakedefine01 wxUSE_IMAGLIST
#cmakedefine01 wxUSE_INFOBAR
build/tools/build-wxwidgets.py
-1
View File
@@ -270,7 +270,6 @@ def main(scriptName, args):
"--enable-graphics_ctx",
"--enable-mediactrl",
"--enable-display",
"--enable-geometry",
"--enable-debug_flag",
"--enable-optimise",
"--disable-debugreport",
configure
Vendored
-36
View File
@@ -1205,7 +1205,6 @@ enable_fs_inet
enable_fs_zip
enable_fsvolume
enable_fswatcher
enable_geometry
enable_log
enable_mimetype
enable_printfposparam
@@ -2184,7 +2183,6 @@ Optional Features:
--enable-fs_zip now replaced by fs_archive
--enable-fsvolume use wxFSVolume class
--enable-fswatcher use wxFileSystemWatcher class
--enable-geometry use geometry class
--enable-log use logging system
--enable-mimetype use wxMimeTypesManager
--enable-printfposparam use wxVsnprintf() which supports positional parameters
@@ -7591,35 +7589,6 @@ fi
eval "$wx_cv_use_fswatcher"
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
if test x"$enablestring" = xdisable; then
defaultval=yes
else
defaultval=no
fi
fi
# Check whether --enable-geometry was given.
if test "${enable_geometry+set}" = set; then :
enableval=$enable_geometry;
if test "$enableval" = yes; then
wx_cv_use_geometry='wxUSE_GEOMETRY=yes'
else
wx_cv_use_geometry='wxUSE_GEOMETRY=no'
fi
else
wx_cv_use_geometry='wxUSE_GEOMETRY=${'DEFAULT_wxUSE_GEOMETRY":-$defaultval}"
fi
eval "$wx_cv_use_geometry"
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
@@ -38053,11 +38022,6 @@ if test "$wxUSE_LOG" = "yes"; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS keyboard"
fi
if test "$wxUSE_GEOMETRY" = "yes"; then
$as_echo "#define wxUSE_GEOMETRY 1" >>confdefs.h
fi
if test "$wxUSE_BASE64" = "yes"; then
$as_echo "#define wxUSE_BASE64 1" >>confdefs.h
configure.ac
-5
View File
@@ -736,7 +736,6 @@ if test "$USE_WIN32" = 1 -o "$USE_DARWIN"; then
WX_ARG_FEATURE(fsvolume, [ --enable-fsvolume use wxFSVolume class], wxUSE_FSVOLUME)
fi
WX_ARG_FEATURE(fswatcher, [ --enable-fswatcher use wxFileSystemWatcher class], wxUSE_FSWATCHER)
WX_ARG_FEATURE(geometry, [ --enable-geometry use geometry class], wxUSE_GEOMETRY)
WX_ARG_FEATURE(log, [ --enable-log use logging system], wxUSE_LOG)
WX_ARG_FEATURE(mimetype, [ --enable-mimetype use wxMimeTypesManager], wxUSE_MIMETYPE)
WX_ARG_FEATURE(printfposparam,[ --enable-printfposparam use wxVsnprintf() which supports positional parameters], wxUSE_PRINTF_POS_PARAMS)
@@ -5663,10 +5662,6 @@ if test "$wxUSE_LOG" = "yes"; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS keyboard"
fi
if test "$wxUSE_GEOMETRY" = "yes"; then
AC_DEFINE(wxUSE_GEOMETRY)
fi
if test "$wxUSE_BASE64" = "yes"; then
AC_DEFINE(wxUSE_BASE64)
fi
docs/doxygen/mainpages/const_wxusedef.h
-1
View File
@@ -126,7 +126,6 @@ library:
@itemdef{wxUSE_GENERIC_DRAGIMAGE, Used in wxDragImage sample.}
@itemdef{wxUSE_GENERIC_DRAWELLIPSE, See comment in wx/dc.h file.}
@itemdef{wxUSE_GENERIC_MDI_AS_NATIVE, This is not a user-settable symbol, it is only used internally in wx/generic/mdig.h.}
@itemdef{wxUSE_GEOMETRY, Use common geometry classes}
@itemdef{wxUSE_GIF, Use GIF wxImageHandler}
@itemdef{wxUSE_GLCANVAS, Enables OpenGL support.}
@itemdef{wxUSE_GRAPHICS_CONTEXT, Use wxGraphicsContext and related classes.}
include/wx/affinematrix2d.h
-4
View File
@@ -12,8 +12,6 @@
#include "wx/defs.h"
#if wxUSE_GEOMETRY
#include "wx/affinematrix2dbase.h"
// A simple implementation of wxAffineMatrix2DBase interface done entirely in
@@ -46,6 +44,4 @@ private:
wxDouble m_11, m_12, m_21, m_22, m_tx, m_ty;
};
#endif // wxUSE_GEOMETRY
#endif // _WX_AFFINEMATRIX2D_H_
include/wx/affinematrix2dbase.h
-4
View File
@@ -12,8 +12,6 @@
#include "wx/defs.h"
#if wxUSE_GEOMETRY
#include "wx/geometry.h"
struct wxMatrix2D
@@ -122,6 +120,4 @@ protected:
wxPoint2DDouble DoTransformDistance(const wxPoint2DDouble& p) const = 0;
};
#endif // wxUSE_GEOMETRY
#endif // _WX_AFFINEMATRIX2DBASE_H_
include/wx/android/setup.h
-3
View File
@@ -1054,9 +1054,6 @@
// Recommended setting: 1 if you need it, can be safely set to 0 otherwise
#define wxUSE_DISPLAY 1
// Miscellaneous geometry code: needed for Canvas library
#define wxUSE_GEOMETRY 1
// Use wxImageList. This class is needed by wxNotebook, wxTreeCtrl and
// wxListCtrl.
//
include/wx/chkconf.h
-18
View File
@@ -1711,24 +1711,6 @@
# define wxUSE_ACTIVITYINDICATOR 0
#endif /* wxUSE_ACTIVITYINDICATOR */
#if wxUSE_GRAPHICS_CONTEXT && !wxUSE_GEOMETRY
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_GRAPHICS_CONTEXT requires wxUSE_GEOMETRY"
# else
# undef wxUSE_GRAPHICS_CONTEXT
# define wxUSE_GRAPHICS_CONTEXT 0
# endif
#endif /* wxUSE_GRAPHICS_CONTEXT */
#if wxUSE_DC_TRANSFORM_MATRIX && !wxUSE_GEOMETRY
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_DC_TRANSFORM_MATRIX requires wxUSE_GEOMETRY"
# else
# undef wxUSE_DC_TRANSFORM_MATRIX
# define wxUSE_DC_TRANSFORM_MATRIX 0
# endif
#endif /* wxUSE_DC_TRANSFORM_MATRIX */
/* generic controls dependencies */
#if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)
# if wxUSE_FONTDLG || wxUSE_FILEDLG || wxUSE_CHOICEDLG
include/wx/geometry.h
-5
View File
@@ -12,8 +12,6 @@
#include "wx/defs.h"
#if wxUSE_GEOMETRY
#include "wx/utils.h"
#include "wx/gdicmn.h"
#include "wx/math.h"
@@ -848,7 +846,4 @@ public :
virtual wxRect2DInt InverseTransform( const wxRect2DInt &r ) const ;
};
#endif // wxUSE_GEOMETRY
#endif // _WX_GEOMETRY_H_
include/wx/gtk/setup.h
-3
View File
@@ -1054,9 +1054,6 @@
// Recommended setting: 1 if you need it, can be safely set to 0 otherwise
#define wxUSE_DISPLAY 1
// Miscellaneous geometry code: needed for Canvas library
#define wxUSE_GEOMETRY 1
// Use wxImageList. This class is needed by wxNotebook, wxTreeCtrl and
// wxListCtrl.
//
include/wx/msw/setup.h
-3
View File
@@ -1054,9 +1054,6 @@
// Recommended setting: 1 if you need it, can be safely set to 0 otherwise
#define wxUSE_DISPLAY 1
// Miscellaneous geometry code: needed for Canvas library
#define wxUSE_GEOMETRY 1
// Use wxImageList. This class is needed by wxNotebook, wxTreeCtrl and
// wxListCtrl.
//
include/wx/osx/setup.h
-3
View File
@@ -1061,9 +1061,6 @@
// Recommended setting: 1 if you need it, can be safely set to 0 otherwise
#define wxUSE_DISPLAY 1
// Miscellaneous geometry code: needed for Canvas library
#define wxUSE_GEOMETRY 1
// Use wxImageList. This class is needed by wxNotebook, wxTreeCtrl and
// wxListCtrl.
//
include/wx/setup_inc.h
-3
View File
@@ -1050,9 +1050,6 @@
// Recommended setting: 1 if you need it, can be safely set to 0 otherwise
#define wxUSE_DISPLAY 1
// Miscellaneous geometry code: needed for Canvas library
#define wxUSE_GEOMETRY 1
// Use wxImageList. This class is needed by wxNotebook, wxTreeCtrl and
// wxListCtrl.
//
include/wx/univ/setup.h
-3
View File
@@ -1054,9 +1054,6 @@
// Recommended setting: 1 if you need it, can be safely set to 0 otherwise
#define wxUSE_DISPLAY 1
// Miscellaneous geometry code: needed for Canvas library
#define wxUSE_GEOMETRY 1
// Use wxImageList. This class is needed by wxNotebook, wxTreeCtrl and
// wxListCtrl.
//
setup.h.in
-2
View File
@@ -419,8 +419,6 @@
#define wxUSE_DISPLAY 0
#define wxUSE_GEOMETRY 0
#define wxUSE_IMAGLIST 0
#define wxUSE_INFOBAR 0
setup.h_vms
-2
View File
@@ -455,8 +455,6 @@ typedef pid_t GPid;
#define wxUSE_DISPLAY 0
#define wxUSE_GEOMETRY 1
#define wxUSE_IMAGLIST 1
#define wxUSE_INFOBAR 1
src/common/affinematrix2d.cpp
-5
View File
@@ -9,9 +9,6 @@
#include "wx/wxprec.h"
#if wxUSE_GEOMETRY
#include "wx/affinematrix2d.h"
#include "wx/math.h"
@@ -185,5 +182,3 @@ bool wxAffineMatrix2D::IsIdentity() const
m_21 == 0 && m_22 == 1 &&
m_tx == 0 && m_ty == 0;
}
#endif // wxUSE_GEOMETRY
src/common/geometry.cpp
-5
View File
@@ -10,9 +10,6 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#if wxUSE_GEOMETRY
#include "wx/geometry.h"
#ifndef WX_PRECOMP
@@ -418,5 +415,3 @@ wxRect2DInt wxTransform2D::InverseTransform( const wxRect2DInt &r ) const
InverseTransform( &res );
return res;
}
#endif // wxUSE_GEOMETRY