headers are now installed by automake too

[wxWidgets.git] / include / wx / generic / listctrl.h

diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h
index afe4e8a7ceef9f714c4029b14db0767cf423dad1..b9a9e74ce506dc49b57d86c9b6f46da1d90ab282 100644 (file)
--- a/include/wx/generic/listctrl.h
+++ b/include/wx/generic/listctrl.h
@@ -17,7 +17,7 @@
 
 #include "wx/defs.h"
 #include "wx/object.h"
 
 #include "wx/defs.h"
 #include "wx/object.h"

-#include "wx/imaglist.h"
+#include "wx/generic/imaglist.h"

 #include "wx/control.h"
 #include "wx/timer.h"
 #include "wx/textctrl.h"
 #include "wx/control.h"
 #include "wx/timer.h"
 #include "wx/textctrl.h"


@@ -25,26 +25,30 @@
 #include "wx/scrolwin.h"
 #include "wx/settings.h"
 
 #include "wx/scrolwin.h"
 #include "wx/settings.h"
 

+#if wxUSE_DRAG_AND_DROP
+class WXDLLEXPORT wxDropTarget;
+#endif
+

 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 

-class wxListItem;
-class wxListEvent;
-class wxListCtrl;
+class WXDLLEXPORT wxListItem;
+class WXDLLEXPORT wxListEvent;
+class WXDLLEXPORT wxListCtrl;

 
 //-----------------------------------------------------------------------------
 // internal classes
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // internal classes
 //-----------------------------------------------------------------------------
 

-class wxListHeaderData;
-class wxListItemData;
-class wxListLineData;
+class WXDLLEXPORT wxListHeaderData;
+class WXDLLEXPORT wxListItemData;
+class WXDLLEXPORT wxListLineData;

 
 

-class wxListHeaderWindow;
-class wxListMainWindow;
+class WXDLLEXPORT wxListHeaderWindow;
+class WXDLLEXPORT wxListMainWindow;

 
 

-class wxListRenameTimer;
+class WXDLLEXPORT wxListRenameTimer;

 //class wxListTextCtrl;
 
 //-----------------------------------------------------------------------------
 //class wxListTextCtrl;
 
 //-----------------------------------------------------------------------------


