1. regenerated makefiles

[wxWidgets.git] / src / common / dlgcmn.cpp

diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index b7afa8ae6ff736a93cac94f2bd3bee60f7f9e5c8..f08d15caced8e963d9ee77eb6ca50180078a9454 100644 (file)
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -67,7 +67,14 @@ wxSize wxDialogBase::SplitTextMessage(const wxString& message,
     {
         if ( *pc == _T('\n') || !*pc )
         {
+#if defined(__VISAGECPP__)
+// have two versions of this in wxWindowDC tp avoid function hiding
+// since there are two of these in wxDCBase, and in turn in wxDC.
+// VA cannot resolve this so:
+            dc.GetTextExtent(curLine, &width, &height, NULL, NULL, NULL, FALSE);
+#else
             dc.GetTextExtent(curLine, &width, &height);
+#endif
             if ( width > widthTextMax )
                 widthTextMax = width;
             if ( height > heightTextMax )
@@ -112,6 +119,7 @@ long wxDialogBase::CreateTextMessage(const wxArrayString& lines,
 
 wxSize wxDialogBase::GetStandardButtonSize(bool hasCancel)
 {
+#if 0
     int wButton = 0;
     GetTextExtent(_("OK"), &wButton, NULL);
 
@@ -138,6 +146,9 @@ wxSize wxDialogBase::GetStandardButtonSize(bool hasCancel)
     int hButton = (wButton * 23) / 75;
 
     return wxSize(wButton, hButton);
+#else
+    return wxButton::GetDefaultSize();
+#endif
 }
 
 void wxDialogBase::CreateStandardButtons(long wDialog,