fixing non precomp include

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

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 1a29bed500f6b3f2328461aa73935d615902a2ff..985fa5d7e980149185d925fe42e357f464c84d63 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -50,7 +50,7 @@
 #include "wx/renderer.h"
 
 #ifdef __WXMAC__
 #include "wx/renderer.h"
 
 #ifdef __WXMAC__

-    #include "wx/mac/private.h"
+    #include "wx/osx/private.h"

 #endif
 
 
 #endif
 
 


@@ -243,7 +243,7 @@ private:
 //  wxListLineData (internal)
 //-----------------------------------------------------------------------------
 
 //  wxListLineData (internal)
 //-----------------------------------------------------------------------------
 

-WX_DECLARE_EXPORTED_LIST(wxListItemData, wxListItemDataList);
+WX_DECLARE_LIST(wxListItemData, wxListItemDataList);

 #include "wx/listimpl.cpp"
 WX_DEFINE_LIST(wxListItemDataList)
 
 #include "wx/listimpl.cpp"
 WX_DEFINE_LIST(wxListItemDataList)
 


@@ -375,7 +375,7 @@ private:
                            int width);
 };
 
                            int width);
 };
 

-WX_DECLARE_EXPORTED_OBJARRAY(wxListLineData, wxListLineDataArray);
+WX_DECLARE_OBJARRAY(wxListLineData, wxListLineDataArray);

 #include "wx/arrimpl.cpp"
 WX_DEFINE_OBJARRAY(wxListLineDataArray)
 
 #include "wx/arrimpl.cpp"
 WX_DEFINE_OBJARRAY(wxListLineDataArray)
 


@@ -432,7 +432,6 @@ private:
     // it wasn't vetoed, i.e. if we should proceed
     bool SendListEvent(wxEventType type, const wxPoint& pos);
 
     // it wasn't vetoed, i.e. if we should proceed
     bool SendListEvent(wxEventType type, const wxPoint& pos);
 

-    DECLARE_DYNAMIC_CLASS(wxListHeaderWindow)

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -488,11 +487,11 @@ private:
 //  wxListMainWindow (internal)
 //-----------------------------------------------------------------------------
 
 //  wxListMainWindow (internal)
 //-----------------------------------------------------------------------------
 

-WX_DECLARE_EXPORTED_LIST(wxListHeaderData, wxListHeaderDataList);
+WX_DECLARE_LIST(wxListHeaderData, wxListHeaderDataList);

 #include "wx/listimpl.cpp"
 WX_DEFINE_LIST(wxListHeaderDataList)
 
 #include "wx/listimpl.cpp"
 WX_DEFINE_LIST(wxListHeaderDataList)
 

