added a test to check if wxHtmlWindow::SelectionToText() inserts \n characters correctly

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

diff --git a/include/wx/propgrid/propgrid.h b/include/wx/propgrid/propgrid.h
index 7140e61bcf257d00b5fc5b7c274098049a5fbc1b..fd3020a73748f95d6df44b9813d21f507a99cd9d 100644 (file)
--- a/include/wx/propgrid/propgrid.h
+++ b/include/wx/propgrid/propgrid.h
@@ -785,9 +785,9 @@ public:
     /**
         Returns number of columns currently on grid.
     */
     /**
         Returns number of columns currently on grid.
     */

-    int GetColumnCount() const
+    unsigned int GetColumnCount() const

     {
     {

-        return m_pState->m_colWidths.size();
+        return (unsigned int) m_pState->m_colWidths.size();

     }
 
     /** Returns colour of empty space below properties. */
     }
 
     /** Returns colour of empty space below properties. */


@@ -838,7 +838,7 @@ public:
         editor is activate and string edited by user represents valid,
         uncommitted property value.
     */
         editor is activate and string edited by user represents valid,
         uncommitted property value.
     */

-    wxVariant GetPendingEditedValue();
+    wxVariant GetUncommittedPropertyValue();

 
     /** Returns cell background colour of a property. */
     wxColour GetPropertyBackgroundColour( wxPGPropArg id ) const;
 
     /** Returns cell background colour of a property. */
     wxColour GetPropertyBackgroundColour( wxPGPropArg id ) const;


@@ -1088,7 +1088,7 @@ public:
     */
     unsigned int GetCommonValueCount() const
     {
     */
     unsigned int GetCommonValueCount() const
     {

-        return m_commonValues.size();
+        return (unsigned int) m_commonValues.size();

     }
 
     /** Returns label of given common value.
     }
 
     /** Returns label of given common value.


@@ -1223,6 +1223,8 @@ public:
     void OnCustomEditorEvent( wxCommandEvent &event );
 
     long GetInternalFlags() const { return m_iFlags; }
     void OnCustomEditorEvent( wxCommandEvent &event );
 
     long GetInternalFlags() const { return m_iFlags; }

+    bool HasInternalFlag( long flag ) const
+        { return (m_iFlags & flag) ? true : false; }

     void SetInternalFlag( long flag ) { m_iFlags |= flag; }
     void ClearInternalFlag( long flag ) { m_iFlags &= ~(flag); }
     void IncFrozen() { m_frozen++; }
     void SetInternalFlag( long flag ) { m_iFlags |= flag; }
     void ClearInternalFlag( long flag ) { m_iFlags &= ~(flag); }
     void IncFrozen() { m_frozen++; }


@@ -1844,7 +1846,7 @@ inline int wxPGProperty::GetDisplayedCommonValueCount() const
     {
         wxPropertyGrid* pg = GetGrid();
         if ( pg )
     {
         wxPropertyGrid* pg = GetGrid();
         if ( pg )

-            return pg->GetCommonValueCount();
+            return (int) pg->GetCommonValueCount();

     }
     return 0;
 }
     }
     return 0;
 }