fixed encoding handling in ANSI mode

[wxWidgets.git] / src / mac / carbon / stattext.cpp

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index bc89591282b5d28ef79cfb8737eefe15150d0884..9a56b744e2b4b5e415702ae33fd56d5bc5641a56 100644 (file)
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -74,45 +74,44 @@ void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph, int &y)
         return;
     }
 
         return;
     }
 

-  int x = 0 ;
+    int x = 0 ;

 
 

-  int i = 0 ;
-  bool linedrawn = true;
-  while( paragraph.Length() > 0 )
-  {
+    bool linedrawn = true;
+    while( paragraph.Length() > 0 )
+    {

         dc.GetTextExtent( paragraph , &width , &height ) ;
         dc.GetTextExtent( paragraph , &width , &height ) ;

-
+        

         if ( width > m_width )
         {
         if ( width > m_width )
         {

-            for ( int p = paragraph.Length() -1 ; p > 0 ; --p )
+            for ( size_t p = paragraph.Length() - 1 ; p > 0 ; --p )

             {
             {

-              if ((punct.Find(paragraph[p]) != wxNOT_FOUND) || !linedrawn)
+                if ((punct.Find(paragraph[p]) != wxNOT_FOUND) || !linedrawn)

                 {
                 {

-                  int blank = (paragraph[p] == ' ') ? 0 : 1;
-
+                    int blank = (paragraph[p] == ' ') ? 0 : 1;
+                    

                     dc.GetTextExtent( paragraph.Left(p + blank) , &width , &height ) ;
                     dc.GetTextExtent( paragraph.Left(p + blank) , &width , &height ) ;

-
+                    

                     if ( width <= m_width )
                     {
                         int pos = x ;
                         if ( HasFlag( wxALIGN_CENTER ) )
                         {
                             pos += ( m_width - width ) / 2 ;
                     if ( width <= m_width )
                     {
                         int pos = x ;
                         if ( HasFlag( wxALIGN_CENTER ) )
                         {
                             pos += ( m_width - width ) / 2 ;

-                      }
+                        }

                         else if ( HasFlag( wxALIGN_RIGHT ) )
                         {
                             pos += ( m_width - width ) ;
                         else if ( HasFlag( wxALIGN_RIGHT ) )
                         {
                             pos += ( m_width - width ) ;

-                      }
-
-                    dc.DrawText( paragraph.Left(p + blank), pos , y) ;
-                    y += height ;
+                        }
+                        
+                        dc.DrawText( paragraph.Left(p + blank), pos , y) ;
+                        y += height ;

                         paragraph = paragraph.Mid(p+1) ;
                         linedrawn = true;
                         break ;
                     }
                 }
             }
                         paragraph = paragraph.Mid(p+1) ;
                         linedrawn = true;
                         break ;
                     }
                 }
             }

-
+            

             linedrawn = false;
         }
         else
             linedrawn = false;
         }
         else


@@ -121,15 +120,15 @@ void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph, int &y)
             if ( HasFlag( wxALIGN_CENTER ) )
             {
                 pos += ( m_width - width ) / 2 ;
             if ( HasFlag( wxALIGN_CENTER ) )
             {
                 pos += ( m_width - width ) / 2 ;

-          }
+            }

             else if ( HasFlag( wxALIGN_RIGHT ) )
             {
                 pos += ( m_width - width ) ;
             else if ( HasFlag( wxALIGN_RIGHT ) )
             {
                 pos += ( m_width - width ) ;

-          }
-
-        dc.DrawText( paragraph, pos , y) ;
-        paragraph="";
-        y += height ;
+            }
+            
+            dc.DrawText( paragraph, pos , y) ;
+            paragraph="";
+            y += height ;

         }
     }
 }
         }
     }
 }


@@ -157,7 +156,7 @@ void wxStaticText::OnDraw( wxDC &dc )
   }
 
   wxString paragraph;
   }
 
   wxString paragraph;

-  int i = 0 ;
+  size_t i = 0 ;

   wxString text = m_label;
   int y = 0 ;
   while (i < text.Length())
   wxString text = m_label;
   int y = 0 ;
   while (i < text.Length())


@@ -178,7 +177,7 @@ void wxStaticText::OnDraw( wxDC &dc )
       DrawParagraph(dc, paragraph,y);
 }
 
       DrawParagraph(dc, paragraph,y);
 }
 

-void wxStaticText::OnPaint( wxPaintEvent &event )
+void wxStaticText::OnPaint( wxPaintEvent & WXUNUSED(event) )

 {
     wxPaintDC dc(this);
     OnDraw( dc ) ;
 {
     wxPaintDC dc(this);
     OnDraw( dc ) ;