Document lack of wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK under OS X.

[wxWidgets.git] / src / osx / carbon / listctrl_mac.cpp

diff --git a/src/osx/carbon/listctrl_mac.cpp b/src/osx/carbon/listctrl_mac.cpp
index 73335f0445c648f9cec8d1789b831563477891d0..5cc788b68fee91f8c6ec083b419dfdb58109bfc4 100644 (file)
--- a/src/osx/carbon/listctrl_mac.cpp
+++ b/src/osx/carbon/listctrl_mac.cpp
@@ -685,7 +685,7 @@ bool wxListCtrl::Create(wxWindow *parent,
             (EventHandlerRef *)&m_macListCtrlEventHandler);
 
         m_renameTimer = new wxListCtrlRenameTimer( this );
             (EventHandlerRef *)&m_macListCtrlEventHandler);
 
         m_renameTimer = new wxListCtrlRenameTimer( this );

-        
+

         Connect( wxID_ANY, wxEVT_CHAR, wxCharEventHandler(wxListCtrl::OnChar), NULL, this );
         Connect( wxID_ANY, wxEVT_LEFT_DOWN, wxMouseEventHandler(wxListCtrl::OnLeftDown), NULL, this );
         Connect( wxID_ANY, wxEVT_LEFT_DCLICK, wxMouseEventHandler(wxListCtrl::OnDblClick), NULL, this );
         Connect( wxID_ANY, wxEVT_CHAR, wxCharEventHandler(wxListCtrl::OnChar), NULL, this );
         Connect( wxID_ANY, wxEVT_LEFT_DOWN, wxMouseEventHandler(wxListCtrl::OnLeftDown), NULL, this );
         Connect( wxID_ANY, wxEVT_LEFT_DCLICK, wxMouseEventHandler(wxListCtrl::OnDblClick), NULL, this );


@@ -803,8 +803,7 @@ void wxListCtrl::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 
 bool wxListCtrl::SetFont(const wxFont& font)
 {
 
 bool wxListCtrl::SetFont(const wxFont& font)
 {

-    bool rv = true;
-    rv = wxListCtrlBase::SetFont(font);
+    bool rv = wxListCtrlBase::SetFont(font);

     if (m_genericImpl)
         rv = m_genericImpl->SetFont(font);
     return rv;
     if (m_genericImpl)
         rv = m_genericImpl->SetFont(font);
     return rv;


@@ -2661,11 +2660,10 @@ enum
 static void calculateCGDrawingBounds(CGRect inItemRect, CGRect *outIconRect, CGRect *outTextRect, bool hasIcon = false)
 {
   float textBottom;
 static void calculateCGDrawingBounds(CGRect inItemRect, CGRect *outIconRect, CGRect *outTextRect, bool hasIcon = false)
 {
   float textBottom;

-  float iconH, iconW = 0;
+  float iconW = 0;

   float padding = kItemPadding;
   if (hasIcon)
   {
   float padding = kItemPadding;
   if (hasIcon)
   {

-    iconH = kIconHeight;

     iconW = kIconWidth;
     padding = padding*2;
   }
     iconW = kIconWidth;
     padding = padding*2;
   }