wxTreeEvent is declared in one header, not 3 of them

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

diff --git a/include/wx/msw/listctrl.h b/include/wx/msw/listctrl.h
index d3eaba459df8be223dc721f52263452478ee4256..e6fe84f0cf03c18fb34ceaccbc97de6a785b39eb 100644 (file)
--- a/include/wx/msw/listctrl.h
+++ b/include/wx/msw/listctrl.h
@@ -69,8 +69,6 @@
      - in Win95, you can be called back to supply other information
        besides text, such as state information. This saves no memory
        and is probably superfluous to requirements.
      - in Win95, you can be called back to supply other information
        besides text, such as state information. This saves no memory
        and is probably superfluous to requirements.

-     - discover why SetWindowLong doesn't properly change the
-       style, requiring RecreateWindow instead.

      - testing of whole API, extending current sample.
 
 
      - testing of whole API, extending current sample.
 
 


@@ -171,7 +169,7 @@ public:
     int             m_format;   // left, right, centre
     int             m_width;    // width of column
 
     int             m_format;   // left, right, centre
     int             m_width;    // width of column
 

-    wxListItem(void);
+    wxListItem();

 };
 
 // type of compare function for wxListCtrl sort operation
 };
 
 // type of compare function for wxListCtrl sort operation


@@ -185,7 +183,7 @@ class WXDLLEXPORT wxListCtrl: public wxControl
    * Public interface
    */
 
    * 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,
 
   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 +191,7 @@ class WXDLLEXPORT wxListCtrl: public wxControl
   {
     Create(parent, id, pos, size, style, validator, name);
   }
   {
     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");
 
   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 +202,7 @@ class WXDLLEXPORT wxListCtrl: public wxControl
 
   // Sets the background colour (GetBackgroundColour already implicit in
   // wxWindow class)
 
   // 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;
 
   // Gets information about this column
   bool GetColumn(int col, wxListItem& item) const;


@@ -222,10 +220,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)
   // 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.
 
   // Gets the edit control for editing labels.

-  wxTextCtrl* GetEditControl(void) const;
+  wxTextCtrl* GetEditControl() const;

 
   // Gets information about the item
   bool GetItem(wxListItem& info) const ;
 
   // Gets information about the item
   bool GetItem(wxListItem& info) const ;


@@ -267,10 +265,10 @@ class WXDLLEXPORT wxListCtrl: public wxControl
   bool SetItemPosition(long item, const wxPoint& pos) ;
 
   // Gets the number of items in the list control
   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
 
   // 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
 
   // Retrieves the spacing between icons in pixels.
   // If small is TRUE, gets the spacing for the small icon


@@ -278,17 +276,17 @@ class WXDLLEXPORT wxListCtrl: public wxControl
   int GetItemSpacing(bool isSmall) const;
 
   // Gets the number of selected items in the list control
   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
 
   // 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
 
   // 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) ;
 
   // Add or remove a single window style
   void SetSingleStyle(long style, bool add = TRUE) ;


@@ -330,16 +328,16 @@ class WXDLLEXPORT wxListCtrl: public wxControl
   bool DeleteItem(long item);
 
   // Deletes all items
   bool DeleteItem(long item);
 
   // Deletes all items

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

 
   // Deletes a column
   bool DeleteColumn(int col);
 
   // Deletes all columns
 
   // Deletes a column
   bool DeleteColumn(int col);
 
   // Deletes all columns

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

 
   // Clears items, and columns if there are any.
 
   // Clears items, and columns if there are any.

-  void ClearAll(void);
+  void ClearAll();

 
   // Edit the label
   wxTextCtrl* EditLabel(long item, wxClassInfo* textControlClass = CLASSINFO(wxTextCtrl));
 
   // Edit the label
   wxTextCtrl* EditLabel(long item, wxClassInfo* textControlClass = CLASSINFO(wxTextCtrl));


@@ -407,26 +405,16 @@ class WXDLLEXPORT wxListCtrl: public wxControl
   // data is arbitrary data to be passed to the sort function.
   bool SortItems(wxListCtrlCompare fn, long data);
 
   // 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);
   // 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);
+  // bring the control in sync with current m_windowStyle value
+  void UpdateStyle();

 
   // Add to pool: necessary because Windows needs to have a string
   // still exist across 3 callbacks.
 
   // Add to pool: necessary because Windows needs to have a string
   // still exist across 3 callbacks.

-  char *AddPool(const wxString& str);
+  wxChar *AddPool(const wxString& str);

 
 protected:
   wxTextCtrl*       m_textCtrl;        // The control used for editing a label
 
 protected:
   wxTextCtrl*       m_textCtrl;        // The control used for editing a label


@@ -440,6 +428,8 @@ protected:
   int               m_colCount;   // Windows doesn't have GetColumnCount so must
                                   // keep track of inserted/deleted columns
 
   int               m_colCount;   // Windows doesn't have GetColumnCount so must
                                   // keep track of inserted/deleted columns
 

+private:
+  bool DoCreateControl(int x, int y, int w, int h);

 };
 
 class WXDLLEXPORT wxListEvent : public wxNotifyEvent
 };
 
 class WXDLLEXPORT wxListEvent : public wxNotifyEvent