reverted Julian's unintentional breakage of wxChoice

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

diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp
index ae54f14f91d51276c895e8721e552f61b25608e9..83e9980940dd5beb368f971292dda3e1c6c7352a 100644 (file)
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -32,7 +32,7 @@
 
 #include <math.h>
 
 
 #include <math.h>
 

-bool wxDCBase::sm_cacheing = FALSE;
+// bool wxDCBase::sm_cacheing = FALSE;

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -328,8 +328,8 @@ void wxDCBase::GetMultiLineTextExtent(const wxString& text,
                                       wxCoord *h,
                                       wxFont *font)
 {
                                       wxCoord *h,
                                       wxFont *font)
 {

-    int widthTextMax = 0, widthLine,
-        heightTextTotal = 0, heightLineDefault = 0, heightLine = 0;
+    wxCoord widthTextMax = 0, widthLine,
+            heightTextTotal = 0, heightLineDefault = 0, heightLine = 0;

 
     wxString curLine;
     for ( const wxChar *pc = text; ; pc++ )
 
     wxString curLine;
     for ( const wxChar *pc = text; ; pc++ )