changed wxDC::GetTextExtent() and related methods to take const wxFont pointer, for...

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

diff --git a/docs/latex/wx/dc.tex b/docs/latex/wx/dc.tex
index cffeac284aa3e030b9848a6d2396d36366b8c678..c8d929e22a64eac92ae8de2851beccf36bf107c6 100644 (file)
--- a/docs/latex/wx/dc.tex
+++ b/docs/latex/wx/dc.tex
@@ -793,7 +793,7 @@ Gets the current text background colour (see \helpref{wxDC::SetTextBackground}{w
 \membersection{wxDC::GetTextExtent}\label{wxdcgettextextent}
 
 \constfunc{void}{GetTextExtent}{\param{const wxString\& }{string}, \param{wxCoord *}{w}, \param{wxCoord *}{h},\\
 \membersection{wxDC::GetTextExtent}\label{wxdcgettextextent}
 
 \constfunc{void}{GetTextExtent}{\param{const wxString\& }{string}, \param{wxCoord *}{w}, \param{wxCoord *}{h},\\

-  \param{wxCoord *}{descent = NULL}, \param{wxCoord *}{externalLeading = NULL}, \param{wxFont *}{font = NULL}}
+  \param{wxCoord *}{descent = NULL}, \param{wxCoord *}{externalLeading = NULL}, \param{const wxFont *}{font = NULL}}

 
 \constfunc{wxSize}{GetTextExtent}{\param{const wxString\& }{string}}
 
 
 \constfunc{wxSize}{GetTextExtent}{\param{const wxString\& }{string}}
 

diff --git a/include/wx/cocoa/dc.h b/include/wx/cocoa/dc.h
index d04424ba90e4b13858270a935b2dfa86de09ea84..db5175bcbfecaf2c564bd899beab567f3f027f41 100644 (file)
--- a/include/wx/cocoa/dc.h
+++ b/include/wx/cocoa/dc.h
@@ -98,7 +98,7 @@ public:
                                  wxCoord *x, wxCoord *y,
                                  wxCoord *descent = NULL,
                                  wxCoord *externalLeading = NULL,
                                  wxCoord *x, wxCoord *y,
                                  wxCoord *descent = NULL,
                                  wxCoord *externalLeading = NULL,

-                                 wxFont *theFont = NULL) const;
+                                 const wxFont *theFont = NULL) const;

 
     virtual bool CanDrawBitmap() const;
     virtual bool CanGetTextExtent() const;
 
     virtual bool CanDrawBitmap() const;
     virtual bool CanGetTextExtent() const;

diff --git a/include/wx/dc.h b/include/wx/dc.h
index a846442f68aaa06329f5a4b4725ab29c14b99abb..7551b9990567206174a5957565ad8245f925e417 100644 (file)
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -457,7 +457,7 @@ public:
                        wxCoord *x, wxCoord *y,
                        wxCoord *descent = NULL,
                        wxCoord *externalLeading = NULL,
                        wxCoord *x, wxCoord *y,
                        wxCoord *descent = NULL,
                        wxCoord *externalLeading = NULL,

-                       wxFont *theFont = NULL) const
+                       const wxFont *theFont = NULL) const

         { DoGetTextExtent(string, x, y, descent, externalLeading, theFont); }
 
     wxSize GetTextExtent(const wxString& string) const
         { DoGetTextExtent(string, x, y, descent, externalLeading, theFont); }
 
     wxSize GetTextExtent(const wxString& string) const


@@ -472,7 +472,7 @@ public:
                                         wxCoord *width,
                                         wxCoord *height,
                                         wxCoord *heightLine = NULL,
                                         wxCoord *width,
                                         wxCoord *height,
                                         wxCoord *heightLine = NULL,

-                                        wxFont *font = NULL) const;
+                                        const wxFont *font = NULL) const;

 
     wxSize GetMultiLineTextExtent(const wxString& string) const
     {
 
     wxSize GetMultiLineTextExtent(const wxString& string) const
     {


@@ -640,7 +640,7 @@ public:
                        long *x, long *y,
                        long *descent = NULL,
                        long *externalLeading = NULL,
                        long *x, long *y,
                        long *descent = NULL,
                        long *externalLeading = NULL,

-                       wxFont *theFont = NULL) const
+                       const wxFont *theFont = NULL) const

     {
         wxCoord x2, y2, descent2, externalLeading2;
         DoGetTextExtent(string, &x2, &y2,
     {
         wxCoord x2, y2, descent2, externalLeading2;
         DoGetTextExtent(string, &x2, &y2,


@@ -807,7 +807,7 @@ protected:
                                  wxCoord *x, wxCoord *y,
                                  wxCoord *descent = NULL,
                                  wxCoord *externalLeading = NULL,
                                  wxCoord *x, wxCoord *y,
                                  wxCoord *descent = NULL,
                                  wxCoord *externalLeading = NULL,

-                                 wxFont *theFont = NULL) const = 0;
+                                 const wxFont *theFont = NULL) const = 0;

 
     virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;
 
 
     virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;
 

diff --git a/include/wx/dcgraph.h b/include/wx/dcgraph.h
index 35fd3f9b14663c52bc8ac2654d16e2c4ea545901..331331afbe3e90e953b70689ca25fa9822a939fa 100755 (executable)
--- a/include/wx/dcgraph.h
+++ b/include/wx/dcgraph.h
@@ -173,7 +173,7 @@ protected:
         wxCoord *x, wxCoord *y,
         wxCoord *descent = NULL,
         wxCoord *externalLeading = NULL,
         wxCoord *x, wxCoord *y,
         wxCoord *descent = NULL,
         wxCoord *externalLeading = NULL,

-        wxFont *theFont = NULL) const;
+        const wxFont *theFont = NULL) const;

 
     virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;
 
 
     virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;
 

