don't draw borders for bitmap buttons with wxBORDER_NONE style

[wxWidgets.git] / include / wx / propgrid / propgridpagestate.h

diff --git a/include/wx/propgrid/propgridpagestate.h b/include/wx/propgrid/propgridpagestate.h
index ec1c8064ef655d7c1f6a5e0a7b9093a9d4655521..c6d8cde900fbfef97ae9448d5448a4aad8e4c5f2 100644 (file)
--- a/include/wx/propgrid/propgridpagestate.h
+++ b/include/wx/propgrid/propgridpagestate.h
@@ -314,28 +314,16 @@ protected:
 
 /** Base class to derive new viterators.
 */
 
 /** Base class to derive new viterators.
 */

-class WXDLLIMPEXP_PROPGRID wxPGVIteratorBase
+class WXDLLIMPEXP_PROPGRID wxPGVIteratorBase : public wxObjectRefData

 {
     friend class wxPGVIterator;
 public:
 {
     friend class wxPGVIterator;
 public:

-    wxPGVIteratorBase() { m_refCount = 1; }
+    wxPGVIteratorBase() { }

     virtual void Next() = 0;
     virtual void Next() = 0;

-    void IncRef()
-    {
-        m_refCount++;
-    }
-    void DecRef()
-    {
-        m_refCount--;
-        if ( m_refCount <= 0 )
-            delete this;
-    }

 protected:
     virtual ~wxPGVIteratorBase() { }
 
     wxPropertyGridIterator  m_it;
 protected:
     virtual ~wxPGVIteratorBase() { }
 
     wxPropertyGridIterator  m_it;

-private:
-    int     m_refCount;

 };
 
 /** @class wxPGVIterator
 };
 
 /** @class wxPGVIterator


@@ -542,24 +530,13 @@ public:
                           unsigned int col,
                           bool subProps) const;
 
                           unsigned int col,
                           bool subProps) const;
 

-    /** Returns information about arbitrary position in the grid.
-
-        wxPropertyGridHitTestResult definition:
-        @code
-            struct wxPropertyGridHitTestResult
-            {
-                wxPGProperty* GetProperty() const;
-
-                // column. -1 for margin
-                int             column;
-
-                // Index of splitter hit, -1 for none.
-                int             splitter;
+    /**
+        Returns information about arbitrary position in the grid.

 
 

-                // If splitter hit, then offset to that.
-                int             splitterHitOffset;
-            };
-        @endcode
+        @param pt
+            Logical coordinates in the virtual grid space. Use
+            wxScrolledWindow::CalcUnscrolledPosition() if you need to
+            translate a scrolled position into a logical one.

     */
     wxPropertyGridHitTestResult HitTest( const wxPoint& pt ) const;
 
     */
     wxPropertyGridHitTestResult HitTest( const wxPoint& pt ) const;
 


@@ -569,9 +546,6 @@ public:
 
     bool IsInNonCatMode() const { return (bool)(m_properties == m_abcArray); }
 
 
     bool IsInNonCatMode() const { return (bool)(m_properties == m_abcArray); }
 

-    /** Only inits arrays, doesn't migrate things or such. */
-    void InitNonCatMode ();
-

     void DoLimitPropertyEditing( wxPGProperty* p, bool limit = true )
     {
         p->SetFlagRecursively(wxPG_PROP_NOEDITOR, limit);
     void DoLimitPropertyEditing( wxPGProperty* p, bool limit = true )
     {
         p->SetFlagRecursively(wxPG_PROP_NOEDITOR, limit);


@@ -707,6 +681,10 @@ protected:
     unsigned char               m_anyModified;
 
     unsigned char               m_vhCalcPending;
     unsigned char               m_anyModified;
 
     unsigned char               m_vhCalcPending;

+
+private:
+    /** Only inits arrays, doesn't migrate things or such. */
+    void InitNonCatMode();

 };
 
 #endif // #ifndef SWIG
 };
 
 #endif // #ifndef SWIG