corrected use of Print Manager Session APIs for Carbon targets

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

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 065aa5d627d3c3fa012d87db85d81ff875bdca47..ba3308575709bbfffd9949fbec5ab3634cd0c1af 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -34,6 +34,27 @@
 #define wxUSE_GENERIC_LIST_EXTENSIONS 1
 #endif
 
 #define wxUSE_GENERIC_LIST_EXTENSIONS 1
 #endif
 

+// ----------------------------------------------------------------------------
+// events
+// ----------------------------------------------------------------------------
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_BEGIN_DRAG)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_BEGIN_RDRAG)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_END_LABEL_EDIT)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_DELETE_ITEM)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_GET_INFO)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_SET_INFO)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_SELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_DESELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_KEY_DOWN)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_INSERT_ITEM)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_ACTIVATED)
+

 // ============================================================================
 // private classes
 // ============================================================================
 // ============================================================================
 // private classes
 // ============================================================================


@@ -1249,7 +1270,12 @@ void wxListHeaderWindow::AdjustDC(wxDC& dc)
 
 void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
 
 void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {

+#ifdef __WXGTK__
+    wxClientDC dc( this );
+#else

     wxPaintDC dc( this );
     wxPaintDC dc( this );

+#endif
+

     PrepareDC( dc );
     AdjustDC( dc );
 
     PrepareDC( dc );
     AdjustDC( dc );
 


@@ -1669,6 +1695,10 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     wxPaintDC dc( this );
     PrepareDC( dc );
 
     wxPaintDC dc( this );
     PrepareDC( dc );
 

+    int dev_x = 0;
+    int dev_y = 0;
+    CalcScrolledPosition( 0, 0, &dev_x, &dev_y );
+

     if (m_dirty) return;
 
     if (m_lines.GetCount() == 0) return;
     if (m_dirty) return;
 
     if (m_lines.GetCount() == 0) return;


@@ -1680,9 +1710,6 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     if (m_mode & wxLC_REPORT)
     {
         wxPen pen(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DLIGHT), 1, wxSOLID);
     if (m_mode & wxLC_REPORT)
     {
         wxPen pen(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DLIGHT), 1, wxSOLID);

-        dc.SetPen(pen);
-        dc.SetBrush(* wxTRANSPARENT_BRUSH);
-

         wxSize clientSize = GetClientSize();
 
         int lineSpacing = 0;
         wxSize clientSize = GetClientSize();
 
         int lineSpacing = 0;


@@ -1701,12 +1728,20 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
             m_lines[i].Draw( &dc );
             // Draw horizontal rule if required
             if (GetWindowStyle() & wxLC_HRULES)
             m_lines[i].Draw( &dc );
             // Draw horizontal rule if required
             if (GetWindowStyle() & wxLC_HRULES)

-                dc.DrawLine(0, i*lineSpacing, clientSize.x, i*lineSpacing);
+            {
+                dc.SetPen(pen);
+                dc.SetBrush(* wxTRANSPARENT_BRUSH);
+                dc.DrawLine(0 - dev_x , i*lineSpacing , clientSize.x - dev_x , i*lineSpacing );
+           }

         }
 
         // Draw last horizontal rule
         if ((i > (size_t) (y_s / lineSpacing)) && (GetWindowStyle() & wxLC_HRULES))
         }
 
         // Draw last horizontal rule
         if ((i > (size_t) (y_s / lineSpacing)) && (GetWindowStyle() & wxLC_HRULES))

-            dc.DrawLine(0, i*lineSpacing, clientSize.x, i*lineSpacing);
+        {
+            dc.SetPen(pen);
+            dc.SetBrush(* wxTRANSPARENT_BRUSH);
+            dc.DrawLine(0 - dev_x , i*lineSpacing , clientSize.x - dev_x , i*lineSpacing );
+       }

 
         // Draw vertical rules if required
         if ((GetWindowStyle() & wxLC_VRULES) && (GetItemCount() > 0))
 
         // Draw vertical rules if required
         if ((GetWindowStyle() & wxLC_VRULES) && (GetItemCount() > 0))


@@ -1717,11 +1752,13 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
             GetItemRect(0, firstItemRect);
             GetItemRect(GetItemCount() - 1, lastItemRect);
             int x = firstItemRect.GetX();
             GetItemRect(0, firstItemRect);
             GetItemRect(GetItemCount() - 1, lastItemRect);
             int x = firstItemRect.GetX();

+            dc.SetPen(pen);
+            dc.SetBrush(* wxTRANSPARENT_BRUSH);

             for (col = 0; col < GetColumnCount(); col++)
             {
                 int colWidth = GetColumnWidth(col);
                 x += colWidth ;
             for (col = 0; col < GetColumnCount(); col++)
             {
                 int colWidth = GetColumnWidth(col);
                 x += colWidth ;

-                dc.DrawLine(x, firstItemRect.GetY() - 1, x, lastItemRect.GetBottom() + 1);
+                dc.DrawLine(x - dev_x, firstItemRect.GetY() - 1 - dev_y, x - dev_x, lastItemRect.GetBottom() + 1 - dev_y);

             }
         }
     }
             }
         }
     }


@@ -2642,7 +2679,7 @@ int wxListMainWindow::GetItemState( long item, long stateMask )
         if (item >= 0 && (size_t)item < m_lines.GetCount())
         {
             wxListLineData *line = &m_lines[(size_t)item];
         if (item >= 0 && (size_t)item < m_lines.GetCount())
         {
             wxListLineData *line = &m_lines[(size_t)item];

-            if (line->IsHilighted()) ret |= wxLIST_STATE_FOCUSED;
+            if (line->IsHilighted()) ret |= wxLIST_STATE_SELECTED;

         }
     }
     return ret;
         }
     }
     return ret;


@@ -3092,7 +3129,8 @@ void wxListMainWindow::SortItems( wxListCtrlCompare fn, long data )
 
 void wxListMainWindow::OnScroll(wxScrollWinEvent& event)
 {
 
 void wxListMainWindow::OnScroll(wxScrollWinEvent& event)
 {

-        wxScrolledWindow::OnScroll( event ) ;
+     wxScrolledWindow::OnScroll( event ) ;
+

 #if wxUSE_GENERIC_LIST_EXTENSIONS
 
     if (event.GetOrientation() == wxHORIZONTAL && ( m_mode & wxLC_REPORT ))
 #if wxUSE_GENERIC_LIST_EXTENSIONS
 
     if (event.GetOrientation() == wxHORIZONTAL && ( m_mode & wxLC_REPORT ))