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

Make ConvertPixelsToDialog() and ConvertDialogToPixels() const.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63193 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2010-01-19 17:53:29 +00:00
parent e27619029d
commit 0e7f59ab29
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/window.h
View File

@@ -886,16 +886,16 @@ public:
// dialog units translations // dialog units translations
// ------------------------- // -------------------------
wxPoint ConvertPixelsToDialog( const wxPoint& pt ); wxPoint ConvertPixelsToDialog( const wxPoint& pt ) const;
wxPoint ConvertDialogToPixels( const wxPoint& pt ); wxPoint ConvertDialogToPixels( const wxPoint& pt ) const;
wxSize ConvertPixelsToDialog( const wxSize& sz ) wxSize ConvertPixelsToDialog( const wxSize& sz ) const
{ {
wxPoint pt(ConvertPixelsToDialog(wxPoint(sz.x, sz.y))); wxPoint pt(ConvertPixelsToDialog(wxPoint(sz.x, sz.y)));
return wxSize(pt.x, pt.y); return wxSize(pt.x, pt.y);
} }
wxSize ConvertDialogToPixels( const wxSize& sz ) wxSize ConvertDialogToPixels( const wxSize& sz ) const
{ {
wxPoint pt(ConvertDialogToPixels(wxPoint(sz.x, sz.y))); wxPoint pt(ConvertDialogToPixels(wxPoint(sz.x, sz.y)));

8
interface/wx/window.h
View File

@@ -1354,12 +1354,12 @@ public:
@see ConvertPixelsToDialog() @see ConvertPixelsToDialog()
*/ */
wxPoint ConvertDialogToPixels(const wxPoint& pt); wxPoint ConvertDialogToPixels(const wxPoint& pt) const;
/** /**
@overload @overload
*/ */
wxSize ConvertDialogToPixels(const wxSize& sz); wxSize ConvertDialogToPixels(const wxSize& sz) const;
/** /**
Converts a point or size from pixels to dialog units. Converts a point or size from pixels to dialog units.
@@ -1374,12 +1374,12 @@ public:
@see ConvertDialogToPixels() @see ConvertDialogToPixels()
*/ */
wxPoint ConvertPixelsToDialog(const wxPoint& pt); wxPoint ConvertPixelsToDialog(const wxPoint& pt) const;
/** /**
@overload @overload
*/ */
wxSize ConvertPixelsToDialog(const wxSize& sz); wxSize ConvertPixelsToDialog(const wxSize& sz) const;
/** /**
Converts from screen to client window coordinates. Converts from screen to client window coordinates.

4
src/common/wincmn.cpp
View File

@@ -2461,7 +2461,7 @@ void wxWindowBase::DoUpdateWindowUI(wxUpdateUIEvent& event)
// dialog units translations // dialog units translations
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
wxPoint wxWindowBase::ConvertPixelsToDialog(const wxPoint& pt) wxPoint wxWindowBase::ConvertPixelsToDialog(const wxPoint& pt) const
{ {
wxPoint pt2 = wxDefaultPosition; wxPoint pt2 = wxDefaultPosition;
if (pt.x != wxDefaultCoord) if (pt.x != wxDefaultCoord)
@@ -2472,7 +2472,7 @@ wxPoint wxWindowBase::ConvertPixelsToDialog(const wxPoint& pt)
return pt2; return pt2;
} }
wxPoint wxWindowBase::ConvertDialogToPixels(const wxPoint& pt) wxPoint wxWindowBase::ConvertDialogToPixels(const wxPoint& pt) const
{ {
wxPoint pt2 = wxDefaultPosition; wxPoint pt2 = wxDefaultPosition;
if (pt.x != wxDefaultCoord) if (pt.x != wxDefaultCoord)