destroy m_impl even if an exception is thrown from the main loop

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

diff --git a/include/wx/palmos/listctrl.h b/include/wx/palmos/listctrl.h
index 50168fb9b0d784c413d1b4257373d2adf45f9991..1ad47caae04e471608cd7398e300c70eb1d2ab68 100644 (file)
--- a/include/wx/palmos/listctrl.h
+++ b/include/wx/palmos/listctrl.h
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/palmos/listctrl.h
 // Purpose:     wxListCtrl class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/palmos/listctrl.h
 // Purpose:     wxListCtrl class

-// Author:      William Osborne
+// Author:      William Osborne - minimal working wxPalmOS port

 // Modified by:
 // Created:     10/13/04
 // Modified by:
 // Created:     10/13/04

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -12,10 +12,6 @@
 #ifndef _WX_LISTCTRL_H_
 #define _WX_LISTCTRL_H_
 
 #ifndef _WX_LISTCTRL_H_
 #define _WX_LISTCTRL_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "listctrl.h"
-#endif
-

 #if wxUSE_LISTCTRL
 
 #include "wx/control.h"
 #if wxUSE_LISTCTRL
 
 #include "wx/control.h"


@@ -72,9 +68,6 @@ class WXDLLEXPORT wxImageList;
      - addition of further convenience functions
        to avoid use of wxListItem in some functions
      - state/overlay images: probably not needed.
      - addition of further convenience functions
        to avoid use of wxListItem in some functions
      - state/overlay images: probably not needed.

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

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


