X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/435fe83e747aba481a255bab37768038cf9a9e81..2917e9204382ec1ecc96de7fc98bd3068da2233c:/include/wx/msw/listctrl.h

diff --git a/include/wx/msw/listctrl.h b/include/wx/msw/listctrl.h
index 863f46b01c..dbde573c9f 100644
--- a/include/wx/msw/listctrl.h
+++ b/include/wx/msw/listctrl.h
@@ -103,7 +103,7 @@
 #define wxLIST_HITTEST_TOLEFT           0x0400  // To the left of the client area.
 #define wxLIST_HITTEST_TORIGHT          0x0800  // To the right of the client area.
 
-#define wxLIST_HITTEST_ONITEM (wxLIST_HITTEST_ONITEMICON | wxLIST_HITTEST_ONITEMLABEL wxLIST_HITTEST_ONITEMSTATEICON)
+#define wxLIST_HITTEST_ONITEM (wxLIST_HITTEST_ONITEMICON | wxLIST_HITTEST_ONITEMLABEL | wxLIST_HITTEST_ONITEMSTATEICON)
 
 // Flags for GetNextItem
 enum {
@@ -171,7 +171,7 @@ public:
     int             m_format;   // left, right, centre
     int             m_width;    // width of column
 
-    wxListItem(void);
+    wxListItem();
 };
 
 // type of compare function for wxListCtrl sort operation
@@ -185,7 +185,7 @@ class WXDLLEXPORT wxListCtrl: public wxControl
    * Public interface
    */
 
-  wxListCtrl(void);
+  wxListCtrl();
 
   inline wxListCtrl(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
             long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator,
@@ -193,7 +193,7 @@ class WXDLLEXPORT wxListCtrl: public wxControl
   {
     Create(parent, id, pos, size, style, validator, name);
   }
-  ~wxListCtrl(void);
+  ~wxListCtrl();
 
   bool Create(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
             long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxListCtrl");
@@ -204,7 +204,7 @@ class WXDLLEXPORT wxListCtrl: public wxControl
 
   // Sets the background colour (GetBackgroundColour already implicit in
   // wxWindow class)
-  void SetBackgroundColour(const wxColour& col);
+  bool SetBackgroundColour(const wxColour& col);
 
   // Gets information about this column
   bool GetColumn(int col, wxListItem& item) const;
@@ -222,10 +222,10 @@ class WXDLLEXPORT wxListCtrl: public wxControl
   // visible area of the list control (list or report view)
   // or the total number of items in the list control (icon
   // or small icon view)
-  int GetCountPerPage(void) const;
+  int GetCountPerPage() const;
 
   // Gets the edit control for editing labels.
-  wxTextCtrl* GetEditControl(void) const;
+  wxTextCtrl* GetEditControl() const;
 
   // Gets information about the item
   bool GetItem(wxListItem& info) const ;
@@ -267,10 +267,10 @@ class WXDLLEXPORT wxListCtrl: public wxControl
   bool SetItemPosition(long item, const wxPoint& pos) ;
 
   // Gets the number of items in the list control
-  int GetItemCount(void) const;
+  int GetItemCount() const;
 
   // Gets the number of columns in the list control
-  int GetColumnCount(void) const;
+  int GetColumnCount() const { return m_colCount; }
 
   // Retrieves the spacing between icons in pixels.
   // If small is TRUE, gets the spacing for the small icon
@@ -278,17 +278,17 @@ class WXDLLEXPORT wxListCtrl: public wxControl
   int GetItemSpacing(bool isSmall) const;
 
   // Gets the number of selected items in the list control
-  int GetSelectedItemCount(void) const;
+  int GetSelectedItemCount() const;
 
   // Gets the text colour of the listview
-  wxColour GetTextColour(void) const;
+  wxColour GetTextColour() const;
 
   // Sets the text colour of the listview
   void SetTextColour(const wxColour& col);
 
   // Gets the index of the topmost visible item when in
   // list or report view
-  long GetTopItem(void) const ;
+  long GetTopItem() const ;
 
   // Add or remove a single window style
   void SetSingleStyle(long style, bool add = TRUE) ;
@@ -330,16 +330,16 @@ class WXDLLEXPORT wxListCtrl: public wxControl
   bool DeleteItem(long item);
 
   // Deletes all items
-  bool DeleteAllItems(void) ;
+  bool DeleteAllItems() ;
 
   // Deletes a column
   bool DeleteColumn(int col);
 
   // Deletes all columns
-  bool DeleteAllColumns(void);
+  bool DeleteAllColumns();
 
   // Clears items, and columns if there are any.
-  void ClearAll(void);
+  void ClearAll();
 
   // Edit the label
   wxTextCtrl* EditLabel(long item, wxClassInfo* textControlClass = CLASSINFO(wxTextCtrl));
@@ -407,22 +407,12 @@ class WXDLLEXPORT wxListCtrl: public wxControl
   // data is arbitrary data to be passed to the sort function.
   bool SortItems(wxListCtrlCompare fn, long data);
 
-/* Why should we need this function? Leave for now.
- * WE NEED IT because item data may have changed,
- * but the display needs refreshing (in string callback mode)
-  // Updates an item. If the list control has the wxLI_AUTO_ARRANGE style,
-  // the items will be rearranged.
-  bool Update(long item);
-*/
-
-  void Command(wxCommandEvent& event) { ProcessCommand(event); };
-
   // IMPLEMENTATION
   virtual bool MSWCommand(WXUINT param, WXWORD id);
-  virtual bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam, WXLPARAM *result);
+  virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
 
   // Recreate window - seems to be necessary when changing a style.
-  void RecreateWindow(void);
+  void RecreateWindow();
 
   // Add to pool: necessary because Windows needs to have a string
   // still exist across 3 callbacks.