When handling accelerators in wxWebView make sure that we do not block right-alt...

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

diff --git a/include/wx/msw/listctrl.h b/include/wx/msw/listctrl.h
index a5afb0df3235a1c6202e288031a2b1cf97a7721c..30080f8784ebf6002786176afe5e4598ae1f1a48 100644 (file)
--- a/include/wx/msw/listctrl.h
+++ b/include/wx/msw/listctrl.h
@@ -16,7 +16,6 @@
 #include "wx/dynarray.h"
 #include "wx/vector.h"
 
 #include "wx/dynarray.h"
 #include "wx/vector.h"
 

-class WXDLLIMPEXP_FWD_CORE wxImageList;

 class wxMSWListItemData;
 
 // define this symbol to indicate the availability of SetColumnsOrder() and
 class wxMSWListItemData;
 
 // define this symbol to indicate the availability of SetColumnsOrder() and


@@ -77,7 +76,7 @@ class wxMSWListItemData;
 
  */
 
 
  */
 

-class WXDLLIMPEXP_CORE wxListCtrl: public wxControl
+class WXDLLIMPEXP_CORE wxListCtrl: public wxListCtrlBase

 {
 public:
     /*
 {
 public:
     /*


@@ -256,12 +255,6 @@ public:
     void SetImageList(wxImageList *imageList, int which);
     void AssignImageList(wxImageList *imageList, int which);
 
     void SetImageList(wxImageList *imageList, int which);
     void AssignImageList(wxImageList *imageList, int which);
 

-    // are we in report mode?
-    bool InReportView() const { return HasFlag(wxLC_REPORT); }
-
-    // are we in virtual report mode?
-    bool IsVirtual() const { return HasFlag(wxLC_VIRTUAL); }
-

     // refresh items selectively (only useful for virtual list controls)
     void RefreshItem(long item);
     void RefreshItems(long itemFrom, long itemTo);
     // refresh items selectively (only useful for virtual list controls)
     void RefreshItem(long item);
     void RefreshItems(long itemFrom, long itemTo);


@@ -288,7 +281,7 @@ public:
     void ClearAll();
 
     // Edit the label
     void ClearAll();
 
     // Edit the label

-    wxTextCtrl* EditLabel(long item, wxClassInfo* textControlClass = CLASSINFO(wxTextCtrl));
+    wxTextCtrl* EditLabel(long item, wxClassInfo* textControlClass = wxCLASSINFO(wxTextCtrl));

 
     // End label editing, optionally cancelling the edit
     bool EndEditLabel(bool cancel);
 
     // End label editing, optionally cancelling the edit
     bool EndEditLabel(bool cancel);


@@ -326,14 +319,6 @@ public:
     // Insert an image/string item
     long InsertItem(long index, const wxString& label, int imageIndex);
 
     // Insert an image/string item
     long InsertItem(long index, const wxString& label, int imageIndex);
 

-    // For list view mode (only), inserts a column.
-    long InsertColumn(long col, const wxListItem& info);
-
-    long InsertColumn(long col,
-                      const wxString& heading,
-                      int format = wxLIST_FORMAT_LEFT,
-                      int width = -1);
-

     // set the number of items in a virtual list control
     void SetItemCount(long count);
 
     // set the number of items in a virtual list control
     void SetItemCount(long count);
 


@@ -399,6 +384,17 @@ protected:
     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();
 

+    // Implement constrained best size calculation.
+    virtual int DoGetBestClientHeight(int width) const
+        { return MSWGetBestViewRect(width, -1).y; }
+    virtual int DoGetBestClientWidth(int height) const
+        { return MSWGetBestViewRect(-1, height).x; }
+
+    wxSize MSWGetBestViewRect(int x, int y) const;
+
+    // Implement base class pure virtual methods.
+    long DoInsertColumn(long col, const wxListItem& info);
+

     // free memory taken by all internal data
     void FreeAllInternalData();
 
     // free memory taken by all internal data
     void FreeAllInternalData();
 


@@ -443,9 +439,6 @@ protected:
     // return the icon for the given item and column.
     virtual int OnGetItemColumnImage(long item, long column) const;
 
     // return the icon for the given item and column.
     virtual int OnGetItemColumnImage(long item, long column) const;
 

-    // return the attribute for the item (may return NULL if none)
-    virtual wxListItemAttr *OnGetItemAttr(long item) const;
-

     // return the attribute for the given item and column (may return NULL if none)
     virtual wxListItemAttr *OnGetItemColumnAttr(long item, long WXUNUSED(column)) const
     {
     // return the attribute for the given item and column (may return NULL if none)
     virtual wxListItemAttr *OnGetItemColumnAttr(long item, long WXUNUSED(column)) const
     {


@@ -466,6 +459,10 @@ private:
     // destroy m_textCtrl if it's currently valid and reset it to NULL
     void DeleteEditControl();
 
     // destroy m_textCtrl if it's currently valid and reset it to NULL
     void DeleteEditControl();
 

+    // Intercept Escape and Enter keys to avoid them being stolen from our
+    // in-place editor control.
+    void OnCharHook(wxKeyEvent& event);
+

 
     DECLARE_DYNAMIC_CLASS(wxListCtrl)
     DECLARE_EVENT_TABLE()
 
     DECLARE_DYNAMIC_CLASS(wxListCtrl)
     DECLARE_EVENT_TABLE()