Change wxPGProperty::SetChoices() to accept 'const wxPGChoices&'

[wxWidgets.git] / include / wx / generic / private / listctrl.h

diff --git a/include/wx/generic/private/listctrl.h b/include/wx/generic/private/listctrl.h
index b204bb1f307a92dc5d272bdf6c3c377eae358078..f257fcd7a89bd16054f3fb3341163250361c7973 100644 (file)
--- a/include/wx/generic/private/listctrl.h
+++ b/include/wx/generic/private/listctrl.h
@@ -69,7 +69,7 @@ public:
     {
         wxString s = GetText();
         if ( s.empty() )
     {
         wxString s = GetText();
         if ( s.empty() )

-            s = _T('H');
+            s = wxT('H');

 
         return s;
     }
 
         return s;
     }


@@ -188,7 +188,7 @@ public:
         void ExtendWidth(wxCoord w)
         {
             wxASSERT_MSG( m_rectAll.width <= w,
         void ExtendWidth(wxCoord w)
         {
             wxASSERT_MSG( m_rectAll.width <= w,

-                            _T("width can only be increased") );
+                            wxT("width can only be increased") );

 
             m_rectAll.width = w;
             m_rectLabel.x = m_rectAll.x + (w - m_rectLabel.width) / 2;
 
             m_rectAll.width = w;
             m_rectLabel.x = m_rectAll.x + (w - m_rectLabel.width) / 2;


@@ -213,6 +213,21 @@ public:
         delete m_gi;
     }
 
         delete m_gi;
     }
 

+    // called by the owner when it toggles report view
+    void SetReportView(bool inReportView)
+    {
+        // we only need m_gi when we're not in report view so update as needed
+        if ( inReportView )
+        {
+            delete m_gi;
+            m_gi = NULL;
+        }
+        else
+        {
+            m_gi = new GeometryInfo;
+        }
+    }
+

     // are we in report mode?
     inline bool InReportView() const;
 
     // are we in report mode?
     inline bool InReportView() const;
 


@@ -254,7 +269,7 @@ public:
 
     bool IsHighlighted() const
     {
 
     bool IsHighlighted() const
     {

-        wxASSERT_MSG( !IsVirtual(), _T("unexpected call to IsHighlighted") );
+        wxASSERT_MSG( !IsVirtual(), wxT("unexpected call to IsHighlighted") );

 
         return m_highlighted;
     }
 
         return m_highlighted;
     }


@@ -420,10 +435,14 @@ public:
                       const wxPoint& pos = wxDefaultPosition,
                       const wxSize& size = wxDefaultSize,
                       long style = 0,
                       const wxPoint& pos = wxDefaultPosition,
                       const wxSize& size = wxDefaultSize,
                       long style = 0,

-                      const wxString &name = _T("listctrlmainwindow") );
+                      const wxString &name = wxT("listctrlmainwindow") );

 
     virtual ~wxListMainWindow();
 
 
     virtual ~wxListMainWindow();
 

+    // called by the main control when its mode changes
+    void SetReportView(bool inReportView);
+
+    // helper to simplify testing for wxLC_XXX flags

     bool HasFlag(int flag) const { return m_parent->HasFlag(flag); }
 
     // return true if this is a virtual list control
     bool HasFlag(int flag) const { return m_parent->HasFlag(flag); }
 
     // return true if this is a virtual list control


@@ -610,7 +629,7 @@ public:
     void InsertItem( wxListItem &item );
     void InsertColumn( long col, wxListItem &item );
     int GetItemWidthWithImage(wxListItem * item);
     void InsertItem( wxListItem &item );
     void InsertColumn( long col, wxListItem &item );
     int GetItemWidthWithImage(wxListItem * item);

-    void SortItems( wxListCtrlCompare fn, long data );
+    void SortItems( wxListCtrlCompare fn, wxIntPtr data );

 
     size_t GetItemCount() const;
     bool IsEmpty() const { return GetItemCount() == 0; }
 
     size_t GetItemCount() const;
     bool IsEmpty() const { return GetItemCount() == 0; }


@@ -719,7 +738,7 @@ protected:
     // get the line data for the given index
     wxListLineData *GetLine(size_t n) const
     {
     // get the line data for the given index
     wxListLineData *GetLine(size_t n) const
     {

-        wxASSERT_MSG( n != (size_t)-1, _T("invalid line index") );
+        wxASSERT_MSG( n != (size_t)-1, wxT("invalid line index") );

 
         if ( IsVirtual() )
         {
 
         if ( IsVirtual() )
         {