diff --git a/include/wx/dcmirror.h b/include/wx/dcmirror.h
index 0bcc54fc59174850cde9a1da5b9722b5b23f663c..0a7d4301200a119bce70832f37bcf538e3b82e8e 100644 (file)
--- a/include/wx/dcmirror.h
+++ b/include/wx/dcmirror.h
@@ -269,7 +269,7 @@ protected:
                                  wxCoord *x, wxCoord *y,
                                  wxCoord *descent = NULL,
                                  wxCoord *externalLeading = NULL,
                                  wxCoord *x, wxCoord *y,
                                  wxCoord *descent = NULL,
                                  wxCoord *externalLeading = NULL,

-                                 wxFont *theFont = NULL) const
+                                 const wxFont *theFont = NULL) const

     {
         // never mirrored
         m_dc.DoGetTextExtent(string, x, y, descent, externalLeading, theFont);
     {
         // never mirrored
         m_dc.DoGetTextExtent(string, x, y, descent, externalLeading, theFont);

diff --git a/include/wx/dcsvg.h b/include/wx/dcsvg.h
index 41a25b8082d8b8fd2ae8fb7a3981771dd7b098e7..db556ab5aefa44993f1b7d126cf5a1e8e2010f3f 100644 (file)
--- a/include/wx/dcsvg.h
+++ b/include/wx/dcsvg.h
@@ -86,7 +86,7 @@ class WXDLLIMPEXP_CORE wxSVGFileDC : public wxDC
 
         void DoGetSize(int * x, int *y) const { *x = m_width; *y = m_height ; return ; }
 
 
         void DoGetSize(int * x, int *y) const { *x = m_width; *y = m_height ; return ; }
 

-        void DoGetTextExtent(const wxString& string, wxCoord *w, wxCoord *h, wxCoord *descent = NULL, wxCoord *externalLeading = NULL, wxFont *font = NULL) const ;
+        void DoGetTextExtent(const wxString& string, wxCoord *w, wxCoord *h, wxCoord *descent = NULL, wxCoord *externalLeading = NULL, const wxFont *font = NULL) const ;

 
         void DoSetClippingRegionAsRegion(const class wxRegion &)
             { wxASSERT_MSG (false, wxT("wxSVGFILEDC::DoSetClippingRegionAsRegion Call not yet implemented")); return  ; }
 
         void DoSetClippingRegionAsRegion(const class wxRegion &)
             { wxASSERT_MSG (false, wxT("wxSVGFILEDC::DoSetClippingRegionAsRegion Call not yet implemented")); return  ; }

diff --git a/include/wx/dfb/dc.h b/include/wx/dfb/dc.h
index 7adfd288bb80d6923d24d1c5e555c190df9b7302..d78dc8326217822a10443d619931177fd0a2c44e 100644 (file)
--- a/include/wx/dfb/dc.h
+++ b/include/wx/dfb/dc.h
@@ -58,7 +58,7 @@ public:
                                  wxCoord *x, wxCoord *y,
                                  wxCoord *descent = NULL,
                                  wxCoord *externalLeading = NULL,
                                  wxCoord *x, wxCoord *y,
                                  wxCoord *descent = NULL,
                                  wxCoord *externalLeading = NULL,

-                                 wxFont *theFont = NULL) const;
+                                 const wxFont *theFont = NULL) const;

 
     virtual bool CanDrawBitmap() const { return true; }
     virtual bool CanGetTextExtent() const { return true; }
 
     virtual bool CanDrawBitmap() const { return true; }
     virtual bool CanGetTextExtent() const { return true; }

diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h
index e303d406c49590621945c9f85f7813ec9512c804..1958c18278584ae03d77d2fe23ce4fcfbcaa4ad5 100644 (file)
--- a/include/wx/generic/dcpsg.h
+++ b/include/wx/generic/dcpsg.h
@@ -124,7 +124,7 @@ protected:
     void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
                          wxCoord *descent = NULL,
                          wxCoord *externalLeading = NULL,
     void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
                          wxCoord *descent = NULL,
                          wxCoord *externalLeading = NULL,

-                         wxFont *theFont = NULL) const;
+                         const wxFont *theFont = NULL) const;

     void DoGetSize(int* width, int* height) const;
     void DoGetSizeMM(int *width, int *height) const;
 
     void DoGetSize(int* width, int* height) const;
     void DoGetSizeMM(int *width, int *height) const;
 

