Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use const wxWindow in wxSystemSettings::GetMetric

Browse Source
This commit is contained in:
Maarten Bent
2019-07-14 20:14:02 +02:00
parent b87a599f07
commit e32c20ffcc
14 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/settings.h
View File

@@ -216,7 +216,7 @@ public:
static wxFont GetFont(wxSystemFont index); static wxFont GetFont(wxSystemFont index);
// get a system-dependent metric // get a system-dependent metric
static int GetMetric(wxSystemMetric index, wxWindow * win = NULL); static int GetMetric(wxSystemMetric index, const wxWindow* win = NULL);
// get the object describing the current system appearance // get the object describing the current system appearance
static wxSystemAppearance GetAppearance(); static wxSystemAppearance GetAppearance();
@@ -240,7 +240,7 @@ public:
// some metrics are toolkit-dependent and provided by wxUniv, some are // some metrics are toolkit-dependent and provided by wxUniv, some are
// lowlevel // lowlevel
static int GetMetric(wxSystemMetric index, wxWindow *win = NULL); static int GetMetric(wxSystemMetric index, const wxWindow* win = NULL);
#endif // __WXUNIVERSAL__ #endif // __WXUNIVERSAL__
// Get system screen design (desktop, pda, ..) used for // Get system screen design (desktop, pda, ..) used for

2
src/common/wincmn.cpp
View File