@@ -164,7 +168,7 @@ enum {
 // wxListItem
 //-----------------------------------------------------------------------------
 
 // wxListItem
 //-----------------------------------------------------------------------------
 

-class wxListItem: public wxObject
+class WXDLLEXPORT wxListItem: public wxObject

 {
   DECLARE_DYNAMIC_CLASS(wxListItem)
 
 {
   DECLARE_DYNAMIC_CLASS(wxListItem)
 


@@ -224,12 +228,13 @@ typedef void (wxEvtHandler::*wxListEventFunction)(wxListEvent&);
 #define EVT_LIST_COL_CLICK(id, fn) { wxEVT_COMMAND_LIST_COL_CLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL },
 #define EVT_LIST_ITEM_RIGHT_CLICK(id, fn) { wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL },
 #define EVT_LIST_ITEM_MIDDLE_CLICK(id, fn) { wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL },
 #define EVT_LIST_COL_CLICK(id, fn) { wxEVT_COMMAND_LIST_COL_CLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL },
 #define EVT_LIST_ITEM_RIGHT_CLICK(id, fn) { wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL },
 #define EVT_LIST_ITEM_MIDDLE_CLICK(id, fn) { wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL },

+#define EVT_LIST_ITEM_ACTIVATED(id, fn) { wxEVT_COMMAND_LIST_ITEM_ACTIVATED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL },

 
 //-----------------------------------------------------------------------------
 //  wxListItemData (internal)
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 //  wxListItemData (internal)
 //-----------------------------------------------------------------------------
 

-class wxListItemData : public wxObject
+class WXDLLEXPORT wxListItemData : public wxObject

 {
   DECLARE_DYNAMIC_CLASS(wxListItemData);
 
 {
   DECLARE_DYNAMIC_CLASS(wxListItemData);
 


@@ -268,7 +273,7 @@ class wxListItemData : public wxObject
 //  wxListHeaderData (internal)
 //-----------------------------------------------------------------------------
 
 //  wxListHeaderData (internal)
 //-----------------------------------------------------------------------------
 

-class wxListHeaderData : public wxObject
+class WXDLLEXPORT wxListHeaderData : public wxObject

 {
   DECLARE_DYNAMIC_CLASS(wxListHeaderData);
 
 {
   DECLARE_DYNAMIC_CLASS(wxListHeaderData);
 


@@ -303,29 +308,29 @@ class wxListHeaderData : public wxObject
 //  wxListLineData (internal)
 //-----------------------------------------------------------------------------
 
 //  wxListLineData (internal)
 //-----------------------------------------------------------------------------
 

-class wxListLineData : public wxObject
+class WXDLLEXPORT wxListLineData : public wxObject

 {
   DECLARE_DYNAMIC_CLASS(wxListLineData);
 
   public:
     wxList              m_items;
 {
   DECLARE_DYNAMIC_CLASS(wxListLineData);
 
   public:
     wxList              m_items;

-    wxRectangle         m_bound_all;
-    wxRectangle         m_bound_label;
-    wxRectangle         m_bound_icon;
-    wxRectangle         m_bound_hilight;
+    wxRect         m_bound_all;
+    wxRect         m_bound_label;
+    wxRect         m_bound_icon;
+    wxRect         m_bound_hilight;

     int                 m_mode;
     bool                m_hilighted;
     wxBrush            *m_hilightBrush;
     int                 m_spacing;
     wxListMainWindow   *m_owner;
 
     int                 m_mode;
     bool                m_hilighted;
     wxBrush            *m_hilightBrush;
     int                 m_spacing;
     wxListMainWindow   *m_owner;
 

-    void DoDraw( wxPaintDC *dc, bool hilight, bool paintBG );
+    void DoDraw( wxDC *dc, bool hilight, bool paintBG );

 
   public:
     wxListLineData( void ) {};
     wxListLineData( wxListMainWindow *owner, int mode, wxBrush *hilightBrush );
 
   public:
     wxListLineData( void ) {};
     wxListLineData( wxListMainWindow *owner, int mode, wxBrush *hilightBrush );

-    void CalculateSize( wxPaintDC *dc, int spacing );
-    void SetPosition( wxPaintDC *dc, int x, int y,  int window_width );
+    void CalculateSize( wxDC *dc, int spacing );
+    void SetPosition( wxDC *dc, int x, int y,  int window_width );

     void SetColumnPosition( int index, int x );
     void GetSize( int &width, int &height );
     void GetExtent( int &x, int &y, int &width, int &height );
     void SetColumnPosition( int index, int x );
     void GetSize( int &width, int &height );
     void GetExtent( int &x, int &y, int &width, int &height );


@@ -337,22 +342,22 @@ class wxListLineData : public wxObject
     void GetText( int index, wxString &s );
     void SetText( int index, const wxString s );
     int GetImage( int index );
     void GetText( int index, wxString &s );
     void SetText( int index, const wxString s );
     int GetImage( int index );

-    void GetRect( wxRectangle &rect );
+    void GetRect( wxRect &rect );

     void Hilight( bool on );
     void ReverseHilight( void );
     void Hilight( bool on );
     void ReverseHilight( void );

-    void DrawRubberBand( wxPaintDC *dc, bool on );
-    void Draw( wxPaintDC *dc );
-    bool IsInRect( int x, int y, const wxRectangle &rect );
+    void DrawRubberBand( wxDC *dc, bool on );
+    void Draw( wxDC *dc );
+    bool IsInRect( int x, int y, const wxRect &rect );

     bool IsHilighted( void );
     bool IsHilighted( void );

-    void AssignRect( wxRectangle &dest, int x, int y, int width, int height );
-    void AssignRect( wxRectangle &dest, const wxRectangle &source );
+    void AssignRect( wxRect &dest, int x, int y, int width, int height );
+    void AssignRect( wxRect &dest, const wxRect &source );

 };
 
 //-----------------------------------------------------------------------------
 //  wxListHeaderWindow (internal)
 //-----------------------------------------------------------------------------
 
 };
 
 //-----------------------------------------------------------------------------
 //  wxListHeaderWindow (internal)
 //-----------------------------------------------------------------------------
 

-class wxListHeaderWindow : public wxWindow
+class WXDLLEXPORT wxListHeaderWindow : public wxWindow

 {
   DECLARE_DYNAMIC_CLASS(wxListHeaderWindow)
 
 {
   DECLARE_DYNAMIC_CLASS(wxListHeaderWindow)
 


@@ -360,7 +365,7 @@ class wxListHeaderWindow : public wxWindow
     wxListMainWindow  *m_owner;
     wxCursor          *m_currentCursor;
     wxCursor          *m_resizeCursor;
     wxListMainWindow  *m_owner;
     wxCursor          *m_currentCursor;
     wxCursor          *m_resizeCursor;

-    bool               m_isDraging;
+    bool               m_isDragging;

     int                m_column;
     int                m_minX;
     int                m_currentX;
     int                m_column;
     int                m_minX;
     int                m_currentX;


@@ -371,7 +376,7 @@ class wxListHeaderWindow : public wxWindow
     wxListHeaderWindow( wxWindow *win, wxWindowID id, wxListMainWindow *owner,
       const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
       long style = 0, const wxString &name = "columntitles" );
     wxListHeaderWindow( wxWindow *win, wxWindowID id, wxListMainWindow *owner,
       const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
       long style = 0, const wxString &name = "columntitles" );

-    void DoDrawRect( wxPaintDC *dc, int x, int y, int w, int h );
+    void DoDrawRect( wxDC *dc, int x, int y, int w, int h );

     void OnPaint( wxPaintEvent &event );
     void DrawCurrent();
     void OnMouse( wxMouseEvent &event );
     void OnPaint( wxPaintEvent &event );
     void DrawCurrent();
     void OnMouse( wxMouseEvent &event );


@@ -384,7 +389,7 @@ class wxListHeaderWindow : public wxWindow
 // wxListRenameTimer (internal)
 //-----------------------------------------------------------------------------
 
 // wxListRenameTimer (internal)
 //-----------------------------------------------------------------------------
 

-class wxListRenameTimer: public wxTimer
+class WXDLLEXPORT wxListRenameTimer: public wxTimer

 {
  private:
    wxListMainWindow   *m_owner;
 {
  private:
    wxListMainWindow   *m_owner;


@@ -398,7 +403,7 @@ class wxListRenameTimer: public wxTimer
 //  wxListTextCtrl (internal)
 //-----------------------------------------------------------------------------
 
 //  wxListTextCtrl (internal)
 //-----------------------------------------------------------------------------
 

-class wxListTextCtrl: public wxTextCtrl
+class WXDLLEXPORT wxListTextCtrl: public wxTextCtrl

 {
   DECLARE_DYNAMIC_CLASS(wxListTextCtrl);
 
 {
   DECLARE_DYNAMIC_CLASS(wxListTextCtrl);
 


@@ -425,7 +430,7 @@ class wxListTextCtrl: public wxTextCtrl
 //  wxListMainWindow (internal)
 //-----------------------------------------------------------------------------
 
 //  wxListMainWindow (internal)
 //-----------------------------------------------------------------------------
 

-class wxListMainWindow: public wxScrolledWindow
+class WXDLLEXPORT wxListMainWindow: public wxScrolledWindow

 {
   DECLARE_DYNAMIC_CLASS(wxListMainWindow);
 
 {
   DECLARE_DYNAMIC_CLASS(wxListMainWindow);
 


@@ -476,10 +481,11 @@ class wxListMainWindow: public wxScrolledWindow
     void MoveToFocus( void );
     void OnArrowChar( wxListLineData *newCurrent, bool shiftDown );
     void OnChar( wxKeyEvent &event );
     void MoveToFocus( void );
     void OnArrowChar( wxListLineData *newCurrent, bool shiftDown );
     void OnChar( wxKeyEvent &event );

+    void OnKeyDown( wxKeyEvent &event );

     void OnSetFocus( wxFocusEvent &event );
     void OnKillFocus( wxFocusEvent &event );
     void OnSize( wxSizeEvent &event );
     void OnSetFocus( wxFocusEvent &event );
     void OnKillFocus( wxFocusEvent &event );
     void OnSize( wxSizeEvent &event );

-    void DrawImage( int index, wxPaintDC *dc, int x, int y );
+    void DrawImage( int index, wxDC *dc, int x, int y );

     void GetImageSize( int index, int &width, int &height );
     int GetIndexOfLine( const wxListLineData *line );
     int GetTextLength( wxString &s );  // should be const
     void GetImageSize( int index, int &width, int &height );
     int GetIndexOfLine( const wxListLineData *line );
     int GetTextLength( wxString &s );  // should be const


@@ -498,7 +504,7 @@ class wxListMainWindow: public wxScrolledWindow
     void SetItemState( long item, long state, long stateMask );
     int GetItemState( long item, long stateMask );
     int GetItemCount( void );
     void SetItemState( long item, long state, long stateMask );
     int GetItemState( long item, long stateMask );
     int GetItemCount( void );

-    void GetItemRect( long index, wxRectangle &rect );
+    void GetItemRect( long index, wxRect &rect );

     bool GetItemPosition(long item, wxPoint& pos);
     int GetSelectedItemCount( void );
     void SetMode( long mode );
     bool GetItemPosition(long item, wxPoint& pos);
     int GetSelectedItemCount( void );
     void SetMode( long mode );


@@ -527,7 +533,7 @@ class wxListMainWindow: public wxScrolledWindow
 // wxListCtrl
 //-----------------------------------------------------------------------------
 
 // wxListCtrl
 //-----------------------------------------------------------------------------
 

-class wxListCtrl: public wxControl
+class WXDLLEXPORT wxListCtrl: public wxControl

 {
   DECLARE_DYNAMIC_CLASS(wxListCtrl);
 
 {
   DECLARE_DYNAMIC_CLASS(wxListCtrl);
 


@@ -563,7 +569,7 @@ class wxListCtrl: public wxControl
     void SetItemText( long item, const wxString& str );
     long GetItemData( long item ) const;
     bool SetItemData( long item, long data );
     void SetItemText( long item, const wxString& str );
     long GetItemData( long item ) const;
     bool SetItemData( long item, long data );

-    bool GetItemRect( long item, wxRectangle& rect, int code = wxLIST_RECT_BOUNDS ) const;
+    bool GetItemRect( long item, wxRect& rect, int code = wxLIST_RECT_BOUNDS ) const;

     bool GetItemPosition( long item, wxPoint& pos ) const;
     bool SetItemPosition( long item, const wxPoint& pos ); // not supported in wxGLC
     int GetItemCount(void) const;
     bool GetItemPosition( long item, wxPoint& pos ) const;
     bool SetItemPosition( long item, const wxPoint& pos ); // not supported in wxGLC
     int GetItemCount(void) const;


@@ -581,9 +587,10 @@ class wxListCtrl: public wxControl
     wxImageList *GetImageList(int which) const;
     void SetImageList(wxImageList *imageList, int which) ;
     bool Arrange( int flag = wxLIST_ALIGN_DEFAULT ); // always wxLIST_ALIGN_LEFT in wxGLC
     wxImageList *GetImageList(int which) const;
     void SetImageList(wxImageList *imageList, int which) ;
     bool Arrange( int flag = wxLIST_ALIGN_DEFAULT ); // always wxLIST_ALIGN_LEFT in wxGLC

+    void ClearAll();

     bool DeleteItem( long item );
     bool DeleteItem( long item );

-    bool DeleteAllItems(void) ;
-    void DeleteAllColumns(void) ;
+    bool DeleteAllItems(void);
+    bool DeleteAllColumns(void);

     bool DeleteColumn( int col );
 //  wxText& Edit(long item) ;  // not supported in wxGLC
     bool EnsureVisible( long item );
     bool DeleteColumn( int col );
 //  wxText& Edit(long item) ;  // not supported in wxGLC
     bool EnsureVisible( long item );


@@ -605,24 +612,27 @@ class wxListCtrl: public wxControl
     
     // We have to hand down a few functions
     
     
     // We have to hand down a few functions
     

-    void SetBackgroundColour( const wxColour &colour );
-    void SetForegroundColour( const wxColour &colour );
-    void SetFont( const wxFont &font );
+    bool SetBackgroundColour( const wxColour &colour );
+    bool SetForegroundColour( const wxColour &colour );
+    bool SetFont( const wxFont &font );

     
     

+#if wxUSE_DRAG_AND_DROP

     void SetDropTarget( wxDropTarget *dropTarget )
       { m_mainWin->SetDropTarget( dropTarget ); }
     wxDropTarget *GetDropTarget() const
       { return m_mainWin->GetDropTarget(); }
     void SetDropTarget( wxDropTarget *dropTarget )
       { m_mainWin->SetDropTarget( dropTarget ); }
     wxDropTarget *GetDropTarget() const
       { return m_mainWin->GetDropTarget(); }

-    void SetCursor( const wxCursor &cursor )
-      { if (m_mainWin) m_mainWin->wxWindow::SetCursor( cursor); }
+#endif
+
+    bool SetCursor( const wxCursor &cursor )
+      { return m_mainWin ? m_mainWin->wxWindow::SetCursor(cursor) : FALSE; }

     wxColour GetBackgroundColour() const
     wxColour GetBackgroundColour() const

-      { if (m_mainWin) return m_mainWin->GetBackgroundColour();
-        else return wxColour(); }
+      { return m_mainWin ? m_mainWin->GetBackgroundColour() : wxColour(); }

     wxColour GetForegroundColour() const
     wxColour GetForegroundColour() const

-      { if (m_mainWin) return m_mainWin->GetForegroundColour();
-        else return wxColour(); }
+      { return m_mainWin ? m_mainWin->GetForegroundColour() : wxColour(); }

     bool PopupMenu( wxMenu *menu, int x, int y )
       { return m_mainWin->PopupMenu( menu, x, y ); }
     bool PopupMenu( wxMenu *menu, int x, int y )
       { return m_mainWin->PopupMenu( menu, x, y ); }

+    void SetFocus()
+      { m_mainWin->SetFocus(); }

 
   // implementation
 
 
   // implementation