diff --git a/include/wx/gtk/dcclient.h b/include/wx/gtk/dcclient.h
index de91b5c126025c948a3090d16945e7586bca3755..3873241c17a6b0e4af03aec9816ae05c788b2e28 100644 (file)
--- a/include/wx/gtk/dcclient.h
+++ b/include/wx/gtk/dcclient.h
@@ -68,7 +68,7 @@ protected:
                                 wxCoord *width, wxCoord *height,
                                 wxCoord *descent = (wxCoord *) NULL,
                                 wxCoord *externalLeading = (wxCoord *) NULL,
                                 wxCoord *width, wxCoord *height,
                                 wxCoord *descent = (wxCoord *) NULL,
                                 wxCoord *externalLeading = (wxCoord *) NULL,

-                                wxFont *theFont = (wxFont *) NULL) const;
+                                const wxFont *theFont = (wxFont *) NULL) const;

     virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;
     virtual void DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height );
     virtual void DoSetClippingRegionAsRegion( const wxRegion &region );
     virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;
     virtual void DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height );
     virtual void DoSetClippingRegionAsRegion( const wxRegion &region );

diff --git a/include/wx/gtk/gnome/gprint.h b/include/wx/gtk/gnome/gprint.h
index 60b1c7bea5626d712a6ab19147cc5107a08dc465..0b7b36a313b4818a8c350749821b47f1de07c06c 100644 (file)
--- a/include/wx/gtk/gnome/gprint.h
+++ b/include/wx/gtk/gnome/gprint.h
@@ -258,7 +258,7 @@ protected:
     void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
                      wxCoord *descent = (wxCoord *) NULL,
                      wxCoord *externalLeading = (wxCoord *) NULL,
     void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
                      wxCoord *descent = (wxCoord *) NULL,
                      wxCoord *externalLeading = (wxCoord *) NULL,

-                     wxFont *theFont = (wxFont *) NULL ) const;
+                     const wxFont *theFont = (wxFont *) NULL ) const;

     void DoGetSize(int* width, int* height) const;
     void DoGetSizeMM(int *width, int *height) const;
 
     void DoGetSize(int* width, int* height) const;
     void DoGetSizeMM(int *width, int *height) const;
 


@@ -277,7 +277,7 @@ private:
     unsigned char           m_currentRed;
     unsigned char           m_currentGreen;
     unsigned char           m_currentBlue;
     unsigned char           m_currentRed;
     unsigned char           m_currentGreen;
     unsigned char           m_currentBlue;

-    
+

     int                     m_deviceOffsetY;
 
     wxGnomePrinter         *m_printer;
     int                     m_deviceOffsetY;
 
     wxGnomePrinter         *m_printer;


@@ -285,7 +285,7 @@ private:
     GnomePrintJob*          m_job; // only used and destroyed when created with wxPrintData
 
     void makeEllipticalPath(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     GnomePrintJob*          m_job; // only used and destroyed when created with wxPrintData
 
     void makeEllipticalPath(wxCoord x, wxCoord y, wxCoord width, wxCoord height);

-    
+

 private:
     wxCoord XDEV2LOG(wxCoord x) const
     {
 private:
     wxCoord XDEV2LOG(wxCoord x) const
     {

diff --git a/include/wx/gtk1/dcclient.h b/include/wx/gtk1/dcclient.h
index c1654ba42a5635435bf9aeb6dca4d806f0da4b2b..6e001e5c789f4f43661a3b48631d66f9a9b4d2ff 100644 (file)
--- a/include/wx/gtk1/dcclient.h
+++ b/include/wx/gtk1/dcclient.h
@@ -74,7 +74,7 @@ protected:
                                 wxCoord *width, wxCoord *height,
                                 wxCoord *descent = (wxCoord *) NULL,
                                 wxCoord *externalLeading = (wxCoord *) NULL,
                                 wxCoord *width, wxCoord *height,
                                 wxCoord *descent = (wxCoord *) NULL,
                                 wxCoord *externalLeading = (wxCoord *) NULL,

-                                wxFont *theFont = (wxFont *) NULL) const;
+                                const wxFont *theFont = (wxFont *) NULL) const;

 
 public:
     virtual wxCoord GetCharWidth() const;
 
 public:
     virtual wxCoord GetCharWidth() const;

diff --git a/include/wx/mac/carbon/dc.h b/include/wx/mac/carbon/dc.h
index b0e83d67d2ec19b19621f6735278253164a73d4a..b7945f95752ec6b6a4141c48f1ff93a0fe58a9ee 100644 (file)
--- a/include/wx/mac/carbon/dc.h
+++ b/include/wx/mac/carbon/dc.h
@@ -211,7 +211,7 @@ protected:
         wxCoord *x, wxCoord *y,
         wxCoord *descent = NULL,
         wxCoord *externalLeading = NULL,
         wxCoord *x, wxCoord *y,
         wxCoord *descent = NULL,
         wxCoord *externalLeading = NULL,

-        wxFont *theFont = NULL) const;
+        const wxFont *theFont = NULL) const;

 
     virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;
 
 
     virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;
 