@@ -804,7 +804,7 @@ double wxWindowBase::GetContentScaleFactor() const
static int wxGetMetricOrDefault(wxSystemMetric what, const wxWindowBase* win) static int wxGetMetricOrDefault(wxSystemMetric what, const wxWindowBase* win)
{ {
int rc = wxSystemSettings::GetMetric( int rc = wxSystemSettings::GetMetric(
what, static_cast<wxWindow*>(const_cast<wxWindowBase*>(win))); what, static_cast<const wxWindow*>(win));
if ( rc == -1 ) if ( rc == -1 )
{ {
switch ( what ) switch ( what )

2
src/dfb/settings.cpp
View File

@@ -63,7 +63,7 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
} }
int wxSystemSettingsNative::GetMetric(wxSystemMetric index, int wxSystemSettingsNative::GetMetric(wxSystemMetric index,
wxWindow* WXUNUSED(win)) const wxWindow* WXUNUSED(win))
{ {
int val; int val;

5
src/generic/scrlwing.cpp
View File

@@ -1553,12 +1553,11 @@ wxSize wxScrolledT_Helper::FilterBestSize(const wxWindow *win,
wxSize minSize = win->GetMinSize(); wxSize minSize = win->GetMinSize();
wxWindow* window = const_cast<wxWindow*>(win);
if ( ppuX > 0 ) if ( ppuX > 0 )
best.x = minSize.x + wxSystemSettings::GetMetric(wxSYS_VSCROLL_X, window); best.x = minSize.x + wxSystemSettings::GetMetric(wxSYS_VSCROLL_X, win);
if ( ppuY > 0 ) if ( ppuY > 0 )
best.y = minSize.y + wxSystemSettings::GetMetric(wxSYS_HSCROLL_Y, window); best.y = minSize.y + wxSystemSettings::GetMetric(wxSYS_HSCROLL_Y, win);
} }
return best; return best;

4
src/gtk/settings.cpp
View File

@@ -839,7 +839,7 @@ static GtkSettings *GetSettingsForWindowScreen(GdkWindow *window)
: gtk_settings_get_default(); : gtk_settings_get_default();
} }
static int GetBorderWidth(wxSystemMetric index, wxWindow* win) static int GetBorderWidth(wxSystemMetric index, const wxWindow* win)
{ {
if (win->m_wxwindow) if (win->m_wxwindow)
{ {
@@ -912,7 +912,7 @@ static int GetScrollbarWidth()
return width; return width;
} }
int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win ) int wxSystemSettingsNative::GetMetric( wxSystemMetric index, const wxWindow* win )
{ {
GdkWindow *window = NULL; GdkWindow *window = NULL;
if (win) if (win)

2
src/gtk1/settings.cpp
View File

@@ -358,7 +358,7 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
} }
int int
wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(win)) wxSystemSettingsNative::GetMetric(wxSystemMetric index, const wxWindow* WXUNUSED(win))
{ {
switch (index) switch (index)
{ {

2
src/motif/settings.cpp
View File

@@ -196,7 +196,7 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
} }
// Get a system metric, e.g. scrollbar size // Get a system metric, e.g. scrollbar size
int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(win)) int wxSystemSettingsNative::GetMetric(wxSystemMetric index, const wxWindow* WXUNUSED(win))
{ {
int return_value = 0; int return_value = 0;

2
src/msw/settings.cpp
View File

@@ -262,7 +262,7 @@ static const int gs_metricsMap[] =
}; };
// Get a system metric, e.g. scrollbar size // Get a system metric, e.g. scrollbar size
int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* win) int wxSystemSettingsNative::GetMetric(wxSystemMetric index, const wxWindow* win)
{ {
wxCHECK_MSG( index > 0 && (size_t)index < WXSIZEOF(gs_metricsMap), 0, wxCHECK_MSG( index > 0 && (size_t)index < WXSIZEOF(gs_metricsMap), 0,
wxT("invalid metric") ); wxT("invalid metric") );

2
src/osx/cocoa/settings.mm
View File

@@ -217,7 +217,7 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Get a system metric, e.g. scrollbar size // Get a system metric, e.g. scrollbar size
int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow *WXUNUSED(win)) int wxSystemSettingsNative::GetMetric(wxSystemMetric index, const wxWindow* WXUNUSED(win))
{ {
int value; int value;

2
src/osx/iphone/settings.mm
View File

@@ -155,7 +155,7 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Get a system metric, e.g. scrollbar size // Get a system metric, e.g. scrollbar size
int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow *WXUNUSED(win)) int wxSystemSettingsNative::GetMetric(wxSystemMetric index, const wxWindow* WXUNUSED(win))
{ {
int value; int value;

2
src/qt/settings.cpp
View File

@@ -163,7 +163,7 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
} }
int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow * WXUNUSED(win)) int wxSystemSettingsNative::GetMetric(wxSystemMetric index, const wxWindow* WXUNUSED(win))
{ {
switch (index) switch (index)
{ {

3
src/stc/PlatWX.cpp
View File

@@ -2718,8 +2718,7 @@ PRectangle wxSTCListBox::GetDesiredRect() const
// Add space for a scrollbar if needed. // Add space for a scrollbar if needed.
if ( count > desiredVisibleRows ) if ( count > desiredVisibleRows )
maxw += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X, maxw += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X, this);
const_cast<wxWindow*>(wxDynamicCast(this, wxWindow)));
// Add borders. // Add borders.
maxw += 2 * m_borderSize; maxw += 2 * m_borderSize;

2
src/univ/settingsuniv.cpp
View File

@@ -96,7 +96,7 @@ wxColour wxSystemSettings::GetColour(wxSystemColour index)
return wxTheme::Get()->GetColourScheme()->Get(col); return wxTheme::Get()->GetColourScheme()->Get(col);
} }
int wxSystemSettings::GetMetric(wxSystemMetric index, wxWindow *win) int wxSystemSettings::GetMetric(wxSystemMetric index, const wxWindow* win)
{ {
switch ( index ) switch ( index )
{ {

2
src/x11/settings.cpp
View File

@@ -56,7 +56,7 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
} }
// Get a system metric, e.g. scrollbar size // Get a system metric, e.g. scrollbar size
int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(win)) int wxSystemSettingsNative::GetMetric(wxSystemMetric index, const wxWindow* WXUNUSED(win))
{ {
switch ( index) switch ( index)
{ {