-class wxListMainWindow : public wxScrolledWindow
+class wxListMainWindow : public wxScrolledCanvas

 {
 public:
     wxListMainWindow();
 {
 public:
     wxListMainWindow();


@@ -701,7 +700,7 @@ public:
     // override base class virtual to reset m_lineHeight when the font changes
     virtual bool SetFont(const wxFont& font)
     {
     // override base class virtual to reset m_lineHeight when the font changes
     virtual bool SetFont(const wxFont& font)
     {

-        if ( !wxScrolledWindow::SetFont(font) )
+        if ( !wxScrolledCanvas::SetFont(font) )

             return false;
 
         m_lineHeight = 0;
             return false;
 
         m_lineHeight = 0;


@@ -849,7 +848,6 @@ private:
     wxListTextCtrlWrapper *m_textctrlWrapper;
 
 
     wxListTextCtrlWrapper *m_textctrlWrapper;
 
 

-    DECLARE_DYNAMIC_CLASS(wxListMainWindow)

     DECLARE_EVENT_TABLE()
 
     friend class wxGenericListCtrl;
     DECLARE_EVENT_TABLE()
 
     friend class wxGenericListCtrl;


@@ -1686,8 +1684,6 @@ void wxListLineData::ReverseHighlight( void )
 //  wxListHeaderWindow
 //-----------------------------------------------------------------------------
 
 //  wxListHeaderWindow
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxListHeaderWindow,wxWindow)
-

 BEGIN_EVENT_TABLE(wxListHeaderWindow,wxWindow)
     EVT_PAINT         (wxListHeaderWindow::OnPaint)
     EVT_MOUSE_EVENTS  (wxListHeaderWindow::OnMouse)
 BEGIN_EVENT_TABLE(wxListHeaderWindow,wxWindow)
     EVT_PAINT         (wxListHeaderWindow::OnPaint)
     EVT_MOUSE_EVENTS  (wxListHeaderWindow::OnMouse)


@@ -2160,7 +2156,7 @@ void wxListTextCtrlWrapper::Finish( bool setfocus )
     wxPendingDelete.Append( this );
 
     if (setfocus)
     wxPendingDelete.Append( this );
 
     if (setfocus)

-        m_owner->SetFocusIgnoringChildren();
+        m_owner->SetFocus();

 }
 
 bool wxListTextCtrlWrapper::AcceptChanges()
 }
 
 bool wxListTextCtrlWrapper::AcceptChanges()


@@ -2237,9 +2233,7 @@ void wxListTextCtrlWrapper::OnKillFocus( wxFocusEvent &event )
 //  wxListMainWindow
 //-----------------------------------------------------------------------------
 
 //  wxListMainWindow
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxListMainWindow,wxScrolledWindow)
-
-BEGIN_EVENT_TABLE(wxListMainWindow,wxScrolledWindow)
+BEGIN_EVENT_TABLE(wxListMainWindow,wxScrolledCanvas)

   EVT_PAINT          (wxListMainWindow::OnPaint)
   EVT_MOUSE_EVENTS   (wxListMainWindow::OnMouse)
   EVT_CHAR           (wxListMainWindow::OnChar)
   EVT_PAINT          (wxListMainWindow::OnPaint)
   EVT_MOUSE_EVENTS   (wxListMainWindow::OnMouse)
   EVT_CHAR           (wxListMainWindow::OnChar)


@@ -2295,7 +2289,7 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent,
                                     const wxSize& size,
                                     long style,
                                     const wxString &name )
                                     const wxSize& size,
                                     long style,
                                     const wxString &name )

-                : wxScrolledWindow( parent, id, pos, size,
+                : wxScrolledCanvas( parent, id, pos, size,

                                     style | wxHSCROLL | wxVSCROLL, name )
 {
     Init();
                                     style | wxHSCROLL | wxVSCROLL, name )
 {
     Init();


@@ -2994,7 +2988,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
 #endif // __WXMAC__
 
     if ( event.LeftDown() )
 #endif // __WXMAC__
 
     if ( event.LeftDown() )

-        SetFocusIgnoringChildren();
+        SetFocus();

 
     event.SetEventObject( GetParent() );
     if ( GetParent()->GetEventHandler()->ProcessEvent( event) )
 
     event.SetEventObject( GetParent() );
     if ( GetParent()->GetEventHandler()->ProcessEvent( event) )


@@ -4195,9 +4189,9 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh)
     const size_t count = GetItemCount();
 
     int iconSpacing;
     const size_t count = GetItemCount();
 
     int iconSpacing;

-    if ( HasFlag(wxLC_ICON) )
+    if ( HasFlag(wxLC_ICON) && m_normal_image_list )

         iconSpacing = m_normal_spacing;
         iconSpacing = m_normal_spacing;

-    else if ( HasFlag(wxLC_SMALL_ICON) )
+    else if ( HasFlag(wxLC_SMALL_ICON) && m_small_image_list )

         iconSpacing = m_small_spacing;
     else
         iconSpacing = 0;
         iconSpacing = m_small_spacing;
     else
         iconSpacing = 0;


@@ -4860,7 +4854,7 @@ void wxListMainWindow::OnScroll(wxScrollWinEvent& event)
 {
     // FIXME
 #if ( defined(__WXGTK__) || defined(__WXMAC__) ) && !defined(__WXUNIVERSAL__)
 {
     // FIXME
 #if ( defined(__WXGTK__) || defined(__WXMAC__) ) && !defined(__WXUNIVERSAL__)

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

 #else
     HandleOnScroll( event );
 #endif
 #else
     HandleOnScroll( event );
 #endif