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 12bc6f41494f6d642422e2aca81bfc62fa438f0a..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.
 
 


@@ -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;


@@ -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();
+  // 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