Fixed VC6 compilation - wxAny(const wxVariant&) ctor required a specific 'template<>')

[wxWidgets.git] / src / generic / stattextg.cpp

diff --git a/src/generic/stattextg.cpp b/src/generic/stattextg.cpp
index 26a25cd02d0406b221441d4f21ceca62d6cce69a..d4cd0c364a32edf2a0f56ab762df76ca41cba63b 100644 (file)
--- a/src/generic/stattextg.cpp
+++ b/src/generic/stattextg.cpp
@@ -3,7 +3,7 @@
 // Purpose:     wxGenericStaticText
 // Author:      Marcin Wojdyr
 // Created:     2008-06-26
 // Purpose:     wxGenericStaticText
 // Author:      Marcin Wojdyr
 // Created:     2008-06-26

-// RCS-ID:      $Id:$
+// RCS-ID:      $Id$

 // Copyright:   Marcin Wojdyr
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   Marcin Wojdyr
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -17,7 +17,8 @@
 #if wxUSE_STATTEXT
 
 #ifndef WX_PRECOMP
 #if wxUSE_STATTEXT
 
 #ifndef WX_PRECOMP

-    #include "wx/dc.h"
+    #include "wx/dcclient.h"
+    #include "wx/settings.h"

     #include "wx/validate.h"
 #endif
 
     #include "wx/validate.h"
 #endif
 


@@ -81,14 +82,6 @@ wxSize wxGenericStaticText::DoGetBestClientSize() const
     return wxSize(width, height);
 }
 
     return wxSize(width, height);
 }
 

-wxSize wxGenericStaticText::DoGetBestSize() const
-{
-    wxSize ret = DoGetBestClientSize();
-    CacheBestSize(ret);
-    return ret;
-}
-
-

 void wxGenericStaticText::SetLabel(const wxString& label)
 {
     wxControl::SetLabel(label);
 void wxGenericStaticText::SetLabel(const wxString& label)
 {
     wxControl::SetLabel(label);