diff --git a/include/wx/mgl/dc.h b/include/wx/mgl/dc.h
index eafae450541d68ff897e19ec389119b2cc16bc1d..94bd65c9f69db9379ed0fe18c0ab2387069f3664 100644 (file)
--- a/include/wx/mgl/dc.h
+++ b/include/wx/mgl/dc.h
@@ -79,7 +79,7 @@ public:
                                  wxCoord *x, wxCoord *y,
                                  wxCoord *descent = NULL,
                                  wxCoord *externalLeading = NULL,
                                  wxCoord *x, wxCoord *y,
                                  wxCoord *descent = NULL,
                                  wxCoord *externalLeading = NULL,

-                                 wxFont *theFont = NULL) const;
+                                 const wxFont *theFont = NULL) const;

 
     virtual bool CanDrawBitmap() const;
     virtual bool CanGetTextExtent() const;
 
     virtual bool CanDrawBitmap() const;
     virtual bool CanGetTextExtent() const;

diff --git a/include/wx/motif/dcclient.h b/include/wx/motif/dcclient.h
index dccf727b8954180a308eac4897f2544f731b9ad1..54bffa81ffe4456ccd0c43b5e744ddb0d37c1b25 100644 (file)
--- a/include/wx/motif/dcclient.h
+++ b/include/wx/motif/dcclient.h
@@ -63,7 +63,7 @@ public:
         wxCoord *x, wxCoord *y,
         wxCoord *descent = NULL,
         wxCoord *externalLeading = NULL,
         wxCoord *x, wxCoord *y,
         wxCoord *descent = NULL,
         wxCoord *externalLeading = NULL,

-        wxFont *theFont = NULL) const;
+        const wxFont *theFont = NULL) const;

 
     virtual bool CanDrawBitmap() const;
     virtual bool CanGetTextExtent() const;
 
     virtual bool CanDrawBitmap() const;
     virtual bool CanGetTextExtent() const;

diff --git a/include/wx/msw/dc.h b/include/wx/msw/dc.h
index 9e6f7fcab813261351df1b4965333718ef6a58b0..ee1ab8d4ec895d15a96e7a65b82d6524a2fa31a8 100644 (file)
--- a/include/wx/msw/dc.h
+++ b/include/wx/msw/dc.h
@@ -166,7 +166,7 @@ protected:
                                  wxCoord *x, wxCoord *y,
                                  wxCoord *descent = NULL,
                                  wxCoord *externalLeading = NULL,
                                  wxCoord *x, wxCoord *y,
                                  wxCoord *descent = NULL,
                                  wxCoord *externalLeading = NULL,

-                                 wxFont *theFont = NULL) const;
+                                 const wxFont *theFont = NULL) const;

     virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;
 
     virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
     virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;
 
     virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,

diff --git a/include/wx/msw/metafile.h b/include/wx/msw/metafile.h
index 3fb6377b429b8d7f3dab70aa9425b95cc3e2c96d..de7eda41247b4de85d1d81cee1a61a184887454c 100644 (file)
--- a/include/wx/msw/metafile.h
+++ b/include/wx/msw/metafile.h
@@ -90,7 +90,7 @@ public:
     virtual void SetMapMode(int mode);
     virtual void GetTextExtent(const wxString& string, long *x, long *y,
             long *descent = NULL, long *externalLeading = NULL,
     virtual void SetMapMode(int mode);
     virtual void GetTextExtent(const wxString& string, long *x, long *y,
             long *descent = NULL, long *externalLeading = NULL,

-            wxFont *theFont = NULL, bool use16bit = false) const;
+            const wxFont *theFont = NULL, bool use16bit = false) const;

 
     // Implementation
     wxMetafile *GetMetaFile() const { return m_metaFile; }
 
     // Implementation
     wxMetafile *GetMetaFile() const { return m_metaFile; }

diff --git a/include/wx/os2/metafile.h b/include/wx/os2/metafile.h
index 66f2899ddf22863ac28845a8ad268a8ab874a588..d75be165e5b82b792bfd31397fc24079e91faea3 100644 (file)
--- a/include/wx/os2/metafile.h
+++ b/include/wx/os2/metafile.h
@@ -88,7 +88,7 @@ public:
     virtual void SetMapMode(int mode);
     virtual void GetTextExtent(const wxString& string, long *x, long *y,
                                long *descent = NULL, long *externalLeading = NULL,
     virtual void SetMapMode(int mode);
     virtual void GetTextExtent(const wxString& string, long *x, long *y,
                                long *descent = NULL, long *externalLeading = NULL,

-                               wxFont *theFont = NULL, bool use16bit = false) const;
+                               const wxFont *theFont = NULL, bool use16bit = false) const;

 
     // Implementation
     inline wxMetafile *GetMetaFile(void) const { return m_metaFile; }
 
     // Implementation
     inline wxMetafile *GetMetaFile(void) const { return m_metaFile; }

