New eventb based Drag interface for wxDataViewCtrl

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

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index bf9e05c4170e386692b983d57156e428829424d4..5283ba99542f4d0c34387b7f57f7345d4b87d72b 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -1700,7 +1700,7 @@ END_EVENT_TABLE()
 
 void wxListHeaderWindow::Init()
 {
 
 void wxListHeaderWindow::Init()
 {

-    m_currentCursor = (wxCursor *) NULL;
+    m_currentCursor = NULL;

     m_isDragging = false;
     m_dirty = false;
 }
     m_isDragging = false;
     m_dirty = false;
 }


@@ -1709,8 +1709,8 @@ wxListHeaderWindow::wxListHeaderWindow()
 {
     Init();
 
 {
     Init();
 

-    m_owner = (wxListMainWindow *) NULL;
-    m_resizeCursor = (wxCursor *) NULL;
+    m_owner = NULL;
+    m_resizeCursor = NULL;

 }
 
 wxListHeaderWindow::wxListHeaderWindow( wxWindow *win,
 }
 
 wxListHeaderWindow::wxListHeaderWindow( wxWindow *win,


@@ -2277,8 +2277,8 @@ void wxListMainWindow::Init()
     m_headerWidth =
     m_lineHeight = 0;
 
     m_headerWidth =
     m_lineHeight = 0;
 

-    m_small_image_list = (wxImageList *) NULL;
-    m_normal_image_list = (wxImageList *) NULL;
+    m_small_image_list = NULL;
+    m_normal_image_list = NULL;

 
     m_small_spacing = 30;
     m_normal_spacing = 40;
 
     m_small_spacing = 30;
     m_normal_spacing = 40;


@@ -2302,7 +2302,7 @@ wxListMainWindow::wxListMainWindow()
     Init();
 
     m_highlightBrush =
     Init();
 
     m_highlightBrush =

-    m_highlightUnfocusedBrush = (wxBrush *) NULL;
+    m_highlightUnfocusedBrush = NULL;

 }
 
 wxListMainWindow::wxListMainWindow( wxWindow *parent,
 }
 
 wxListMainWindow::wxListMainWindow( wxWindow *parent,


@@ -4958,16 +4958,16 @@ END_EVENT_TABLE()
 
 wxGenericListCtrl::wxGenericListCtrl()
 {
 
 wxGenericListCtrl::wxGenericListCtrl()
 {

-    m_imageListNormal = (wxImageList *) NULL;
-    m_imageListSmall = (wxImageList *) NULL;
-    m_imageListState = (wxImageList *) NULL;
+    m_imageListNormal = NULL;
+    m_imageListSmall = NULL;
+    m_imageListState = NULL;

 
     m_ownsImageListNormal =
     m_ownsImageListSmall =
     m_ownsImageListState = false;
 
 
     m_ownsImageListNormal =
     m_ownsImageListSmall =
     m_ownsImageListState = false;
 

-    m_mainWin = (wxListMainWindow*) NULL;
-    m_headerWin = (wxListHeaderWindow*) NULL;
+    m_mainWin = NULL;
+    m_headerWin = NULL;

     m_headerHeight = 0;
 }
 
     m_headerHeight = 0;
 }
 


@@ -5030,13 +5030,13 @@ bool wxGenericListCtrl::Create(wxWindow *parent,
 {
     m_imageListNormal =
     m_imageListSmall =
 {
     m_imageListNormal =
     m_imageListSmall =

-    m_imageListState = (wxImageList *) NULL;
+    m_imageListState = NULL;

     m_ownsImageListNormal =
     m_ownsImageListSmall =
     m_ownsImageListState = false;
 
     m_ownsImageListNormal =
     m_ownsImageListSmall =
     m_ownsImageListState = false;
 

-    m_mainWin = (wxListMainWindow*) NULL;
-    m_headerWin = (wxListHeaderWindow*) NULL;
+    m_mainWin = NULL;
+    m_headerWin = NULL;

 
     m_headerHeight = 0;
 
 
     m_headerHeight = 0;
 


@@ -5060,7 +5060,7 @@ bool wxGenericListCtrl::Create(wxWindow *parent,
     if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL )
     {
         wxFont font;
     if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL )
     {
         wxFont font;

-#if wxOSX_USE_CARBON
+#if wxOSX_USE_ATSU_TEXT

         font.MacCreateFromThemeFont( kThemeViewsFont );
 #else
         font.MacCreateFromUIFont( kCTFontViewsFontType );
         font.MacCreateFromThemeFont( kThemeViewsFont );
 #else
         font.MacCreateFromUIFont( kCTFontViewsFontType );


@@ -5077,7 +5077,7 @@ bool wxGenericListCtrl::Create(wxWindow *parent,
         if (m_headerWin)
         {
             wxFont font;
         if (m_headerWin)
         {
             wxFont font;

-#if wxOSX_USE_CARBON
+#if wxOSX_USE_ATSU_TEXT

             font.MacCreateFromThemeFont( kThemeSmallSystemFont );
 #else
         font.MacCreateFromUIFont( kCTFontSystemFontType );
             font.MacCreateFromThemeFont( kThemeSmallSystemFont );
 #else
         font.MacCreateFromUIFont( kCTFontSystemFontType );


@@ -5446,7 +5446,7 @@ wxImageList *wxGenericListCtrl::GetImageList(int which) const
     else if (which == wxIMAGE_LIST_STATE)
         return m_imageListState;
 
     else if (which == wxIMAGE_LIST_STATE)
         return m_imageListState;
 

-    return (wxImageList *) NULL;
+    return NULL;

 }
 
 void wxGenericListCtrl::SetImageList( wxImageList *imageList, int which )
 }
 
 void wxGenericListCtrl::SetImageList( wxImageList *imageList, int which )