Interface fixes for Phoenix

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

diff --git a/include/wx/msw/listctrl.h b/include/wx/msw/listctrl.h
index c4cb6597ac9e5659427596c007fff43692c95a55..a873d075461619f18909bf1806f6b6a666e4b680 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


@@ -320,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);
 


@@ -393,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();