diff --git a/include/wx/palmos/dc.h b/include/wx/palmos/dc.h
index ce2fc9a90598c49effba118523c33f509138a1dc..cd85d57973c859a6ba3be09581a1e40be63e14b8 100644 (file)
--- a/include/wx/palmos/dc.h
+++ b/include/wx/palmos/dc.h
@@ -75,7 +75,7 @@ public:
                                  wxCoord *x, wxCoord *y,
                                  wxCoord *descent = NULL,
                                  wxCoord *externalLeading = NULL,
                                  wxCoord *x, wxCoord *y,
                                  wxCoord *descent = NULL,
                                  wxCoord *externalLeading = NULL,

-                                 wxFont *theFont = NULL) const;
+                                 const wxFont *theFont = NULL) const;

     virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;
 
     virtual bool CanDrawBitmap() const;
     virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;
 
     virtual bool CanDrawBitmap() const;

diff --git a/include/wx/palmos/metafile.h b/include/wx/palmos/metafile.h
index 71a94deb7a968b7a077852b1efc9c2a76f22df7b..0ca14ac864f4b0ca1bbda4cb820a4f6989c1e66b 100644 (file)
--- a/include/wx/palmos/metafile.h
+++ b/include/wx/palmos/metafile.h
@@ -90,7 +90,7 @@ public:
     virtual void SetMapMode(int mode);
     virtual void GetTextExtent(const wxString& string, long *x, long *y,
             long *descent = NULL, long *externalLeading = NULL,
     virtual void SetMapMode(int mode);
     virtual void GetTextExtent(const wxString& string, long *x, long *y,
             long *descent = NULL, long *externalLeading = NULL,

-            wxFont *theFont = NULL, bool use16bit = FALSE) const;
+            const wxFont *theFont = NULL, bool use16bit = FALSE) const;

 
     // Implementation
     wxMetafile *GetMetaFile() const { return m_metaFile; }
 
     // Implementation
     wxMetafile *GetMetaFile() const { return m_metaFile; }

diff --git a/include/wx/x11/dcclient.h b/include/wx/x11/dcclient.h
index 0d9ffbcb6b05c42ed41976af2d59e50c52d45648..6ae4962b32c2043ee90cdbf34659a039b42b2bc1 100644 (file)
--- a/include/wx/x11/dcclient.h
+++ b/include/wx/x11/dcclient.h
@@ -116,7 +116,7 @@ protected:
         wxCoord *x, wxCoord *y,
         wxCoord *descent = NULL,
         wxCoord *externalLeading = NULL,
         wxCoord *x, wxCoord *y,
         wxCoord *descent = NULL,
         wxCoord *externalLeading = NULL,

-        wxFont *theFont = NULL) const;
+        const wxFont *theFont = NULL) const;

 
     void Init();
 
 
     void Init();
 

diff --git a/src/cocoa/dc.mm b/src/cocoa/dc.mm
index 7541eaf8c32b1494934796db36f6038ddda6213b..53581c4f74bba2c14a42f91d11d11468126d9c68 100644 (file)
--- a/src/cocoa/dc.mm
+++ b/src/cocoa/dc.mm
@@ -230,7 +230,7 @@ void wxDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
     [bezpath stroke];
 }
 
     [bezpath stroke];
 }
 

