now grabs encoding info not from but from '' (empty string) -- default po header...

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

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 032bb8344b28a71d3d53be5b562269cd3e82c357..8558840d6aa3eb7b33ca30c810faade574139019 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -295,7 +295,7 @@ void wxListLineData::CalculateSize( wxDC *dc, int spacing )
             {
                 wxListItemData *item = (wxListItemData*)node->Data();
                 wxString s = item->GetText();
             {
                 wxListItemData *item = (wxListItemData*)node->Data();
                 wxString s = item->GetText();

-                long lw,lh;
+                wxCoord lw,lh;

                 dc->GetTextExtent( s, &lw, &lh );
                 if (lw > m_spacing) m_bound_all.width = lw;
             }
                 dc->GetTextExtent( s, &lw, &lh );
                 if (lw > m_spacing) m_bound_all.width = lw;
             }


@@ -308,14 +308,14 @@ void wxListLineData::CalculateSize( wxDC *dc, int spacing )
             {
                 wxListItemData *item = (wxListItemData*)node->Data();
                 wxString s = item->GetText();
             {
                 wxListItemData *item = (wxListItemData*)node->Data();
                 wxString s = item->GetText();

-                long lw,lh;
+                wxCoord lw,lh;

                 dc->GetTextExtent( s, &lw, &lh );
                 m_bound_all.width = lw;
                 m_bound_all.height = lh;
                 if (item->HasImage())
                 {
                 dc->GetTextExtent( s, &lw, &lh );
                 m_bound_all.width = lw;
                 m_bound_all.height = lh;
                 if (item->HasImage())
                 {

-                    int w = 0;
-                    int h = 0;
+                    wxCoord w = 0;
+                    wxCoord h = 0;

                     m_owner->GetImageSize( item->GetImage(), w, h );
                     m_bound_all.width += 4 + w;
                     if (h > m_bound_all.height) m_bound_all.height = h;
                     m_owner->GetImageSize( item->GetImage(), w, h );
                     m_bound_all.width += 4 + w;
                     if (h > m_bound_all.height) m_bound_all.height = h;


@@ -334,7 +334,7 @@ void wxListLineData::CalculateSize( wxDC *dc, int spacing )
                 wxString s;
                 item->GetText( s );
                 if (s.IsNull()) s = "H";
                 wxString s;
                 item->GetText( s );
                 if (s.IsNull()) s = "H";

-                long lw,lh;
+                wxCoord lw,lh;

                 dc->GetTextExtent( s, &lw, &lh );
                 item->SetSize( item->GetWidth(), lh );
                 m_bound_all.width += lw;
                 dc->GetTextExtent( s, &lw, &lh );
                 item->SetSize( item->GetWidth(), lh );
                 m_bound_all.width += lw;


@@ -384,7 +384,7 @@ void wxListLineData::SetPosition( wxDC *dc, int x, int y, int window_width )
                 {
                     wxString s;
                     item->GetText( s );
                 {
                     wxString s;
                     item->GetText( s );

-                    long lw,lh;
+                    wxCoord lw,lh;

                     dc->GetTextExtent( s, &lw, &lh );
                     if (m_bound_all.width > m_spacing)
                         m_bound_label.x = m_bound_all.x;
                     dc->GetTextExtent( s, &lw, &lh );
                     if (m_bound_all.width > m_spacing)
                         m_bound_label.x = m_bound_all.x;


@@ -432,7 +432,7 @@ void wxListLineData::SetPosition( wxDC *dc, int x, int y, int window_width )
         }
         case wxLC_REPORT:
         {
         }
         case wxLC_REPORT:
         {

-            long lw,lh;
+            wxCoord lw,lh;

             dc->GetTextExtent( "H", &lw, &lh );
             m_bound_all.x = 0;
             m_bound_all.y -= 0;
             dc->GetTextExtent( "H", &lw, &lh );
             m_bound_all.x = 0;
             m_bound_all.y -= 0;


@@ -448,7 +448,7 @@ void wxListLineData::SetPosition( wxDC *dc, int x, int y, int window_width )
                 wxString s;
                 item->GetText( s );
                 if (s.IsEmpty()) s = wxT("H");
                 wxString s;
                 item->GetText( s );
                 if (s.IsEmpty()) s = wxT("H");

-                long lw,lh;
+                wxCoord lw,lh;

                 dc->GetTextExtent( s, &lw, &lh );
                 m_bound_label.width = lw;
                 m_bound_label.height = lh;
                 dc->GetTextExtent( s, &lw, &lh );
                 m_bound_label.width = lw;
                 m_bound_label.height = lh;


@@ -710,11 +710,11 @@ void wxListLineData::DoDraw( wxDC *dc, bool hilight, bool paintBG )
 void wxListLineData::Hilight( bool on )
 {
     if (on == m_hilighted) return;
 void wxListLineData::Hilight( bool on )
 {
     if (on == m_hilighted) return;

+    m_hilighted = on;

     if (on)
         m_owner->SelectLine( this );
     else
         m_owner->DeselectLine( this );
     if (on)
         m_owner->SelectLine( this );
     else
         m_owner->DeselectLine( this );

-    m_hilighted = on;

 }
 
 void wxListLineData::ReverseHilight( void )
 }
 
 void wxListLineData::ReverseHilight( void )


@@ -1258,8 +1258,8 @@ void wxListMainWindow::SendNotify( wxListLineData *line, wxEventType command )
     le.SetEventObject( GetParent() );
     le.m_itemIndex = GetIndexOfLine( line );
     line->GetItem( 0, le.m_item );
     le.SetEventObject( GetParent() );
     le.m_itemIndex = GetIndexOfLine( line );
     line->GetItem( 0, le.m_item );

-//    GetParent()->GetEventHandler()->ProcessEvent( le );
-    GetParent()->GetEventHandler()->AddPendingEvent( le );
+    GetParent()->GetEventHandler()->ProcessEvent( le );
+//    GetParent()->GetEventHandler()->AddPendingEvent( le );

 }
 
 void wxListMainWindow::FocusLine( wxListLineData *WXUNUSED(line) )
 }
 
 void wxListMainWindow::FocusLine( wxListLineData *WXUNUSED(line) )


@@ -1828,8 +1828,8 @@ void wxListMainWindow::GetImageSize( int index, int &width, int &height )
 int wxListMainWindow::GetTextLength( wxString &s )
 {
     wxClientDC dc( this );
 int wxListMainWindow::GetTextLength( wxString &s )
 {
     wxClientDC dc( this );

-    long lw = 0;
-    long lh = 0;
+    wxCoord lw = 0;
+    wxCoord lh = 0;

     dc.GetTextExtent( s, &lw, &lh );
     return lw + 6;
 }
     dc.GetTextExtent( s, &lw, &lh );
     return lw + 6;
 }


@@ -1909,7 +1909,7 @@ void wxListMainWindow::SetColumnWidth( int col, int width )
             {
                 wxListItemData *item = (wxListItemData*)n->Data();
                 int current = 0, ix = 0, iy = 0;
             {
                 wxListItemData *item = (wxListItemData*)n->Data();
                 int current = 0, ix = 0, iy = 0;

-                long lx = 0, ly = 0;
+                wxCoord lx = 0, ly = 0;

                 if (item->HasImage())
                 {
                     GetImageSize( item->GetImage(), ix, iy );
                 if (item->HasImage())
                 {
                     GetImageSize( item->GetImage(), ix, iy );