Make ConvertPixelsToDialog() and ConvertDialogToPixels() const.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63193 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/window.h b/include/wx/window.h
index 2e1eee38393e01e1c9688965d85a4f758e9f732e..e4f15868b4b211dd61322ad10d84d0c347141ffb 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -886,16 +886,16 @@ public:
     // dialog units translations
     // -------------------------
 
-    wxPoint ConvertPixelsToDialog( const wxPoint& pt );
-    wxPoint ConvertDialogToPixels( const wxPoint& pt );
-    wxSize ConvertPixelsToDialog( const wxSize& sz )
+    wxPoint ConvertPixelsToDialog( const wxPoint& pt ) const;
+    wxPoint ConvertDialogToPixels( const wxPoint& pt ) const;
+    wxSize ConvertPixelsToDialog( const wxSize& sz ) const
     {
         wxPoint pt(ConvertPixelsToDialog(wxPoint(sz.x, sz.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)));
 

diff --git a/interface/wx/window.h b/interface/wx/window.h
index 56be9b1845e6a99661e412145810cf825bdeda92..63ac9140545a9d035410ff33189389ee2e6f9c0c 100644 (file)
--- a/interface/wx/window.h
+++ b/interface/wx/window.h
@@ -1354,12 +1354,12 @@ public:
 
         @see ConvertPixelsToDialog()
     */
-    wxPoint ConvertDialogToPixels(const wxPoint& pt);
+    wxPoint ConvertDialogToPixels(const wxPoint& pt) const;
 
     /**
         @overload
     */
-    wxSize ConvertDialogToPixels(const wxSize& sz);
+    wxSize ConvertDialogToPixels(const wxSize& sz) const;
 
     /**
         Converts a point or size from pixels to dialog units.
@@ -1374,12 +1374,12 @@ public:
 
         @see ConvertDialogToPixels()
     */
-    wxPoint ConvertPixelsToDialog(const wxPoint& pt);
+    wxPoint ConvertPixelsToDialog(const wxPoint& pt) const;
 
     /**
         @overload
     */
-    wxSize ConvertPixelsToDialog(const wxSize& sz);
+    wxSize ConvertPixelsToDialog(const wxSize& sz) const;
 
     /**
         Converts from screen to client window coordinates.

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index a1ad50de45031458ce5f4d7c48040ed75a8f6ca7..a9c2b445052faca8af1bf66ab75890a21edf02f3 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -2461,7 +2461,7 @@ void wxWindowBase::DoUpdateWindowUI(wxUpdateUIEvent& event)
 // dialog units translations
 // ----------------------------------------------------------------------------
 
-wxPoint wxWindowBase::ConvertPixelsToDialog(const wxPoint& pt)
+wxPoint wxWindowBase::ConvertPixelsToDialog(const wxPoint& pt) const
 {
     wxPoint pt2 = wxDefaultPosition;
     if (pt.x != wxDefaultCoord)
@@ -2472,7 +2472,7 @@ wxPoint wxWindowBase::ConvertPixelsToDialog(const wxPoint& pt)
     return pt2;
 }
 
-wxPoint wxWindowBase::ConvertDialogToPixels(const wxPoint& pt)
+wxPoint wxWindowBase::ConvertDialogToPixels(const wxPoint& pt) const
 {
     wxPoint pt2 = wxDefaultPosition;
     if (pt.x != wxDefaultCoord)