-void wxDC::DoGetTextExtent(const wxString& text, wxCoord *x, wxCoord *y, wxCoord *descent, wxCoord *externalLeading, wxFont *theFont) const
+void wxDC::DoGetTextExtent(const wxString& text, wxCoord *x, wxCoord *y, wxCoord *descent, wxCoord *externalLeading, const wxFont *theFont) const

 {
     wxAutoNSAutoreleasePool pool;
 // FIXME: Cache this so it can be used for DoDrawText
 {
     wxAutoNSAutoreleasePool pool;
 // FIXME: Cache this so it can be used for DoDrawText

diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp
index b17d055a636aa8f3ab876d0a2b1cbc086a57a516..8f08d60562cbafc5b63fb6f83307c9a47f7c2bb4 100644 (file)
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -507,7 +507,7 @@ void wxDCBase::GetMultiLineTextExtent(const wxString& text,
                                       wxCoord *x,
                                       wxCoord *y,
                                       wxCoord *h,
                                       wxCoord *x,
                                       wxCoord *y,
                                       wxCoord *h,

-                                      wxFont *font) const
+                                      const wxFont *font) const

 {
     wxCoord widthTextMax = 0, widthLine,
             heightTextTotal = 0, heightLineDefault = 0, heightLine = 0;
 {
     wxCoord widthTextMax = 0, widthLine,
             heightTextTotal = 0, heightLineDefault = 0, heightLine = 0;

diff --git a/src/common/dcgraph.cpp b/src/common/dcgraph.cpp
index 93ee03514dec315a14fadaf04249fd1ddad0d3ff..420e9039bbb2ae64fe737c8d17a34148f2f72368 100644 (file)
--- a/src/common/dcgraph.cpp
+++ b/src/common/dcgraph.cpp
@@ -830,7 +830,7 @@ bool wxGCDC::CanGetTextExtent() const
 
 void wxGCDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *height,
                               wxCoord *descent, wxCoord *externalLeading ,
 
 void wxGCDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *height,
                               wxCoord *descent, wxCoord *externalLeading ,

-                              wxFont *theFont ) const
+                              const wxFont *theFont ) const

 {
     wxCHECK_RET( Ok(), wxT("wxGCDC(cg)::DoGetTextExtent - invalid DC") );
 
 {
     wxCHECK_RET( Ok(), wxT("wxGCDC(cg)::DoGetTextExtent - invalid DC") );
 

diff --git a/src/common/dcsvg.cpp b/src/common/dcsvg.cpp
index 5b1bdcbb69bd799a75fcc5b869b02d1deea9727b..79e0e48297570f658418646f4ae0ef3af83f7c07 100644 (file)
--- a/src/common/dcsvg.cpp
+++ b/src/common/dcsvg.cpp
@@ -458,7 +458,7 @@ void wxSVGFileDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,doub
 }
 
 
 }
 
 

-void wxSVGFileDC::DoGetTextExtent(const wxString& string, wxCoord *w, wxCoord *h, wxCoord *descent , wxCoord *externalLeading , wxFont *font) const
+void wxSVGFileDC::DoGetTextExtent(const wxString& string, wxCoord *w, wxCoord *h, wxCoord *descent , wxCoord *externalLeading , const wxFont *font) const

 
 {
     wxScreenDC sDC ;
 
 {
     wxScreenDC sDC ;

diff --git a/src/dfb/dc.cpp b/src/dfb/dc.cpp
index 8093bec3d2960aa1d6fcde0eb0501d30a691be3d..3415cc1806caf3e9ab47c97b388e34b26656e84f 100644 (file)
--- a/src/dfb/dc.cpp
+++ b/src/dfb/dc.cpp
@@ -480,7 +480,7 @@ wxCoord wxDC::GetCharWidth() const
 
 void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
                            wxCoord *descent, wxCoord *externalLeading,
 
 void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
                            wxCoord *descent, wxCoord *externalLeading,

-                           wxFont *theFont) const
+                           const wxFont *theFont) const

 {
     wxCHECK_RET( Ok(), wxT("invalid dc") );
     wxCHECK_RET( m_font.Ok(), wxT("no font selected") );
 {
     wxCHECK_RET( Ok(), wxT("invalid dc") );
     wxCHECK_RET( m_font.Ok(), wxT("no font selected") );

diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp
index e676e498968ee7ecd035e416adb30675f08b9685..9aeca2e1c421a5ceea93eb597145fc79addd1f49 100644 (file)
--- a/src/generic/dcpsg.cpp
+++ b/src/generic/dcpsg.cpp
@@ -1835,11 +1835,11 @@ wxCoord wxPostScriptDC::GetCharHeight() const
 void wxPostScriptDC::DoGetTextExtent(const wxString& string,
                                      wxCoord *x, wxCoord *y,
                                      wxCoord *descent, wxCoord *externalLeading,
 void wxPostScriptDC::DoGetTextExtent(const wxString& string,
                                      wxCoord *x, wxCoord *y,
                                      wxCoord *descent, wxCoord *externalLeading,

-                                     wxFont *theFont ) const
+                                     const wxFont *theFont ) const

 {
 {

-    wxFont *fontToUse = theFont;
+    const wxFont *fontToUse = theFont;

 
 

-    if (!fontToUse) fontToUse = (wxFont*) &m_font;
+    if (!fontToUse) fontToUse = &m_font;

 
     wxCHECK_RET( fontToUse, wxT("GetTextExtent: no font defined") );
 
 
     wxCHECK_RET( fontToUse, wxT("GetTextExtent: no font defined") );
 

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 52a36301f16ab2d47c3f4fbe120bfb1bb39bdea9..3ffd2a177680f366e4843c0f02ebec54c19c62e9 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -1719,7 +1719,7 @@ void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y,
 void wxWindowDC::DoGetTextExtent(const wxString &string,
                                  wxCoord *width, wxCoord *height,
                                  wxCoord *descent, wxCoord *externalLeading,
 void wxWindowDC::DoGetTextExtent(const wxString &string,
                                  wxCoord *width, wxCoord *height,
                                  wxCoord *descent, wxCoord *externalLeading,

-                                 wxFont *theFont) const
+                                 const wxFont *theFont) const

 {
     if ( width )
         *width = 0;
 {
     if ( width )
         *width = 0;

diff --git a/src/gtk/gnome/gprint.cpp b/src/gtk/gnome/gprint.cpp
index 672823aac5b9b5aa3bff0af42b9477dcf4220e28..6c947a9664d4b7ac441a82e275e5a76f8311e853 100644 (file)
--- a/src/gtk/gnome/gprint.cpp
+++ b/src/gtk/gnome/gprint.cpp
@@ -1718,7 +1718,7 @@ wxCoord wxGnomePrintDC::GetCharWidth() const
 void wxGnomePrintDC::DoGetTextExtent(const wxString& string, wxCoord *width, wxCoord *height,
                      wxCoord *descent,
                      wxCoord *externalLeading,
 void wxGnomePrintDC::DoGetTextExtent(const wxString& string, wxCoord *width, wxCoord *height,
                      wxCoord *descent,
                      wxCoord *externalLeading,

-                     wxFont *theFont ) const
+                     const wxFont *theFont ) const

 {
     if ( width )
         *width = 0;
 {
     if ( width )
         *width = 0;

diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index 329d62d9ebeb9988f2ba0c848c91788998b7688c..c344069423c54e1e298a1803d56c9d7e3ed0c3f4 100644 (file)
--- a/src/gtk1/dcclient.cpp
+++ b/src/gtk1/dcclient.cpp
@@ -1606,7 +1606,7 @@ void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y,
 void wxWindowDC::DoGetTextExtent(const wxString &string,
                                  wxCoord *width, wxCoord *height,
                                  wxCoord *descent, wxCoord *externalLeading,
 void wxWindowDC::DoGetTextExtent(const wxString &string,
                                  wxCoord *width, wxCoord *height,
                                  wxCoord *descent, wxCoord *externalLeading,

-                                 wxFont *theFont) const
+                                 const wxFont *theFont) const

 {
     if ( width )
         *width = 0;
 {
     if ( width )
         *width = 0;

diff --git a/src/mac/carbon/dc.cpp b/src/mac/carbon/dc.cpp
index fbd3f8f89a7801bc82b3a165b8b5a553d0d7a117..761ab396fdb746f710f611956055fbd348c33859 100644 (file)
--- a/src/mac/carbon/dc.cpp
+++ b/src/mac/carbon/dc.cpp
@@ -1601,7 +1601,7 @@ bool wxDC::CanGetTextExtent() const
 
 void wxDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *height,
                             wxCoord *descent, wxCoord *externalLeading ,
 
 void wxDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *height,
                             wxCoord *descent, wxCoord *externalLeading ,

-                            wxFont *theFont ) const
+                            const wxFont *theFont ) const

 {
     wxCHECK_RET(Ok(), wxT("wxDC::DoGetTextExtent - invalid DC"));
 
 {
     wxCHECK_RET(Ok(), wxT("wxDC::DoGetTextExtent - invalid DC"));
 

diff --git a/src/mac/carbon/dccg.cpp b/src/mac/carbon/dccg.cpp
index abd909dede21a0ba8920dd9f3a9f49a5b9e1fbb3..353e7c10f8fb7461547d21df554da4ee4765ebe6 100755 (executable)
--- a/src/mac/carbon/dccg.cpp
+++ b/src/mac/carbon/dccg.cpp
@@ -2139,7 +2139,7 @@ bool wxDC::CanGetTextExtent() const
 
 void wxDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *height,
                             wxCoord *descent, wxCoord *externalLeading ,
 
 void wxDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *height,
                             wxCoord *descent, wxCoord *externalLeading ,

-                            wxFont *theFont ) const
+                            const wxFont *theFont ) const

 {
     wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoGetTextExtent - invalid DC") );
 
 {
     wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoGetTextExtent - invalid DC") );
 

diff --git a/src/mgl/dc.cpp b/src/mgl/dc.cpp
index 8eabf0631045e50fb649bed27efea3a0082f4d37..08c78c6a1d5b7d2794e7cfc1a2149a90c85c0794 100644 (file)
--- a/src/mgl/dc.cpp
+++ b/src/mgl/dc.cpp
@@ -1221,7 +1221,7 @@ wxCoord wxDC::GetCharWidth() const
 
 void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
                            wxCoord *descent, wxCoord *externalLeading,
 
 void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
                            wxCoord *descent, wxCoord *externalLeading,

-                           wxFont *theFont) const
+                           const wxFont *theFont) const

 {
     wxFont oldFont;
 
 {
     wxFont oldFont;
 

diff --git a/src/motif/dcclient.cpp b/src/motif/dcclient.cpp
index 56ad7af018602f9c6b21205b7055d8caf1d3be56..fa5f8beb8951f706b01d45e2c34971b670f88b52 100644 (file)
--- a/src/motif/dcclient.cpp
+++ b/src/motif/dcclient.cpp
@@ -1297,7 +1297,7 @@ bool wxWindowDC::CanGetTextExtent() const
 
 void wxWindowDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *height,
                                 wxCoord *descent, wxCoord *externalLeading,
 
 void wxWindowDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *height,
                                 wxCoord *descent, wxCoord *externalLeading,

-                                wxFont *font ) const
+                                const wxFont *font ) const

 {
     wxCHECK_RET( Ok(), "invalid dc" );
 
 {
     wxCHECK_RET( Ok(), "invalid dc" );
 

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index 3828683e73981158b1502c2a984a64f7ec6897c3..3605e4a5b1c17b859976088fd0830255afe61160 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -1731,7 +1731,7 @@ wxCoord wxDC::GetCharWidth() const
 
 void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
                            wxCoord *descent, wxCoord *externalLeading,
 
 void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
                            wxCoord *descent, wxCoord *externalLeading,

-                           wxFont *font) const
+                           const wxFont *font) const

 {
 #ifdef __WXMICROWIN__
     if (!GetHDC())
 {
 #ifdef __WXMICROWIN__
     if (!GetHDC())

diff --git a/src/msw/metafile.cpp b/src/msw/metafile.cpp
index f1eb74391eb256cf516bc304fcf41e5e6eb963c1..5b3e574c4d6ae9945e3da5d7c278b69d48ccdec1 100644 (file)
--- a/src/msw/metafile.cpp
+++ b/src/msw/metafile.cpp
@@ -210,11 +210,13 @@ wxMetafileDC::~wxMetafileDC()
 }
 
 void wxMetafileDC::GetTextExtent(const wxString& string, long *x, long *y,
 }
 
 void wxMetafileDC::GetTextExtent(const wxString& string, long *x, long *y,

-                                 long *descent, long *externalLeading, wxFont *theFont, bool WXUNUSED(use16bit)) const
+                                 long *descent, long *externalLeading,
+                                 const wxFont *theFont,
+                                 bool WXUNUSED(use16bit)) const

 {
 {

-    wxFont *fontToUse = theFont;
+    const wxFont *fontToUse = theFont;

     if (!fontToUse)
     if (!fontToUse)

-        fontToUse = (wxFont*) &m_font;
+        fontToUse = &m_font;

 
     HDC dc = GetDC(NULL);
 
 
     HDC dc = GetDC(NULL);
 

diff --git a/src/os2/metafile.cpp b/src/os2/metafile.cpp
index 020041396f7be3a0b0a64146e21c937803c2945f..82709b4ccb8f5eb9002ab4072282f3fb7ff81dd6 100644 (file)
--- a/src/os2/metafile.cpp
+++ b/src/os2/metafile.cpp
@@ -188,12 +188,12 @@ void wxMetafileDC::GetTextExtent(const wxString& WXUNUSED(string),
                                  long *WXUNUSED(y),
                                  long *WXUNUSED(descent),
                                  long *WXUNUSED(externalLeading),
                                  long *WXUNUSED(y),
                                  long *WXUNUSED(descent),
                                  long *WXUNUSED(externalLeading),

-                                 wxFont *theFont,
+                                 const wxFont *theFont,

                                  bool WXUNUSED(use16bit) ) const
 {
                                  bool WXUNUSED(use16bit) ) const
 {

-    wxFont *fontToUse = theFont;
+    const wxFont *fontToUse = theFont;

     if (!fontToUse)
     if (!fontToUse)

-        fontToUse = (wxFont*) &m_font;
+        fontToUse = &m_font;

 
     // TODO:
 /*
 
     // TODO:
 /*

diff --git a/src/palmos/dc.cpp b/src/palmos/dc.cpp
index eddc16efc4b5c01f84227d4da56ffd838884b318..3dbbc7b11d69a23f6fcf229834f12945283cf6bf 100644 (file)
--- a/src/palmos/dc.cpp
+++ b/src/palmos/dc.cpp
@@ -330,7 +330,7 @@ wxCoord wxDC::GetCharWidth() const
 
 void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
                            wxCoord *descent, wxCoord *externalLeading,
 
 void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
                            wxCoord *descent, wxCoord *externalLeading,

-                           wxFont *font) const
+                           const wxFont *font) const

 {
 }
 
 {
 }
 

diff --git a/src/palmos/metafile.cpp b/src/palmos/metafile.cpp
index 5c6880d9b96c4ee5c498e5bcc9fcfef2681e804a..6d98ac45bb8e55703908ced31dcf59fbe6f55ee6 100644 (file)
--- a/src/palmos/metafile.cpp
+++ b/src/palmos/metafile.cpp
@@ -119,7 +119,8 @@ wxMetafileDC::~wxMetafileDC()
 }
 
 void wxMetafileDC::GetTextExtent(const wxString& string, long *x, long *y,
 }
 
 void wxMetafileDC::GetTextExtent(const wxString& string, long *x, long *y,

-                                 long *descent, long *externalLeading, wxFont *theFont, bool WXUNUSED(use16bit)) const
+                                 long *descent, long *externalLeading,
+                                 const wxFont *theFont, bool WXUNUSED(use16bit)) const

 {
 }
 
 {
 }
 

diff --git a/src/x11/dcclient.cpp b/src/x11/dcclient.cpp
index 4ab1920f7e7fe636002f9c6480ec3ddd1311e407..cd0ed5f6a34fad0600becfdc9cf26082345c1fdd 100644 (file)
--- a/src/x11/dcclient.cpp
+++ b/src/x11/dcclient.cpp
@@ -1612,7 +1612,7 @@ void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y,
 
 void wxWindowDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *height,
                                 wxCoord *descent, wxCoord *externalLeading,
 
 void wxWindowDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *height,
                                 wxCoord *descent, wxCoord *externalLeading,

-                                wxFont *font ) const
+                                const wxFont *font ) const

 {
     wxCHECK_RET( Ok(), wxT("invalid dc") );
 
 {
     wxCHECK_RET( Ok(), wxT("invalid dc") );