@@ -90,12 +83,12 @@ public:
     wxListCtrl() { Init(); }
 
     wxListCtrl(wxWindow *parent,
     wxListCtrl() { Init(); }
 
     wxListCtrl(wxWindow *parent,

-               wxWindowID id = -1,
+               wxWindowID id = wxID_ANY,

                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = wxLC_ICON,
                const wxValidator& validator = wxDefaultValidator,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = wxLC_ICON,
                const wxValidator& validator = wxDefaultValidator,

-               const wxString& name = _T("wxListCtrl"))
+               const wxString& name = wxListCtrlNameStr)

     {
         Init();
 
     {
         Init();
 


@@ -105,12 +98,12 @@ public:
     virtual ~wxListCtrl();
 
     bool Create(wxWindow *parent,
     virtual ~wxListCtrl();
 
     bool Create(wxWindow *parent,

-                wxWindowID id = -1,
+                wxWindowID id = wxID_ANY,

                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxLC_ICON,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxLC_ICON,
                 const wxValidator& validator = wxDefaultValidator,

-                const wxString& name = _T("wxListCtrl"));
+                const wxString& name = wxListCtrlNameStr);

 
 
     // Attributes
 
 
     // Attributes


@@ -161,6 +154,7 @@ public:
 
     // Sets the item image
     bool SetItemImage(long item, int image, int selImage) ;
 
     // Sets the item image
     bool SetItemImage(long item, int image, int selImage) ;

+    bool SetItemColumnImage(long item, long column, int image);

 
     // Gets the item text
     wxString GetItemText(long item) const ;
 
     // Gets the item text
     wxString GetItemText(long item) const ;


@@ -214,10 +208,7 @@ public:
     long GetTopItem() const ;
 
     // Add or remove a single window style
     long GetTopItem() const ;
 
     // Add or remove a single window style

-    void SetSingleStyle(long style, bool add = TRUE) ;
-
-    // Set the whole window style
-    void SetWindowStyleFlag(long style) ;
+    void SetSingleStyle(long style, bool add = true) ;

 
     // Searches for an item, starting from 'item'.
     // item can be -1 to find the first item that matches the
 
     // Searches for an item, starting from 'item'.
     // item can be -1 to find the first item that matches the


@@ -229,12 +220,6 @@ public:
     wxImageList *GetImageList(int which) const ;
 
     // Sets the image list
     wxImageList *GetImageList(int which) const ;
 
     // Sets the image list

-    // N.B. There's a quirk in the Win95 list view implementation.
-    // If in wxLC_LIST mode, it'll *still* display images by the labels if
-    // there's a small-icon image list set for the control - even though you
-    // haven't specified wxLIST_MASK_IMAGE when inserting.
-    // So you have to set a NULL small-icon image list to be sure that
-    // the wxLC_LIST mode works without icons. Of course, you may want icons...

     void SetImageList(wxImageList *imageList, int which) ;
     void AssignImageList(wxImageList *imageList, int which) ;
 
     void SetImageList(wxImageList *imageList, int which) ;
     void AssignImageList(wxImageList *imageList, int which) ;
 


@@ -280,7 +265,7 @@ public:
 
     // Find an item whose label matches this string, starting from the item after 'start'
     // or the beginning if 'start' is -1.
 
     // Find an item whose label matches this string, starting from the item after 'start'
     // or the beginning if 'start' is -1.

-    long FindItem(long start, const wxString& str, bool partial = FALSE);
+    long FindItem(long start, const wxString& str, bool partial = false);

 
     // Find an item whose data matches this data, starting from the item after 'start'
     // or the beginning if 'start' is -1.
 
     // Find an item whose data matches this data, starting from the item after 'start'
     // or the beginning if 'start' is -1.


@@ -338,10 +323,6 @@ public:
     // 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);
 

-    // IMPLEMENTATION
-    virtual bool MSWCommand(WXUINT param, WXWORD id);
-    virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
-

     // bring the control in sync with current m_windowStyle value
     void UpdateStyle();
 
     // bring the control in sync with current m_windowStyle value
     void UpdateStyle();
 


@@ -361,10 +342,6 @@ public:
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 

-
-    // obsolete stuff, for compatibility only -- don't use
-    wxDEPRECATED( int GetItemSpacing(bool isSmall) const);
-

 protected:
     // common part of all ctors
     void Init();
 protected:
     // common part of all ctors
     void Init();


@@ -372,10 +349,6 @@ protected:
     // free memory taken by all internal data
     void FreeAllInternalData();
 
     // free memory taken by all internal data
     void FreeAllInternalData();
 

-    // convert our styles to Windows
-    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
-
-

     wxTextCtrl*       m_textCtrl;        // The control used for editing a label
     wxImageList *     m_imageListNormal; // The image list for normal icons
     wxImageList *     m_imageListSmall;  // The image list for small icons
     wxTextCtrl*       m_textCtrl;        // The control used for editing a label
     wxImageList *     m_imageListNormal; // The image list for normal icons
     wxImageList *     m_imageListSmall;  // The image list for small icons


@@ -390,10 +363,10 @@ protected:
                                     // ListView_GetItemCount
     bool              m_ignoreChangeMessages;
 
                                     // ListView_GetItemCount
     bool              m_ignoreChangeMessages;
 

-    // TRUE if we have any internal data (user data & attributes)
+    // true if we have any internal data (user data & attributes)

     bool m_AnyInternalData;
 
     bool m_AnyInternalData;
 

-    // TRUE if we have any items with custom attributes
+    // true if we have any items with custom attributes

     bool m_hasAnyAttr;
 
     // these functions are only used for virtual list view controls, i.e. the
     bool m_hasAnyAttr;
 
     // these functions are only used for virtual list view controls, i.e. the


@@ -402,15 +375,18 @@ protected:
     // return the text for the given column of the given item
     virtual wxString OnGetItemText(long item, long column) const;
 
     // return the text for the given column of the given item
     virtual wxString OnGetItemText(long item, long column) const;
 

-    // return the icon for the given item
+    // return the text for the given column of the given item
+    virtual wxString OnGetItemText(long item, long column) const;
+
+    // return the icon for the given item. In report view, OnGetItemImage will
+    // only be called for the first column. See OnGetItemColumnImage for 
+    // details.

     virtual int OnGetItemImage(long item) const;
 
     // return the attribute for the item (may return NULL if none)
     virtual wxListItemAttr *OnGetItemAttr(long item) const;
 
 private:
     virtual int OnGetItemImage(long item) const;
 
     // return the attribute for the item (may return NULL if none)
     virtual wxListItemAttr *OnGetItemAttr(long item) const;
 
 private:

-    // process NM_CUSTOMDRAW notification message
-    WXLPARAM OnCustomDraw(WXLPARAM lParam);

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


@@ -420,4 +396,3 @@ private:
 #endif // wxUSE_LISTCTRL
 
 #endif // _WX_LISTCTRL_H_
 #endif // wxUSE_LISTCTRL
 
 #endif // _WX_LISTCTRL_H_

-