[ 1216436 ] cleanup 'shadow variable' warnings from gcc in headers.

[wxWidgets.git] / src / os2 / button.cpp

diff --git a/src/os2/button.cpp b/src/os2/button.cpp
index 05a44eb6cc5db80a0057eaffaa307f2bd3c0e334..d75aa8258af152a2274f71c7900c935866cf8958 100644 (file)
--- a/src/os2/button.cpp
+++ b/src/os2/button.cpp
@@ -141,6 +141,7 @@ wxSize wxButton::DoGetBestSize() const
     int                             nWidthButton;
     int                             nWidthChar;
     int                             nHeightChar;
     int                             nWidthButton;
     int                             nWidthChar;
     int                             nHeightChar;

+    wxFont                          vFont = (wxFont)GetFont();

 
     GetTextExtent( rsLabel
                   ,&nWidthButton
 
     GetTextExtent( rsLabel
                   ,&nWidthButton


@@ -150,7 +151,7 @@ wxSize wxButton::DoGetBestSize() const
     wxGetCharSize( GetHWND()
                   ,&nWidthChar
                   ,&nHeightChar
     wxGetCharSize( GetHWND()
                   ,&nWidthChar
                   ,&nHeightChar

-                  ,(wxFont*)&GetFont()
+                  ,&vFont

                  );
 
     //
                  );
 
     //