fix for using wxDataObjectComposite with the clipboard

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

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

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

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


@@ -326,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++ )


@@ -506,7 +508,7 @@ void wxDCBase::DrawLabel(const wxString& text,
         }
         else // not end of line
         {
         }
         else // not end of line
         {

-            if ( pc - text == indexAccel )
+            if ( pc - text.c_str() == indexAccel )

             {
                 // remeber to draw underscore here
                 GetTextExtent(curLine, &startUnderscore, NULL);
             {
                 // remeber to draw underscore here
                 GetTextExtent(curLine, &startUnderscore, NULL);